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

package/bin/scout-scripts.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * Copyright (c) 2014-2019 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -29,7 +29,7 @@ const path = require('path');
 const webpackConfigFileName = './webpack.config.js';
 const webpackCustomConfigFileName = './webpack.config.custom.js';
 const webpackYargsOptions = {
-  boolean: ['progress', 'profile'],
+  boolean: ['progress', 'profile', 'clean'],
   array: ['resDirArray', 'themes']
 };
 const karmaYargsOptions = prepareWebpackYargsOptionsForKarma();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/cli",
-  "version": "22.0.0-beta.5",
+  "version": "22.0.2",
   "description": "CLI for Eclipse Scout",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -46,7 +46,7 @@
     "karma-jasmine": "4.0.1",
     "karma-jasmine-ajax": "0.1.13",
     "@metahub/karma-jasmine-jquery": "4.0.1",
-    "@eclipse-scout/karma-jasmine-scout": "22.0.0-beta.5",
+    "@eclipse-scout/karma-jasmine-scout": "22.0.2",
     "karma-jasmine-html-reporter": "1.7.0",
     "karma-junit-reporter": "2.0.1",
     "karma-webpack": "5.0.0",

package/scripts/constants.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -16,6 +16,12 @@ const mode = {
   development: 'development'
 };
 
+const outDir = {
+  target: 'target',
+  dist: 'dist',
+  distKarma: 'dist-karma'
+};
+
 const outSubDir = {
   production: 'prod',
   development: 'dev'
@@ -31,26 +37,17 @@ const cssFilename = {
   development: '[name].css'
 };
 
-function getOutputDir() {
-  if (isMavenModule()) {
-    return 'target/dist'; // default for scout classic
-  }
-  return 'dist'; // default for scout js
-}
-
-function isMavenModule() {
-  const workingDir = process.cwd();
-  return fs.existsSync(path.resolve(workingDir, 'src', 'main')) || fs.existsSync(path.resolve(workingDir, 'src', 'test'));
-}
-
 module.exports = {
   mode: mode,
-  outDir: getOutputDir(),
+  outDir: outDir,
   outSubDir: outSubDir,
   fileListName: 'file-list',
   jsFilename: jsFilename,
   cssFilename: cssFilename,
-  isMavenModule,
+  isMavenModule: () => {
+    const workingDir = process.cwd();
+    return fs.existsSync(path.resolve(workingDir, 'src', 'main')) || fs.existsSync(path.resolve(workingDir, 'src', 'test'));
+  },
   getConstantsForMode: buildMode => {
     if (buildMode !== mode.production) {
       return {

package/scripts/karma-defaults.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -8,13 +8,14 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
+const fs = require('fs');
 const path = require('path');
-const scoutBuild = require('./constants');
 
 const jquery = require.resolve('jquery');
-const fs = require('fs');
 const webpack = require('webpack');
 
+const scoutBuildConstants = require('./constants');
+
 module.exports = (config, specEntryPoint) => {
   const webpackConfigFilePath = path.resolve('webpack.config.js');
   if (!fs.existsSync(webpackConfigFilePath)) {
@@ -24,18 +25,23 @@ module.exports = (config, specEntryPoint) => {
   }
   let webpackConfigProvider = require(webpackConfigFilePath);
 
-  const webpackArgs = Object.assign({mode: scoutBuild.mode.development}, config.webpackArgs);
+  const webpackArgs = Object.assign({mode: scoutBuildConstants.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) {
+    // remove output file as Karma uses an in-memory middleware and complains if an output file is present
     delete webpackConfig.output.filename;
   }
-  if (webpackConfig.output && webpackConfig.output.path) {
-    fs.mkdirSync(webpackConfig.output.path, {recursive: true});
-  }
+
+  // specify output directory for webpack (use different than normal output dir so that they are not polluted with test artifacts)
+  webpackConfig.output = webpackConfig.output || {};
+  webpackConfig.output.path = path.resolve(scoutBuildConstants.outDir.target, scoutBuildConstants.outDir.distKarma, scoutBuildConstants.outSubDir.development);
+  fs.mkdirSync(webpackConfig.output.path, {recursive: true});
+
   webpackConfig.watch = true;
 
   const sourceMapPlugin = webpackConfig.plugins.find(plugin => plugin instanceof webpack.SourceMapDevToolPlugin);

package/scripts/webpack-defaults.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -18,6 +18,7 @@ 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
@@ -25,7 +26,7 @@ const webpack = require('webpack');
 module.exports = (env, args) => {
   const {devMode, outSubDir, cssFilename, jsFilename} = scoutBuildConstants.getConstantsForMode(args.mode);
   const isMavenModule = scoutBuildConstants.isMavenModule();
-  const outDir = isMavenModule ? path.resolve(scoutBuildConstants.outDir, outSubDir) : path.resolve(scoutBuildConstants.outDir);
+  const outDir = getOutputDir(isMavenModule, outSubDir);
   const resDirArray = args.resDirArray || ['res'];
   console.log(`Webpack mode: ${args.mode}`);
 
@@ -92,7 +93,7 @@ module.exports = (env, args) => {
       filename: jsFilename,
       path: outDir,
       devtoolModuleFilenameTemplate: devMode ? undefined : prodDevtoolModuleFilenameTemplate,
-      clean: true
+      clean: nvl(args.clean, true)
     },
     performance: {
       hints: false
@@ -153,7 +154,7 @@ module.exports = (env, args) => {
                 targets: {
                   firefox: '62',
                   chrome: '69',
-                  safari: '12.1'
+                  safari: '12'
                 }
               }]
             ]
@@ -262,6 +263,13 @@ function addThemes(entry, options = {}) {
   });
 }
 
+function getOutputDir(isMavenModule, outSubDir) {
+  if (isMavenModule) {
+    return path.resolve(scoutBuildConstants.outDir.target, scoutBuildConstants.outDir.dist, outSubDir);
+  }
+  return path.resolve(scoutBuildConstants.outDir.dist);
+}
+
 function computeChunkName(module, chunks, cacheGroupKey) {
   const entryPointDelim = '~';
   const allChunksNames = chunks