@s-ui/bundler 9.31.0 → 9.34.0

package/bin/sui-bundler-build.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+
+// @ts-check
+
 /* eslint-disable no-console */
 
 const fs = require('fs')
@@ -63,21 +66,24 @@ if (clean) {
 
 log.processing('Generating minified bundle...')
 
-webpack(nextConfig).run(async (error, stats) => {
+const compiler = webpack(nextConfig)
+
+compiler.run(async (error, stats) => {
   if (error) {
     log.error(error)
-    return 1
+    return process.exit(1)
   }
 
-  if (stats.hasErrors()) {
+  if (stats?.hasErrors()) {
     const jsonStats = stats.toJson('errors-only')
-    return jsonStats.errors.map(({message}) => log.error(message))
+    jsonStats?.errors?.map(({message}) => log.error(message))
+    return process.exit(1)
   }
 
-  if (stats.hasWarnings()) {
+  if (stats?.hasWarnings()) {
     const jsonStats = stats.toJson('errors-warnings')
     log.warn('Webpack generated the following warnings: ')
-    jsonStats.warnings.map(({message}) => log.warn(message))
+    jsonStats?.warnings?.map(({message}) => log.warn(message))
   }
 
   console.log(`Webpack stats: ${stats}`)
@@ -147,5 +153,9 @@ webpack(nextConfig).run(async (error, stats) => {
     `Your app is compiled in ${process.env.NODE_ENV} mode in /public. It's ready to roll!`
   )
 
-  return 0
+  compiler.close(closeErr => {
+    const exitCode = closeErr ? 1 : 0
+    if (closeErr) return process.exit(exitCode)
+    return process.exit(0)
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-ui/bundler",
-  "version": "9.31.0",
+  "version": "9.34.0",
   "description": "Config-free bundler for ES6 React apps.",
   "bin": {
     "sui-bundler": "./bin/sui-bundler.js"

package/shared/module-rules-babel.js

@@ -1,9 +1,13 @@
-const {sep} = require('path')
+const path = require('path')
 const {config} = require('./index.js')
 
-module.exports = {
+const EXCLUDED_FOLDERS_REGEXP = new RegExp(
+  `node_modules(?!${path.sep}@s-ui(${path.sep}studio)(${path.sep}workbench)?${path.sep}src)`
+)
+
+module.exports = ({isServer = false} = {}) => ({
   test: /\.jsx?$/,
-  exclude: new RegExp(`node_modules(?!${sep}@s-ui${sep}studio${sep}src)`),
+  exclude: EXCLUDED_FOLDERS_REGEXP,
   use: [
     {
       loader: require.resolve('babel-loader'),
@@ -16,6 +20,8 @@ module.exports = {
           [
             require.resolve('babel-preset-sui'),
             {
+              isServer,
+              supportLegacyBrowsers: true,
               targets: config.targets
             }
           ]
@@ -23,4 +29,4 @@ module.exports = {
       }
     }
   ]
-}
+})

package/webpack.config.dev.js

@@ -16,13 +16,11 @@ const manifestLoaderRules = require('./shared/module-rules-manifest-loader.js')
 const {aliasFromConfig, defaultAlias} = require('./shared/resolve-alias.js')
 
 const {resolveLoader} = require('./shared/resolve-loader.js')
+const createBabelRules = require('./shared/module-rules-babel.js')
 
-const EXCLUDED_FOLDERS_REGEXP = new RegExp(
-  `node_modules(?!${path.sep}@s-ui(${path.sep}studio)(${path.sep}workbench)?${path.sep}src)`
-)
 const outputPath = path.join(process.cwd(), 'dist')
 
-const {CI = false} = process.env
+const {CI = false, PWD = ''} = process.env
 
 process.env.NODE_ENV = 'development'
 
@@ -31,7 +29,7 @@ process.env.NODE_ENV = 'development'
 /** @type {WebpackConfig} */
 const webpackConfig = {
   mode: 'development',
-  context: path.resolve(process.env.PWD, 'src'),
+  context: path.resolve(PWD, 'src'),
   resolve: {
     alias: {
       ...defaultAlias,
@@ -81,20 +79,7 @@ const webpackConfig = {
   resolveLoader,
   module: {
     rules: cleanList([
-      {
-        test: /\.jsx?$/,
-        exclude: EXCLUDED_FOLDERS_REGEXP,
-        use: [
-          {
-            loader: require.resolve('babel-loader'),
-            options: {
-              babelrc: false,
-              cacheDirectory: true,
-              presets: [require.resolve('babel-preset-sui')]
-            }
-          }
-        ]
-      },
+      createBabelRules(),
       {
         test: /(\.css|\.scss)$/,
         use: cleanList([

package/webpack.config.lib.js

@@ -9,7 +9,7 @@ const {
 const path = require('path')
 const minifyJs = require('./shared/minify-js.js')
 const definePlugin = require('./shared/define.js')
-const babelRules = require('./shared/module-rules-babel.js')
+const createBabelRules = require('./shared/module-rules-babel.js')
 const sassRules = require('./shared/module-rules-sass.js')
 const {extractComments, sourceMap} = require('./shared/config.js')
 const {aliasFromConfig} = require('./shared/resolve-alias.js')
@@ -63,6 +63,6 @@ module.exports = {
     definePlugin()
   ]),
   module: {
-    rules: [babelRules, sassRules]
+    rules: [createBabelRules(), sassRules]
   }
 }

package/webpack.config.prod.js

@@ -23,14 +23,16 @@ const {
   supportLegacyBrowsers
 } = require('./shared/config.js')
 const {resolveLoader} = require('./shared/resolve-loader.js')
-const babelRules = require('./shared/module-rules-babel.js')
+const createBabelRules = require('./shared/module-rules-babel.js')
 const sassRules = require('./shared/module-rules-sass.js')
 const definePlugin = require('./shared/define.js')
 const manifestLoaderRules = require('./shared/module-rules-manifest-loader.js')
 const minifyCss = require('./shared/minify-css.js')
 const minifyJs = require('./shared/minify-js.js')
 
+const CWD = process.cwd()
 const PUBLIC_PATH = process.env.CDN || config.cdn || '/'
+const PWD = process.env.PWD ?? ''
 
 const filename = config.onlyHash
   ? '[contenthash:8].js'
@@ -49,11 +51,11 @@ const webpackConfig = {
   devtool: sourceMap,
   mode: 'production',
   target,
-  context: path.resolve(process.cwd(), 'src'),
+  context: path.resolve(CWD, 'src'),
   resolve: {
     alias: {...aliasFromConfig},
     extensions: ['.js', '.json'],
-    modules: ['node_modules', path.resolve(process.cwd())],
+    modules: ['node_modules', path.resolve(CWD)],
     fallback: {
       assert: false,
       fs: false,
@@ -66,7 +68,7 @@ const webpackConfig = {
   output: {
     chunkFilename: filename,
     filename,
-    path: path.resolve(process.env.PWD, 'public'),
+    path: path.resolve(PWD, 'public'),
     publicPath: PUBLIC_PATH
   },
   optimization: {
@@ -109,7 +111,7 @@ const webpackConfig = {
   ]),
   module: {
     rules: cleanList([
-      babelRules,
+      createBabelRules(),
       sassRules,
       when(config['externals-manifest'], () =>
         manifestLoaderRules(config['externals-manifest'])

package/webpack.config.server.js

@@ -3,7 +3,7 @@ const webpackNodeExternals = require('webpack-node-externals')
 const path = require('path')
 
 const {config, when, cleanList} = require('./shared/index.js')
-const babelRules = require('./shared/module-rules-babel.js')
+const createBabelRules = require('./shared/module-rules-babel.js')
 const manifestLoaderRules = require('./shared/module-rules-manifest-loader.js')
 const {aliasFromConfig} = require('./shared/resolve-alias.js')
 const {resolveLoader} = require('./shared/resolve-loader.js')
@@ -39,7 +39,7 @@ const webpackConfig = {
   resolveLoader,
   module: {
     rules: cleanList([
-      babelRules,
+      createBabelRules({isServer: true}),
       {
         // ignore css/scss/svg require/imports files in the server
         test: /(\.svg|\.s?css)$/,