Merge pull request #2324 from mermaid-js/dependabot/npm_and_yarn/develop/webpack-5.53.0

Bump webpack from 4.46.0 to 5.53.0

jest.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 module.exports = {
   testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.jsx?$': './transformer.js',
+    '^.+\\.jsx?$': ['babel-jest', { rootMode: 'upward' }],
     '^.+\\.jison$': path.resolve(__dirname, './jisonTransformer.js'),
   },
   transformIgnorePatterns: ['/node_modules/(?!dagre-d3-renderer/lib).*\\.js'],

jisonLoader.js

@@ -1,6 +1,5 @@
 const { Generator } = require('jison');
-const { getOptions } = require('loader-utils');
 
 module.exports = function jisonLoader(source) {
-  return new Generator(source, getOptions(this)).generate();
+  return new Generator(source, this.getOptions()).generate();
 };

package.json

@@ -80,10 +80,11 @@
     "jison": "^0.4.18",
     "js-base64": "3.6.1",
     "moment": "^2.23.0",
+    "path-browserify": "^1.0.1",
     "prettier": "^2.3.2",
     "start-server-and-test": "^1.12.6",
     "terser-webpack-plugin": "^4.2.3",
-    "webpack": "^4.41.2",
+    "webpack": "^5.53.0",
     "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^3.4.1",
     "webpack-node-externals": "^3.0.0"

transformer.js

@@ -1,3 +0,0 @@
-module.exports = require('babel-jest').default.createTransformer({
-  rootMode: 'upward'
-});

webpack.config.base.js

@@ -1,11 +1,5 @@
 import path from 'path';
 
-const amdRule = {
-  parser: {
-    amd: false, // https://github.com/lodash/lodash/issues/3052
-  },
-};
-
 const jisonRule = {
   test: /\.jison$/,
   use: {
@@ -15,6 +9,7 @@ const jisonRule = {
     },
   },
 };
+
 const jsRule = {
   test: /\.js$/,
   include: [
@@ -34,6 +29,7 @@ const scssRule = {
 
 export const jsConfig = () => {
   return {
+    amd: false, // https://github.com/lodash/lodash/issues/3052
     mode: 'development',
     target: 'web',
     entry: {
@@ -41,20 +37,23 @@ export const jsConfig = () => {
     },
     resolve: {
       extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'],
-    },
-    node: {
-      fs: 'empty', // jison generated code requires 'fs'
+      fallback: {
+        fs: false, // jison generated code requires 'fs'
+        path: require.resolve('path-browserify'),
+      },
     },
     output: {
       path: path.join(__dirname, './dist/'),
       filename: '[name].js',
-      library: 'mermaid',
-      libraryTarget: 'umd',
-      libraryExport: 'default',
+      library: {
+        name: 'mermaid',
+        type: 'umd',
+        export: 'default',
+      },
       globalObject: 'typeof self !== "undefined" ? self : this',
     },
     module: {
-      rules: [amdRule, jsRule, scssRule, jisonRule],
+      rules: [jsRule, scssRule, jisonRule],
     },
     devtool: 'source-map',
   };

webpack.config.e2e.js

@@ -18,11 +18,6 @@ const jisonRule = {
   },
 };
 
-const amdRule = {
-  parser: {
-    amd: false, // https://github.com/lodash/lodash/issues/3052
-  },
-};
 const scssRule = {
   // load scss to string
   test: /\.scss$/,
@@ -30,6 +25,7 @@ const scssRule = {
 };
 
 module.exports = {
+  amd: false, // https://github.com/lodash/lodash/issues/3052
   mode: 'development',
   target: 'web',
   entry: {
@@ -39,16 +35,19 @@ module.exports = {
   },
   resolve: {
     extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'],
-  },
-  node: {
-    fs: 'empty', // jison generated code requires 'fs'
+    fallback: {
+      fs: false, // jison generated code requires 'fs'
+      path: require.resolve('path-browserify'),
+    },
   },
   output: {
     path: path.join(__dirname, './dist/'),
     filename: '[name].js',
-    library: 'mermaid',
-    libraryTarget: 'umd',
-    libraryExport: 'default',
+    library: {
+      name: 'mermaid',
+      type: 'umd',
+      export: 'default',
+    },
   },
   devServer: {
     compress: true,
@@ -59,7 +58,7 @@ module.exports = {
     ],
   },
   module: {
-    rules: [amdRule, jsRule, scssRule, jisonRule],
+    rules: [jsRule, scssRule, jisonRule],
   },
   externals: {
     mermaid: 'mermaid',