@eclipse-scout/cli 23.1.17 → 23.2.0-beta.4

package/bin/scout-scripts.js

@@ -251,7 +251,7 @@ function logWebpack(err, stats, statsConfig) {
     console.error(info.errors);
     process.exitCode = 1; // let the webpack build fail on errors
   }
-  if (stats.hasWarnings()) {
+  if (info.warnings && info.warnings.length > 0) {
     console.warn(info.warnings);
   }
   statsConfig = statsConfig || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/cli",
-  "version": "23.1.17",
+  "version": "23.2.0-beta.4",
   "description": "CLI for Eclipse Scout",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -28,16 +28,16 @@
     "scripts"
   ],
   "dependencies": {
-    "esbuild": "0.15.16",
-    "@babel/core": "7.20.5",
-    "@babel/preset-env": "7.20.2",
-    "babel-loader": "9.1.0",
-    "typescript": "4.9.3",
-    "ts-loader": "9.4.1",
+    "esbuild": "0.17.17",
+    "@babel/core": "7.21.4",
+    "@babel/preset-env": "7.21.4",
+    "babel-loader": "9.1.2",
+    "typescript": "4.9.5",
+    "ts-loader": "9.4.2",
     "source-map-loader": "4.0.1",
     "copy-webpack-plugin": "11.0.0",
-    "css-loader": "6.7.2",
-    "jasmine-core": "4.5.0",
+    "css-loader": "6.7.3",
+    "jasmine-core": "4.6.0",
     "jasmine-jquery": "2.1.1",
     "jquery": "3.6.0",
     "karma": "6.4.1",
@@ -45,20 +45,20 @@
     "karma-jasmine": "5.1.0",
     "karma-jasmine-ajax": "0.1.13",
     "@metahub/karma-jasmine-jquery": "4.0.1",
-    "@eclipse-scout/karma-jasmine-scout": "23.1.17",
-    "@eclipse-scout/tsconfig": "23.1.17",
+    "@eclipse-scout/karma-jasmine-scout": "23.2.0-beta.4",
+    "@eclipse-scout/tsconfig": "23.2.0-beta.4",
     "karma-jasmine-html-reporter": "2.0.0",
     "karma-junit-reporter": "2.0.1",
     "karma-webpack": "5.0.0",
     "less": "4.1.3",
     "less-loader": "11.1.0",
-    "mini-css-extract-plugin": "2.7.1",
-    "css-minimizer-webpack-plugin": "4.2.2",
-    "terser-webpack-plugin": "5.3.6",
-    "webpack": "5.76.2",
+    "mini-css-extract-plugin": "2.7.5",
+    "css-minimizer-webpack-plugin": "5.0.0",
+    "terser-webpack-plugin": "5.3.7",
+    "webpack": "5.80.0",
     "yargs-parser": "21.1.1",
-    "fork-ts-checker-webpack-plugin": "7.2.13",
-    "fork-ts-checker-notifier-webpack-plugin": "6.0.0"
+    "fork-ts-checker-webpack-plugin": "8.0.0",
+    "fork-ts-checker-notifier-webpack-plugin": "7.0.0"
   },
   "devDependencies": {
     "@eclipse-scout/releng": "^22.0.0"

package/scripts/post-build.js

@@ -55,7 +55,6 @@ module.exports = {
       return;
     }
     fs.writeFileSync(path.join(dir, scoutBuild.fileListName), content, {flag: 'w'});
-    console.log(`created ${scoutBuild.fileListName}:\n${content}`);
   },
   cleanOutDir: dir => {
     if (!fs.existsSync(dir)) {

package/scripts/webpack-defaults.js

@@ -23,6 +23,15 @@ const {SourceMapDevToolPlugin, WatchIgnorePlugin, ProgressPlugin} = require('web
  * @param {boolean} args.watch true, if webpack runs in watch mode. Default is false.
  * @param {[]} args.resDirArray an array containing directories which should be copied to dist/res
  * @param {object} args.tsOptions a config object to be passed to the ts-loader
+ * @param {boolean|'fork'} args.typeCheck
+ *    true: let the TypeScript compiler check the types.
+ *    false: let the TypeScript compiler only transpile the TypeScript code without checking types, which makes it faster.
+ *    fork: starts a separate process to run the type checks so that the build won't be blocked until type check completes.
+ *          Also shows a notification if type check fails. This mode needs more memory.
+ *    auto:
+ *    - In prod mode, types won't be checked (typeCheck is false).
+ *    - In dev mode, types will be checked (typeCheck is true).
+ *    - In watch mode: types will be checked in a separate process (typeCheck is fork).
  */
 module.exports = (env, args) => {
   const buildMode = args.mode;
@@ -31,7 +40,12 @@ module.exports = (env, args) => {
   const isWatchMode = nvl(args.watch, false);
   const outDir = scoutBuildConstants.getOutputDir(buildMode);
   const resDirArray = args.resDirArray || ['res'];
+  let typeCheck = computeTypeCheck(args.typeCheck, devMode, isWatchMode);
   console.log(`Webpack mode: ${buildMode}`);
+  if (isWatchMode) {
+    console.log('File watching enabled');
+  }
+  console.log(`Type check: ${typeCheck}`);
 
   // # Copy static web-resources delivered by the modules
   const copyPluginConfig = [];
@@ -61,8 +75,7 @@ module.exports = (env, args) => {
     ]
   };
 
-  // in prod mode always only transpile (no type-checks). In dev mode type checking is skipped in watch mode. Instead, ForkTsCheckerWebpackPlugin is used then (see below).
-  const transpileOnly = !devMode || isWatchMode;
+  const transpileOnly = typeCheck === 'fork' ? true : !typeCheck;
   const tsOptions = {
     ...args.tsOptions,
     transpileOnly: transpileOnly,
@@ -222,35 +235,41 @@ module.exports = (env, args) => {
     config.plugins.push(new ProgressPlugin({profile: args.profile}));
   }
 
-  if (devMode) {
-    if (transpileOnly) { // devMode and no type-checks: perform checks asynchronously (watch mode).
-      const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-      const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
-
-      let forkTsCheckerConfig = undefined;
-      if (!fs.existsSync('./tsconfig.json')) {
-        // if the module has no tsconfig: use default from Scout.
-        // Otherwise, each module would need to provide a tsconfig even if there is no typescript code in the module.
-        forkTsCheckerConfig = {
-          typescript: {
-            configFile: require.resolve('@eclipse-scout/tsconfig'),
-            context: process.cwd(),
-            configOverwrite: {
-              compilerOptions: {skipLibCheck: true, sourceMap: false, inlineSourceMap: false, declarationMap: false, allowJs: true},
-              include: isMavenModule ? ['./src/main/js/**/*.ts', './src/main/js/**/*.js', './src/test/js/**/*.ts', './src/test/js/**/*.js']
-                : ['./src/**/*.ts', './src/**/*.js', './test/**/*.ts', './test/**/*.js']
-            }
-          }
-        };
+  if (typeCheck === 'fork') {
+    // perform type checks asynchronously in a separate process
+    const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+    const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
+
+    let forkTsCheckerConfig = {
+      typescript: {
+        memoryLimit: 4096
       }
-      config.plugins.push(new ForkTsCheckerWebpackPlugin(forkTsCheckerConfig));
-      config.plugins.push(new ForkTsCheckerNotifierWebpackPlugin({
-        title: getModuleName(),
-        skipSuccessful: true, // no notification for successful builds
-        excludeWarnings: true // no notification for warnings
-      }));
+    };
+    if (!fs.existsSync('./tsconfig.json')) {
+      // if the module has no tsconfig: use default from Scout.
+      // Otherwise, each module would need to provide a tsconfig even if there is no typescript code in the module.
+      forkTsCheckerConfig = {
+        typescript: {
+          ...forkTsCheckerConfig.typescript,
+          configFile: require.resolve('@eclipse-scout/tsconfig'),
+          context: process.cwd(),
+          configOverwrite: {
+            compilerOptions: {skipLibCheck: true, sourceMap: false, inlineSourceMap: false, declarationMap: false, allowJs: true},
+            include: isMavenModule ? ['./src/main/js/**/*.ts', './src/main/js/**/*.js', './src/test/js/**/*.ts', './src/test/js/**/*.js']
+              : ['./src/**/*.ts', './src/**/*.js', './test/**/*.ts', './test/**/*.js']
+          }
+        }
+      };
     }
-  } else {
+    config.plugins.push(new ForkTsCheckerWebpackPlugin(forkTsCheckerConfig));
+    config.plugins.push(new ForkTsCheckerNotifierWebpackPlugin({
+      title: getModuleName(),
+      skipSuccessful: true, // no notification for successful builds
+      excludeWarnings: true // no notification for warnings
+    }));
+  }
+
+  if (!devMode) {
     const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
     const TerserPlugin = require('terser-webpack-plugin');
     config.optimization.minimizer = [
@@ -490,14 +509,13 @@ function nvl(arg, defaultValue) {
 }
 
 function isWarningIgnored(devMode, webpackError) {
-  if (webpackError && webpackError.message === '[object Object]') {
-    return true; // esbuild warnings are not correctly passed to webpack. ignore them. The actual message is printed with the esbuild flag 'logLevel' (see below)
-  }
-
-  if (devMode || !webpackError || !webpackError.warning || !webpackError.warning.message) {
+  if (devMode || !webpackError) {
     return false;
   }
-  return webpackError.warning.message.startsWith('Failed to parse source map');
+  // Ignore warnings from esbuild minifier.
+  // One warning is 'Converting "require" to "esm" is currently not supported' which is not of interest.
+  // Others may be created by third party libs which are not of interest as well.
+  return webpackError.name === 'Warning';
 }
 
 /**
@@ -554,6 +572,23 @@ function rewriteIndexImports(newImport, excludedFolder) {
   };
 }
 
+function computeTypeCheck(typeCheck, devMode, watchMode) {
+  typeCheck = nvl(typeCheck, 'auto');
+  if (typeCheck !== 'auto' && typeCheck !== 'fork') {
+    typeCheck = typeCheck.toLowerCase() === 'true';
+  }
+  if (typeCheck !== 'auto') {
+    return typeCheck;
+  }
+  if (!devMode) {
+    return false;
+  }
+  if (watchMode) {
+    return 'fork';
+  }
+  return true;
+}
+
 module.exports.addThemes = addThemes;
 module.exports.libraryConfig = libraryConfig;
 module.exports.markExternals = markExternals;