@eclipse-scout/cli 11.0.41 → 22.0.0-beta.5

package/README.md

@@ -3,8 +3,8 @@
 </p>
 
 <p align="center">
-  <a href="https://ci.eclipse.org/scout/view/Scout%20Nightly%20Jobs/job/scout-integration-11.0-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins" src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fview%2FScout%2520Nightly%2520Jobs%2Fjob%2Fscout-integration-11.0-RT-nightly_pipeline%2F"></a>
-  <a href="https://ci.eclipse.org/scout/view/Scout%20Nightly%20Jobs/job/scout-integration-11.0-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins tests" src="https://img.shields.io/jenkins/tests?compact_message&jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fview%2FScout%2520Nightly%2520Jobs%2Fjob%2Fscout-integration-11.0-RT-nightly_pipeline%2F"></a>
+  <a href="https://ci.eclipse.org/scout/view/Scout%20Nightly%20Jobs/job/scout-integration-22.0-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins" src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fview%2FScout%2520Nightly%2520Jobs%2Fjob%2Fscout-integration-22.0-RT-nightly_pipeline%2F"></a>
+  <a href="https://ci.eclipse.org/scout/view/Scout%20Nightly%20Jobs/job/scout-integration-22.0-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins tests" src="https://img.shields.io/jenkins/tests?compact_message&jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fview%2FScout%2520Nightly%2520Jobs%2Fjob%2Fscout-integration-22.0-RT-nightly_pipeline%2F"></a>
   <a href="https://www.npmjs.com/package/@eclipse-scout/cli" target="_blank" rel="noopener noreferrer"><img alt="npm" src="https://img.shields.io/npm/dm/@eclipse-scout/cli"></a>
   <a href="https://www.eclipse.org/legal/epl-v10.html" target="_blank" rel="noopener noreferrer"><img alt="NPM" src="https://img.shields.io/npm/l/@eclipse-scout/cli"></a>
   <a href="https://www.npmjs.com/package/@eclipse-scout/cli" target="_blank" rel="noopener noreferrer"><img alt="npm (scoped)" src="https://img.shields.io/npm/v/@eclipse-scout/cli"></a>
@@ -14,7 +14,7 @@
 
 # Eclipse Scout - CLI
 
-Command Line Interface for the [Eclipse Scout](https://www.eclipse.org/scout/) framework.
+Command Line Interface for the [Eclipse Scout](https://www.npmjs.com/package/@eclipse-scout/core) framework.
 
 ## License
 

package/bin/scout-scripts.js

@@ -29,7 +29,7 @@ const path = require('path');
 const webpackConfigFileName = './webpack.config.js';
 const webpackCustomConfigFileName = './webpack.config.custom.js';
 const webpackYargsOptions = {
-  boolean: ['progress', 'profile', 'clean'],
+  boolean: ['progress', 'profile'],
   array: ['resDirArray', 'themes']
 };
 const karmaYargsOptions = prepareWebpackYargsOptionsForKarma();
@@ -154,8 +154,6 @@ function readWebpackConfig() {
 
 function runWebpackWatch(args) {
   const configFilePath = readWebpackConfig();
-  // Don't clean the dist folder in watch mode, may be overridden by command line argument
-  args = Object.assign({clean: false}, args);
   const {compiler, statsConfig} = createWebpackCompiler(configFilePath, args);
   compiler.watch({}, (err, stats) => logWebpack(err, stats, statsConfig));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/cli",
-  "version": "11.0.41",
+  "version": "22.0.0-beta.5",
   "description": "CLI for Eclipse Scout",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -10,9 +10,9 @@
   },
   "license": "EPL-1.0",
   "engines": {
-    "node": ">=12.2.0",
-    "npm": ">=6.9.0",
-    "pnpm": ">=5"
+    "node": ">=16.13.0",
+    "npm": ">=8.1.0",
+    "pnpm": ">=6.22.2"
   },
   "keywords": [
     "scout",
@@ -27,48 +27,48 @@
     "bin",
     "scripts"
   ],
-  "scripts": {
-    "snapshot-cleanup": "releng-scripts snapshot-cleanup",
-    "snapshot-predependency": "releng-scripts snapshot-install-dependency",
-    "snapshot-postdependency": "releng-scripts snapshot-publish-dependency",
-    "release-predependency": "releng-scripts release-install-dependency",
-    "release-postdependency": "releng-scripts release-publish-dependency"
-  },
   "dependencies": {
-    "@babel/cli": "7.11.6",
-    "@babel/core": "7.11.6",
-    "@babel/plugin-proposal-class-properties": "7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "7.11.0",
-    "@babel/plugin-transform-object-assign": "7.10.4",
-    "@babel/preset-env": "7.11.5",
-    "babel-loader": "8.1.0",
-    "clean-webpack-plugin": "3.0.0",
-    "copy-webpack-plugin": "6.1.0",
-    "css-loader": "4.3.0",
-    "jasmine-core": "3.6.0",
+    "@babel/cli": "7.16.0",
+    "@babel/core": "7.16.5",
+    "@babel/plugin-proposal-class-properties": "7.16.5",
+    "@babel/plugin-proposal-object-rest-spread": "7.16.5",
+    "@babel/plugin-transform-object-assign": "7.16.5",
+    "@babel/preset-env": "7.16.5",
+    "babel-loader": "8.2.3",
+    "copy-webpack-plugin": "10.2.0",
+    "style-loader": "3.3.1",
+    "css-loader": "6.5.1",
+    "jasmine-core": "3.10.1",
     "jasmine-jquery": "2.1.1",
-    "jquery": "3.5.1",
-    "karma": "5.2.2",
+    "jquery": "3.6.0",
+    "karma": "6.3.9",
     "karma-chrome-launcher": "3.1.0",
     "karma-jasmine": "4.0.1",
     "karma-jasmine-ajax": "0.1.13",
     "@metahub/karma-jasmine-jquery": "4.0.1",
-    "@eclipse-scout/karma-jasmine-scout": "11.0.41",
-    "karma-jasmine-html-reporter": "1.5.4",
+    "@eclipse-scout/karma-jasmine-scout": "22.0.0-beta.5",
+    "karma-jasmine-html-reporter": "1.7.0",
     "karma-junit-reporter": "2.0.1",
-    "karma-webpack": "4.0.2",
-    "less": "3.12.2",
-    "less-loader": "7.0.1",
-    "mini-css-extract-plugin": "0.11.2",
-    "optimize-css-assets-webpack-plugin": "5.0.4",
-    "terser-webpack-plugin": "4.2.0",
-    "webpack": "4.44.1",
-    "yargs-parser": "20.0.0"
+    "karma-webpack": "5.0.0",
+    "less": "4.1.2",
+    "less-loader": "10.2.0",
+    "mini-css-extract-plugin": "2.4.5",
+    "css-minimizer-webpack-plugin": "3.3.0",
+    "terser-webpack-plugin": "5.3.0",
+    "webpack": "5.65.0",
+    "yargs-parser": "21.0.0"
   },
   "devDependencies": {
-    "@eclipse-scout/releng": "^10.0.0"
+    "@eclipse-scout/releng": "^22.0.0"
   },
   "bin": {
     "scout-scripts": "./bin/scout-scripts.js"
+  },
+  "scripts": {
+    "cleanup:snapshots": "releng-scripts cleanup:snapshots",
+    "version:snapshot:dependencies": "releng-scripts version:snapshot:dependencies",
+    "version:snapshot": "releng-scripts version:snapshot",
+    "version:release:dependencies": "releng-scripts version:release:dependencies",
+    "version:release": "releng-scripts version:release"
   }
 }

package/scripts/karma-defaults.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,6 +27,16 @@ module.exports = (config, specEntryPoint) => {
   const webpackArgs = Object.assign({mode: scoutBuild.mode.development}, config.webpackArgs);
   const webpackConfig = webpackConfigProvider(null, webpackArgs);
   delete webpackConfig.entry;
+  if (webpackConfig.optimization) {
+    delete webpackConfig.optimization.splitChunks; // disable splitting for tests
+  }
+  if (webpackConfig.output) {
+    delete webpackConfig.output.filename;
+  }
+  if (webpackConfig.output && webpackConfig.output.path) {
+    fs.mkdirSync(webpackConfig.output.path, {recursive: true});
+  }
+  webpackConfig.watch = true;
 
   const sourceMapPlugin = webpackConfig.plugins.find(plugin => plugin instanceof webpack.SourceMapDevToolPlugin);
   if (sourceMapPlugin) {
@@ -41,14 +51,10 @@ module.exports = (config, specEntryPoint) => {
   config.set({
     browsers: ['Chrome'],
     files: [
-      {
-        pattern: jquery,
-        watched: false
-      }, {
-        pattern: specIndex,
-        watched: false
-      }],
-    frameworks: ['jasmine-scout', 'jasmine-jquery', 'jasmine-ajax', 'jasmine'], /* order of the frameworks is relevant! */
+      {pattern: jquery, watched: false},
+      {pattern: specIndex, watched: false}
+    ],
+    frameworks: ['webpack', 'jasmine-scout', 'jasmine-jquery', 'jasmine-ajax', 'jasmine'], /* order of the frameworks is relevant! */
     // Reporter for "Jasmine Spec Runner" results in browser
     // https://www.npmjs.com/package/karma-jasmine-html-reporter
     reporters: ['kjhtml', 'junit'],

package/scripts/post-build.js

@@ -23,7 +23,6 @@ function deleteFile(filename) {
         if (unlinkErr) {
           throw unlinkErr;
         }
-        console.log(`deleted ${filename}`);
       });
     }
   });

package/scripts/webpack-defaults.js

@@ -8,7 +8,6 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-const {CleanWebpackPlugin} = require('clean-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const AfterEmitWebpackPlugin = require('./AfterEmitWebpackPlugin');
@@ -19,7 +18,6 @@ const webpack = require('webpack');
 
 /**
  * @param {string} args.mode development or production
- * @param {boolean} args.clean true, to clean the dist folder before each build. Default is true.
  * @param {boolean} args.progress true, to show build progress in percentage. Default is true.
  * @param {boolean} args.profile true, to show timing information for each build step. Default is false.
  * @param {[]} args.resDirArray an array containing directories which should be copied to dist/res
@@ -51,10 +49,50 @@ module.exports = (env, args) => {
     // In production mode create external source maps without source code to map stack traces.
     // Otherwise stack traces would point to the minified source code which makes it quite impossible to analyze productive issues.
     devtool: devMode ? false : 'nosources-source-map',
+    resolve: {
+
+      // no automatic polyfills. clients must add the desired polyfills themselves.
+      fallback: {
+        assert: false,
+        buffer: false,
+        console: false,
+        constants: false,
+        crypto: false,
+        domain: false,
+        events: false,
+        http: false,
+        https: false,
+        os: false,
+        path: false,
+        punycode: false,
+        process: false,
+        querystring: false,
+        stream: false,
+        string_decoder: false,
+        sys: false,
+        timers: false,
+        tty: false,
+        url: false,
+        util: false,
+        vm: false,
+        zlib: false
+      }
+    },
+    // expect these apis in the browser
+    externals: {
+      'crypto': 'crypto',
+      'canvas': 'canvas',
+      'fs': 'fs',
+      'http': 'http',
+      'https': 'https',
+      'url': 'url',
+      'zlib': 'zlib'
+    },
     output: {
       filename: jsFilename,
       path: outDir,
-      devtoolModuleFilenameTemplate: devMode ? undefined : prodDevtoolModuleFilenameTemplate
+      devtoolModuleFilenameTemplate: devMode ? undefined : prodDevtoolModuleFilenameTemplate,
+      clean: true
     },
     performance: {
       hints: false
@@ -91,7 +129,8 @@ module.exports = (env, args) => {
             sourceMap: devMode,
             lessOptions: {
               relativeUrls: false,
-              rewriteUrls: 'off'
+              rewriteUrls: 'off',
+              math: 'always'
             }
           }
         }]
@@ -112,16 +151,27 @@ module.exports = (env, args) => {
               [require.resolve('@babel/preset-env'), {
                 debug: false,
                 targets: {
-                  firefox: '35',
-                  chrome: '40',
-                  ie: '11',
-                  edge: '12',
-                  safari: '8'
+                  firefox: '62',
+                  chrome: '69',
+                  safari: '12.1'
                 }
               }]
             ]
           }
         }
+      }, {
+        // to support css imports (currently not used by Scout but might be used by included 3rd party libs)
+        test: /\.css$/i,
+        use: [{
+          loader: require.resolve('style-loader')
+        }, {
+          loader: require.resolve('css-loader'),
+          options: {
+            sourceMap: devMode,
+            modules: false, // We don't want to work with CSS modules
+            url: false // Don't resolve URLs in LESS, because relative path does not match /res/fonts
+          }
+        }]
       }]
     },
     plugins: [
@@ -132,7 +182,8 @@ module.exports = (env, args) => {
     ],
     optimization: {
       splitChunks: {
-        chunks: 'all'
+        chunks: 'all',
+        name: (module, chunks, cacheGroupKey) => computeChunkName(module, chunks, cacheGroupKey)
       }
     }
   };
@@ -150,13 +201,13 @@ module.exports = (env, args) => {
   }
 
   if (!devMode) {
-    const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+    const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
     const TerserPlugin = require('terser-webpack-plugin');
     config.optimization.minimizer = [
       // minify css
-      new OptimizeCssAssetsPlugin({
-        assetNameRegExp: /\.min\.css$/g,
-        cssProcessorPluginOptions: {
+      new CssMinimizerPlugin({
+        test: /\.min\.css$/g,
+        minimizerOptions: {
           preset: ['default', {
             discardComments: {removeAll: true}
           }]
@@ -164,18 +215,11 @@ module.exports = (env, args) => {
       }),
       // minify js
       new TerserPlugin({
-        test: /\.js(\?.*)?$/i,
-        cache: true,
-        parallel: true
+        test: /\.js(\?.*)?$/i
       })
     ];
   }
 
-  if (nvl(args.clean, false)) {
-    // see: https://webpack.js.org/guides/output-management/#cleaning-up-the-dist-folder
-    config.plugins.push(new CleanWebpackPlugin());
-  }
-
   if (devMode) {
     // Use external source maps also in dev mode because the browser is very slow in displaying a file containing large lines which is the case if source maps are inlined
     config.plugins.push(new webpack.SourceMapDevToolPlugin({
@@ -218,14 +262,66 @@ function addThemes(entry, options = {}) {
   });
 }
 
+function computeChunkName(module, chunks, cacheGroupKey) {
+  const entryPointDelim = '~';
+  const allChunksNames = chunks
+    .map(chunk => chunk.name)
+    .filter(chunkName => !!chunkName)
+    .join(entryPointDelim);
+  let fileName = cacheGroupKey === 'defaultVendors' ? 'vendors' : cacheGroupKey;
+
+  if (allChunksNames.length < 1) {
+    // there is no chunk name (e.g. lazy loaded module): derive chunk-name from filename
+    const segmentDelim = '-';
+    if (fileName.length > 0) {
+      fileName += segmentDelim;
+    }
+    return fileName + computeModuleId(module);
+  }
+
+  if (fileName.length > 0) {
+    fileName += entryPointDelim;
+  }
+  return fileName + allChunksNames;
+}
+
+function computeModuleId(module) {
+  const nodeModules = 'node_modules';
+  let id = module.userRequest;
+  const nodeModulesPos = id.lastIndexOf(nodeModules);
+  if (nodeModulesPos < 0) {
+    // use file name
+    id = path.basename(id, '.js');
+  } else {
+    // use js-module name
+    id = id.substring(nodeModulesPos + nodeModules.length + path.sep.length);
+    let end = id.indexOf(path.sep);
+    if (end >= 0) {
+      if (id.startsWith('@')) {
+        const next = id.indexOf(path.sep, end + 1);
+        if (next >= 0) {
+          end = next;
+        }
+      }
+      id = id.substring(0, end);
+    }
+  }
+
+  return id.replace(/[/\\\-@:_.|]+/g, '').toLowerCase();
+}
+
 function ensureArray(array) {
   if (array === undefined || array === null) {
     return [];
   }
-  if (!Array.isArray(array)) {
-    return [array];
+  if (Array.isArray(array)) {
+    return array;
+  }
+  const isIterable = typeof array[Symbol.iterator] === 'function' && typeof array !== 'string';
+  if (isIterable) {
+    return Array.from(array);
   }
-  return array;
+  return [array];
 }
 
 function nvl(arg, defaultValue) {