diff --git a/frontend/.env.example b/frontend/.env.example index 1b76f568..81570ae7 100644 --- a/frontend/.env.example +++ b/frontend/.env.example @@ -1,7 +1,7 @@ # Disable typescript checking for dev building (reduce build time & resource usage) NO_DEV_TS_CHECK=true -NODE_ENV=development +# NODE_ENV=development # Set the public host url (no trailing slash) PUBLIC_HOST_URL=https://grants.zfnd.org @@ -18,3 +18,6 @@ EXPLORER_URL="https://testnet.zcha.in/" # Amount for staking a proposal in ZEC PROPOSAL_STAKING_AMOUNT=0.025 + +# Normally production runs with SSL, this disables that +DISABLE_SSL=true diff --git a/frontend/client/Routes.tsx b/frontend/client/Routes.tsx index 9a50557d..d3595661 100644 --- a/frontend/client/Routes.tsx +++ b/frontend/client/Routes.tsx @@ -13,6 +13,7 @@ import AuthRoute from 'components/AuthRoute'; import Template, { TemplateProps } from 'components/Template'; // wrap components in loadable...import & they will be split +// Make sure you specify chunkname! Must replace slashes with dashes. const opts = { fallback: }; const Home = loadable(() => import('pages/index'), opts); const Create = loadable(() => import('pages/create'), opts); diff --git a/frontend/client/components/Proposals/style.less b/frontend/client/components/Proposals/style.less index bf9e7b30..fb17174d 100644 --- a/frontend/client/components/Proposals/style.less +++ b/frontend/client/components/Proposals/style.less @@ -22,7 +22,7 @@ &-search { display: flex; - &-filterButton { + &-filterButton.ant-btn { display: none; margin-left: 0.5rem; diff --git a/frontend/config/webpack.config.js/loaders.js b/frontend/config/webpack.config.js/loaders.js index 303701cb..464fd680 100644 --- a/frontend/config/webpack.config.js/loaders.js +++ b/frontend/config/webpack.config.js/loaders.js @@ -4,12 +4,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const isDev = process.env.NODE_ENV === 'development'; -const babelPresets = [ - '@babel/react', - // '@babel/typescript', (using ts-loader) - ['@babel/env', { useBuiltIns: 'entry', modules: false }], -]; - const lessLoader = { loader: 'less-loader', options: { javascriptEnabled: true }, @@ -22,7 +16,6 @@ const tsBabelLoaderClient = { loader: 'babel-loader', options: { plugins: [ - 'dynamic-import-webpack', // for client '@loadable/babel-plugin', 'react-hot-loader/babel', '@babel/plugin-proposal-object-rest-spread', @@ -46,7 +39,6 @@ const tsBabelLoaderServer = { loader: 'babel-loader', options: { plugins: [ - 'dynamic-import-node', // for server '@loadable/babel-plugin', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-proposal-class-properties', diff --git a/frontend/config/webpack.config.js/plugins.js b/frontend/config/webpack.config.js/plugins.js index 1ba29e89..c39e42f3 100644 --- a/frontend/config/webpack.config.js/plugins.js +++ b/frontend/config/webpack.config.js/plugins.js @@ -1,7 +1,6 @@ const webpack = require('webpack'); const path = require('path'); const ManifestPlugin = require('webpack-manifest-plugin'); -const { StatsWriterPlugin } = require('webpack-stats-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const ModuleDependencyWarning = require('./module-dependency-warning'); const WebappWebpackPlugin = require('webapp-webpack-plugin'); @@ -55,27 +54,6 @@ const client = [ }, }, ]), - // this allows the server access to the dependency graph - // so it can find which js/css to add to initial page - new StatsWriterPlugin({ - fileName: 'stats.json', - fields: null, - transform(data) { - const trans = {}; - trans.publicPath = data.publicPath; - trans.modules = data.modules.map(m => ({ - id: m.id, - chunks: m.chunks, - reasons: m.reasons, - })); - trans.chunks = data.chunks.map(c => ({ - id: c.id, - files: c.files, - origins: c.origins, - })); - return JSON.stringify(trans, null, 2); - }, - }), new LoadablePlugin(), ]; diff --git a/frontend/package.json b/frontend/package.json index 7dd0dca7..4a62a715 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,6 @@ "@babel/core": "^7.0.1", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-transform-modules-commonjs": "^7.0.0", "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.0.0", @@ -74,8 +73,6 @@ "axios": "^0.18.0", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.2", - "babel-plugin-dynamic-import-node": "^2.1.0", - "babel-plugin-dynamic-import-webpack": "^1.0.2", "babel-plugin-import": "^1.8.0", "babel-plugin-module-resolver": "^3.1.1", "bn.js": "4.11.8", diff --git a/frontend/server/components/HTML.tsx b/frontend/server/components/HTML.tsx index 2194f253..5c976eb8 100644 --- a/frontend/server/components/HTML.tsx +++ b/frontend/server/components/HTML.tsx @@ -59,12 +59,11 @@ const HTML: React.SFC = ({ {head.link.toComponent()} {head.script.toComponent()} - {extractor.getStyleElements()} {css.map(href => { - return ; + return ; })} + {extractor.getStyleElements()} - {extractor.getScriptElements()}