Merge pull request #630 from 8633brown/webpack

simplify the webpack config

Author: paulrosen

Diff for: build-utils/loadPresets.js

@@ -1,3 +1,4 @@
+require('./static-wrappers/license')
 var version = require('./version');
 var animation = require('./src/api/abc_animation');
 var tuneBook = require('./src/api/abc_tunebook');

Diff for: build-utils/presets/webpack.analyze.js

@@ -6,14 +6,17 @@
   "types": "types/index.d.ts",
   "scripts": {
     "webpack": "webpack",
-    "build": "npm run build:basic && npm run build:basic-min && npm run build:plugin",
-    "build:basic": "npm run webpack -- --env.mode development --env.type basic -o dist/abcjs-basic.js",
-    "build:basic-min": "npm run webpack -- --env.mode production --env.type basic",
-    "build:plugin": "npm run webpack -- --env.mode production --env.type plugin",
+    "build": "npm run fix-versions && npm run build:basic && npm run webpack && npm run copy-output",
+    "build:basic": "npm run webpack -- --mode development --config-name basic",
+    "build:basic-min": "npm run webpack -- --mode production --config-name basic",
+    "build:plugin": "npm run webpack -- --mode production --config-name plugin",
+    "build:midi": "npm run webpack -- --mode production --config-name midi",
+    "fix-versions": "./fix-versions.sh 6.0.0-beta.28",
+    "copy-output": "./build-copy.sh 6.0.0-beta.28",
     "test": "mocha 'tests/**/*.js'",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs",
-    "build:analyze": "npm run build:basic -- --env.presets analyze"
+    "build:analyze": "npm run build:basic -- --env.analyze"
   },
   "repository": {
     "type": "git",
@@ -49,6 +52,7 @@
     "babel-loader": "8.1.0",
     "chai": "4.2.0",
     "compression-webpack-plugin": "5.0.1",
+    "midi": "https://github.com/paulrosen/MIDI.js.git#abcjs",
     "mocha": "8.1.3",
     "serialize-javascript": "4.0.0",
     "svg-inline-loader": "0.8.2",

Diff for: build-utils/presets/webpack.optimize.js

@@ -1,38 +1,73 @@
-const {merge} = require("webpack-merge");
-const modeConfig = env => require(`./build-utils/webpack.${env.mode}`)(env);
-const presetConfig = require("./build-utils/loadPresets");
+const pkg = require("./package.json");
+const TerserPlugin = require('terser-webpack-plugin');
+const WebpackBundleAnalyzer = require("webpack-bundle-analyzer")
+  .BundleAnalyzerPlugin;
 
-module.exports = ({mode, presets, type} = {mode: "production", presets: []}) => {
-	return merge(
-		{
-			entry: `./static-wrappers/${type}.js`,
-			output: {
-				library: {
-					amd: 'abcjs',
-					root: 'ABCJS',
-					commonjs: 'abcjs'
-				},
-				libraryTarget: 'umd',
-				globalObject: 'this'
-			},
-			mode,
-			module: {
-				rules: [
-					{
-						test: /\.js$/,
-						exclude: /node_modules/,
-						use: "babel-loader"
-					},
-					{
-						test: /\.svg$/,
-						loader: 'svg-inline-loader'
-					}
-				]
-			},
-			plugins: [
-			]
-		},
-		modeConfig({mode, type}),
-		presetConfig({mode, presets, type})
-	);
+module.exports = (env = {} , argv) => {
+  const defaults = (argv, type) => {
+    const config = {
+      output: {
+        library: {
+          amd: 'abcjs',
+          root: 'ABCJS',
+          commonjs: 'abcjs'
+        },
+        libraryTarget: 'umd',
+        globalObject: 'this',
+        filename: argv.mode === 'development' ? `abcjs-${type}.js` : `abcjs-${type}-min.js`,
+      },
+      devtool: argv.mode === 'development' ? 'source-map' : false,
+      module: {
+        rules: [
+          {
+            test: /\.js$/,
+            exclude: /node_modules/,
+            use: "babel-loader"
+          }
+        ],
+      },
+      mode: 'production',
+      optimization:{
+        minimizer: [
+          new TerserPlugin({
+            extractComments: {
+              condition: /^\*\**!/i,
+              banner: makeBanner(type)
+            },
+          }),
+        ],
+      }
+    }
+
+    if (env.analyze) {
+      config.plugins = [
+        new WebpackBundleAnalyzer()
+      ]
+    }
+    return config
+  }
+
+  return [
+    {
+      name: 'basic',
+      entry: `./index.js`,
+      ...defaults(argv, 'basic')
+    }, {
+      name: 'plugin',
+      entry: `./static-wrappers/plugin.js`,
+      ...defaults(argv, 'plugin')
+    }, {
+      name: 'midi',
+      entry: `./midi.js`,
+      ...defaults(argv, 'midi')
+    }
+  ]
 };
+
+function makeBanner(type) {
+  let banner = `abcjs_${type} v${pkg.version} Copyright © 2009-2021 Paul Rosen and Gregory Dyke (https://abcjs.net) */\n`
+  if (type === 'midi') {
+    banner += `/*! midi.js Copyright © Michael Deal (http://mudcu.be) */\n`;
+  }
+  return banner + `/*! For license information please see abcjs_${type}.LICENSE`;
+}