Fix usage of "url" and "server" CLI arguments (#809)

Author: scriptex

.github/workflows/build.yml

@@ -1,6 +1,3 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
 name: Build
 
 on:
@@ -13,16 +10,12 @@ jobs:
     build:
         runs-on: ubuntu-latest
 
-        strategy:
-            matrix:
-                node-version: [12.x, 14.x, 16.x]
-
         steps:
             - uses: actions/checkout@v2
-            - name: Use Node.js ${{ matrix.node-version }}
+            - name: Use Node.js LTS
               uses: actions/setup-node@v2
               with:
-                  node-version: ${{ matrix.node-version }}
+                  node-version: lts/*
             - run: yarn
             - run: yarn lint
             - run: yarn pwa

README.md

@@ -168,29 +168,29 @@ npm run build
 
 5.  Automatic browser reload using [BrowserSync](https://browsersync.io/)
 
-    -   The setup assumes that you have a web server installed.
-    -   If you wish to use a proxy in browsersync you can do it using the `--url` CLI argument like this:
+    -   The setup assumes that you have a web server (MAMP, XAMPP, etc) installed.
+    -   If you wish to use a proxy in browsersync you can do it using the `url` CLI argument like this:
 
     ```sh
-    yarn start --url=http://your.app
+    yarn start --env url=http://your.app
     ```
 
     or
 
     ```sh
-    npm start -- --url=http://your.app
+    npm start --env url=http://your.app
     ```
 
-    If you do not have a web server installed, then the files can be served via the browser-sync built-in server. In order to use this you need to pass a new CLI argument `--server` like this.
+    If you do not have a web server installed, then the files can be served via the browser-sync built-in server. In order to use this you need to pass a new CLI argument `server` like this.
 
     ```sh
-    yarn start --server
+    yarn start --env server
     ```
 
     or
 
     ```sh
-    npm start -- --server
+    npm start --env server
     ```
 
 6)  Images optimization using [Optisize](https://github.com/three11/optisize)

admin/data.json

@@ -1,6 +1,6 @@
 {
 	"name": "webpack-mpa",
-	"version": "3.10.0",
+	"version": "3.11.0",
 	"description": "Multi page app setup with webpack",
 	"scripts": {
 		"build": "webpack --mode=production",
@@ -34,7 +34,7 @@
 	"devDependencies": {
 		"@babel/core": "7.16.0",
 		"@babel/preset-env": "7.16.4",
-		"@three11/optisize": "1.3.0",
+		"@three11/optisize": "2.0.0",
 		"autoprefixer": "10.4.0",
 		"babel-loader": "8.2.3",
 		"browser-sync": "2.27.7",
@@ -72,8 +72,7 @@
 		"webpack": "5.64.4",
 		"webpack-cli": "4.9.1",
 		"webpack-shell-plugin-next": "2.2.2",
-		"webpack-spritesmith": "1.1.0",
-		"yargs": "17.3.0"
+		"webpack-spritesmith": "1.1.0"
 	},
 	"browserslist": [
 		"> 1%",

admin/index.html

@@ -5,7 +5,6 @@ const { parse } = require('url');
 const { resolve } = require('path');
 const { readdirSync } = require('fs');
 
-const { argv } = require('yargs');
 const magicImporter = require('node-sass-magic-importer');
 const { ProvidePlugin } = require('webpack');
 const SpritesmithPlugin = require('webpack-spritesmith');
@@ -14,28 +13,6 @@ const WebpackShellPlugin = require('webpack-shell-plugin-next');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
-const { url, server, mode } = argv;
-const sourceMap = {
-	sourceMap: mode === 'development'
-};
-
-if (server) {
-	exec('php index.php > index.html');
-}
-
-const postcssOptions = {
-	plugins: [
-		require('postcss-easy-import'),
-		require('postcss-url')({
-			url: 'rebase'
-		}),
-		require('postcss-utilities'),
-		require('postcss-flexbugs-fixes'),
-		require('autoprefixer')()
-	],
-	...sourceMap
-};
-
 const babelConfig = [
 	{
 		loader: 'babel-loader',
@@ -47,7 +24,7 @@ const babelConfig = [
 	}
 ];
 
-const browserSyncConfig = {
+const browserSyncConfig = server => ({
 	host: 'localhost',
 	port: 3000,
 	open: 'external',
@@ -84,7 +61,7 @@ const browserSyncConfig = {
 		}
 	},
 	proxy: 'localhost'
-};
+});
 
 const extractTextConfig = {
 	filename: 'app.css'
@@ -117,10 +94,34 @@ if (svgs.length) {
 	shellScripts.push('spritesh -q -i assets/images/svg -o ./assets/dist/sprite.svg -p svg-');
 }
 
-module.exports = () => {
+module.exports = (env, argv) => {
+	const { url, server } = env;
+	const { mode } = argv;
+
 	const isDevelopment = mode === 'development';
 	const isProduction = mode === 'production';
 
+	if (server) {
+		exec('php index.php > index.html');
+	}
+
+	const sourceMap = {
+		sourceMap: isDevelopment
+	};
+
+	const postcssOptions = {
+		plugins: [
+			require('postcss-easy-import'),
+			require('postcss-url')({
+				url: 'rebase'
+			}),
+			require('postcss-utilities'),
+			require('postcss-flexbugs-fixes'),
+			require('autoprefixer')()
+		],
+		...sourceMap
+	};
+
 	if (isProduction) {
 		postcssOptions.plugins.push(require('postcss-merge-rules'), require('cssnano')());
 	}
@@ -135,7 +136,7 @@ module.exports = () => {
 	}
 
 	const config = {
-		mode: mode,
+		mode,
 		entry: ['./assets/styles/main.scss', './assets/scripts/main.js'],
 		output: {
 			path: resolve(__dirname, './assets/dist'),
@@ -206,21 +207,23 @@ module.exports = () => {
 		stats: 'errors-only'
 	};
 
+	const bsConfig = browserSyncConfig(server);
+
 	if (isDevelopment) {
 		if (url) {
-			browserSyncConfig.host = parse(url).hostname;
-			browserSyncConfig.proxy = url;
+			bsConfig.host = parse(url).hostname;
+			bsConfig.proxy = url;
 		}
 
 		if (server) {
-			delete browserSyncConfig.host;
-			delete browserSyncConfig.proxy;
+			delete bsConfig.host;
+			delete bsConfig.proxy;
 
-			browserSyncConfig.server = true;
+			bsConfig.server = true;
 		}
 
 		config.plugins.push(
-			new BrowserSyncPlugin(browserSyncConfig, {
+			new BrowserSyncPlugin(bsConfig, {
 				reload: false
 			})
 		);