@s-ui/bundler 7.33.0-beta.1 → 7.36.0-beta.0

package/factories/createDevServerConfig.js

@@ -29,7 +29,6 @@ module.exports = config => ({
   historyApiFallback: {
     disableDotRule: true
   },
-  open: true,
   onAfterSetupMiddleware(devServer) {
     // This service worker file is effectively a 'no-op' that will reset any
     // previous service worker registered for the same host:port combination.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-ui/bundler",
-  "version": "7.33.0-beta.1",
+  "version": "7.36.0-beta.0",
   "description": "Config-free bundler for ES6 React apps.",
   "bin": {
     "sui-bundler": "./bin/sui-bundler.js"
@@ -21,31 +21,31 @@
   },
   "homepage": "https://github.com/SUI-Components/sui/tree/master/packages/sui-bundler#readme",
   "dependencies": {
-    "@babel/core": "7.15.8",
+    "@babel/core": "7.16.0",
     "@s-ui/helpers": "1",
-    "autoprefixer": "9.8.6",
+    "autoprefixer": "10.4.0",
     "babel-loader": "8.2.3",
     "babel-preset-sui": "3",
     "commander": "6.2.1",
-    "css-loader": "4.3.0",
-    "css-minimizer-webpack-plugin": "1.1.5",
+    "css-loader": "6.5.0",
+    "css-minimizer-webpack-plugin": "3.1.1",
     "esbuild-loader": "2.16.0",
     "fast-glob": "3.2.7",
-    "html-webpack-plugin": "4.5.0",
-    "mini-css-extract-plugin": "1.6.0",
+    "html-webpack-plugin": "5.5.0",
+    "mini-css-extract-plugin": "2.4.3",
     "null-loader": "4.0.1",
-    "postcss": "7.0.35",
-    "postcss-loader": "4.1.0",
+    "postcss": "8.3.11",
+    "postcss-loader": "6.2.0",
     "react-dev-utils": "11.0.4",
     "rimraf": "3.0.2",
-    "sass": "1.43.3",
-    "sass-loader": "10.1.0",
+    "sass": "1.43.4",
+    "sass-loader": "12.3.0",
     "super-sass-loader": "0.1",
     "speed-measure-webpack-plugin": "1.5.0",
-    "style-loader": "2.0.0",
-    "terser-webpack-plugin": "4.2.2",
-    "webpack": "4.46.0",
-    "webpack-dev-server": "4.3.1",
+    "style-loader": "3.3.1",
+    "terser-webpack-plugin": "5.2.4",
+    "webpack": "5.61.0",
+    "webpack-dev-server": "4.4.0",
     "webpack-manifest-plugin": "4.0.2",
     "webpack-node-externals": "3.0.0"
   }

package/shared/inline-chunk-html-plugin.js

@@ -0,0 +1,64 @@
+// from: https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/InlineChunkHtmlPlugin.js
+
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict'
+
+class InlineChunkHtmlPlugin {
+  constructor(htmlWebpackPlugin, tests) {
+    this.htmlWebpackPlugin = htmlWebpackPlugin
+    this.tests = tests
+  }
+
+  getInlinedTag(publicPath, assets, tag) {
+    if (tag.tagName !== 'script' || !(tag.attributes && tag.attributes.src)) {
+      return tag
+    }
+    const scriptName = publicPath
+      ? tag.attributes.src.replace(publicPath, '')
+      : tag.attributes.src
+    if (!this.tests.some(test => scriptName.match(test))) {
+      return tag
+    }
+    const asset = assets[scriptName]
+    if (asset == null) {
+      return tag
+    }
+    return {tagName: 'script', innerHTML: asset.source(), closeTag: true}
+  }
+
+  apply(compiler) {
+    let publicPath = compiler.options.output.publicPath || ''
+    if (publicPath && !publicPath.endsWith('/')) {
+      publicPath += '/'
+    }
+
+    compiler.hooks.compilation.tap('InlineChunkHtmlPlugin', compilation => {
+      const tagFunction = tag =>
+        this.getInlinedTag(publicPath, compilation.assets, tag)
+
+      const hooks = this.htmlWebpackPlugin.getHooks(compilation)
+      hooks.alterAssetTagGroups.tap('InlineChunkHtmlPlugin', assets => {
+        assets.headTags = assets.headTags.map(tagFunction)
+        assets.bodyTags = assets.bodyTags.map(tagFunction)
+      })
+
+      // Still emit the runtime chunk for users who do not use our generated
+      // index.html file.
+      // hooks.afterEmit.tap('InlineChunkHtmlPlugin', () => {
+      //   Object.keys(compilation.assets).forEach(assetName => {
+      //     if (this.tests.some(test => assetName.match(test))) {
+      //       delete compilation.assets[assetName];
+      //     }
+      //   });
+      // });
+    })
+  }
+}
+
+module.exports = InlineChunkHtmlPlugin

package/utils/checkRequiredFiles.js

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/LICENSE
+ */
+
 const fs = require('fs')
 const path = require('path')
 
@@ -12,9 +19,11 @@ function checkRequiredFiles(files) {
   } catch (err) {
     const dirName = path.dirname(currentFilePath)
     const fileName = path.basename(currentFilePath)
-    console.log('Could not find a required file.')
-    console.log('  Name: ') + chalk.cyan(fileName)
-    console.log('  Searched in: ') + chalk.cyan(dirName)
+
+    console.log('Could not find a required file:')
+    console.log(`  Name: ${fileName}`)
+    console.log(`  Searched in: ${dirName}`)
+
     return false
   }
 }

package/utils/clearConsole.js

@@ -2,11 +2,9 @@
  * Copyright (c) 2015-present, Facebook, Inc.
  *
  * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE file in https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/LICENSE
  */
 
-'use strict'
-
 function clearConsole() {
   process.stdout.write(
     process.platform === 'win32' ? '\x1B[2J\x1B[0f' : '\x1B[2J\x1B[3J\x1B[H'

package/utils/formatWebpackMessages.js

@@ -2,15 +2,13 @@
  * Copyright (c) 2015-present, Facebook, Inc.
  *
  * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE file in https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/LICENSE
  */
 
-'use strict'
-
 const friendlySyntaxErrorLabel = 'Syntax error:'
 
 function isLikelyASyntaxError(message) {
-  return message.indexOf(friendlySyntaxErrorLabel) !== -1
+  return message.includes(friendlySyntaxErrorLabel)
 }
 
 // Cleans up webpack error messages.
@@ -20,11 +18,11 @@ function formatMessage(message) {
   if (typeof message === 'string') {
     lines = message.split('\n')
   } else if ('message' in message) {
-    lines = message['message'].split('\n')
+    lines = message.message.split('\n')
   } else if (Array.isArray(message)) {
     message.forEach(message => {
       if ('message' in message) {
-        lines = message['message'].split('\n')
+        lines = message.message.split('\n')
       }
     })
   }

package/webpack.config.dev.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 const path = require('path')
 const webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
@@ -16,6 +18,9 @@ const useExperimentalSCSSLoader =
 
 const smp = new SpeedMeasurePlugin()
 
+/** @typedef {import('webpack').Configuration} WebpackConfig */
+
+/** @type {WebpackConfig} */
 const webpackConfig = {
   mode: 'development',
   context: path.resolve(process.env.PWD, 'src'),

package/webpack.config.prod.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /* eslint-disable no-console */
 const webpack = require('webpack')
 const path = require('path')
@@ -5,7 +7,7 @@ const path = require('path')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const {WebpackManifestPlugin} = require('webpack-manifest-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin')
+const InlineChunkHtmlPlugin = require('./shared/inline-chunk-html-plugin.js')
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin')
 const {
   when,
@@ -19,7 +21,6 @@ const minifyCss = require('./shared/minify-css')
 const definePlugin = require('./shared/define')
 const babelRules = require('./shared/module-rules-babel')
 const manifestLoaderRules = require('./shared/module-rules-manifest-loader')
-const {splitChunks} = require('./shared/optimization-split-chunks')
 const {
   extractComments,
   useExperimentalMinifier,
@@ -40,6 +41,9 @@ const cssFileName = config.onlyHash
 
 const smp = new SpeedMeasurePlugin()
 
+/** @typedef {import('webpack').Configuration} WebpackConfig */
+
+/** @type {WebpackConfig} */
 const webpackConfig = {
   devtool: sourceMap,
   mode: 'production',
@@ -63,15 +67,12 @@ const webpackConfig = {
     publicPath: PUBLIC_PATH
   },
   optimization: {
-    // avoid looping over all the modules after the compilation
-    checkWasmTypes: false,
     minimize: true,
     minimizer: [
       minifyJs({useExperimentalMinifier, extractComments, sourceMap}),
       minifyCss()
     ].filter(Boolean),
-    runtimeChunk: true,
-    splitChunks
+    runtimeChunk: true
   },
   plugins: cleanList([
     new webpack.HashedModuleIdsPlugin(),

package/shared/optimization-split-chunks.js

@@ -1,31 +0,0 @@
-const {config} = require('./')
-
-const hasToSplitFrameworksOnChunk =
-  config.optimizations && config.optimizations.splitFrameworkOnChunk
-
-const frameworkSplitChunk = {
-  framework: {
-    chunks: 'all',
-    name: 'framework',
-    // This regex ignores nested copies of framework libraries so they're
-    // bundled with their issuer: https://github.com/vercel/next.js/pull/9012
-    test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types|use-subscription)[\\/]/,
-    priority: 40,
-    // Don't let webpack eliminate this chunk (prevents this chunk from
-    // becoming a part of the commons chunk)
-    enforce: true
-  }
-}
-
-exports.splitChunks = {
-  cacheGroups: {
-    ...(hasToSplitFrameworksOnChunk && frameworkSplitChunk),
-    vendor: {
-      chunks: 'all',
-      name: 'vendor',
-      test: 'vendor',
-      enforce: true,
-      reuseExistingChunk: true
-    }
-  }
-}