Merge pull request #67 from 0rvar/0rvar/revamp-dev-flow

Simplify build and dev process

package.json

@@ -4,19 +4,14 @@
   "author": "Dessalines <tyhou13@gmx.com>",
   "license": "AGPL-3.0",
   "scripts": {
-    "build:client:dev": "webpack --env platform=client --mode=development",
-    "build:client:prod": "webpack --env platform=client --mode=production",
-    "build:dev": "yarn run build:server:dev && yarn run build:client:dev",
-    "build:prod": "yarn run build:server:prod && yarn run build:client:prod",
-    "build:server:dev": "webpack --env platform=server --mode=development",
-    "build:server:prod": "webpack --env platform=server --mode=production",
+    "build:dev": "webpack --mode=development",
+    "build:prod": "webpack --mode=production",
     "clean": "yarn run rimraf dist",
-    "dev": "nodemon --watch ./src/shared/components -e ts,tsx,css,scss --exec yarn run start",
+    "dev": "yarn start",
     "lint": "tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
     "prebuild:dev": "yarn clean && node generate_translations.js",
     "prebuild:prod": "yarn clean && node generate_translations.js",
-    "serve": "node dist/js/server.js",
-    "start": "yarn run build:dev && yarn run serve"
+    "start": "yarn build:dev --watch"
   },
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "dependencies": {
@@ -78,9 +73,9 @@
     "mini-css-extract-plugin": "^1.2.0",
     "node-fetch": "^2.6.1",
     "node-sass": "^4.12.0",
-    "nodemon": "^2.0.6",
     "prettier": "^2.1.2",
     "rimraf": "^3.0.2",
+    "run-node-webpack-plugin": "^1.3.0",
     "sass-loader": "^10.0.4",
     "sortpack": "^2.1.9",
     "style-loader": "^2.0.0",

webpack.config.js

@@ -1,8 +1,9 @@
+const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const nodeExternals = require('webpack-node-externals');
 const CopyPlugin = require('copy-webpack-plugin');
-const path = require('path');
-const webpack = require('webpack');
+const RunNodeWebpackPlugin = require('run-node-webpack-plugin');
+const { merge } = require('lodash');
 
 const banner = `
   hash:[contentHash], chunkhash:[chunkhash], name:[name], filebase:[base], query:[query], file:[file]
@@ -11,12 +12,7 @@ const banner = `
   @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0
   `;
 
-module.exports = function (env, _) {
-  const platform = env.platform || 'server';
-
 const base = {
-    // mode is set by package.json flags
-    entry: './src/server/index.tsx', // Point to main file
   output: {
     filename: 'js/server.js',
     publicPath: '/',
@@ -47,11 +43,6 @@ module.exports = function (env, _) {
       },
     ],
   },
-    devServer: {
-      host: '0.0.0.0',
-      contentBase: 'src/',
-      historyApiFallback: true,
-    },
   plugins: [
     new MiniCssExtractPlugin({
       filename: 'styles/styles.css',
@@ -63,21 +54,54 @@ module.exports = function (env, _) {
       banner,
     }),
   ],
-    cache: {
-      type: 'filesystem',
-      name: platform,
-    },
 };
 
-  // server-specific configuration
-  if (platform === 'server') {
-    base.target = 'node';
-    base.externals = [nodeExternals(), 'inferno-helmet'];
-  }
-  // client-specific configurations
-  if (platform === 'client') {
-    base.entry = './src/client/index.tsx';
-    base.output.filename = 'js/client.js';
-  }
-  return base;
+const createServerConfig = (env, mode) => {
+  const config = merge({}, base, {
+    mode,
+    entry: './src/server/index.tsx',
+    output: {
+      filename: 'js/server.js',
+    },
+    target: 'node',
+    externals: [nodeExternals(), 'inferno-helmet'],
+  });
+
+  if (mode === 'development') {
+    config.cache = {
+      type: 'filesystem',
+      name: 'server',
     };
+
+    config.plugins.push(
+      new RunNodeWebpackPlugin({
+        runOnlyInWatchMode: true,
+      })
+    );
+  }
+
+  return config;
+};
+const createClientConfig = (env, mode) => {
+  const config = merge({}, base, {
+    mode,
+    entry: './src/client/index.tsx',
+    output: {
+      filename: 'js/client.js',
+    },
+  });
+
+  if (mode === 'development') {
+    config.cache = {
+      type: 'filesystem',
+      name: 'client',
+    };
+  }
+
+  return config;
+};
+
+module.exports = (env, properties) => [
+  createServerConfig(env, properties.mode || 'development'),
+  createClientConfig(env, properties.mode || 'development'),
+];