@eclipse-scout/cli 24.1.14 → 24.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/cli",
-  "version": "24.1.14",
+  "version": "24.2.0-beta.0",
   "description": "CLI for Eclipse Scout",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -45,8 +45,8 @@
     "karma-jasmine": "5.1.0",
     "karma-jasmine-ajax": "0.1.13",
     "@metahub/karma-jasmine-jquery": "4.0.1",
-    "@eclipse-scout/karma-jasmine-scout": "24.1.14",
-    "@eclipse-scout/tsconfig": "24.1.14",
+    "@eclipse-scout/karma-jasmine-scout": "24.2.0-beta.0",
+    "@eclipse-scout/tsconfig": "24.2.0-beta.0",
     "karma-jasmine-html-reporter": "2.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-webpack": "5.0.0",

package/scripts/webpack-defaults.js

@@ -560,16 +560,28 @@ function getModuleName() {
  * @returns a function that should be added to the webpack externals
  */
 function rewriteIndexImports(newImport, excludedFolder) {
+  // If an import ends by one of these names, it is considered an index import.
+  let indexImports = ['index', 'main/js'];
+
   return ({context, request, contextInfo}, callback) => {
-    // Externalize every import to the main index and replace it with @bsi-scout/datamodel
-    // Keep imports to the testing index
-    if (/\/index$/.test(request) && !path.resolve(context, request).includes(excludedFolder)) {
+    // Externalize every import to the main index and replace it with newImport
+    // Keep imports pointing to excludedFolder
+    if (isIndexImport(request) && !path.resolve(context, request).includes(excludedFolder)) {
       return callback(null, newImport);
     }
 
     // Continue without externalizing the import
     callback();
   };
+
+  function isIndexImport(path) {
+    for (let imp of indexImports) {
+      if (path.endsWith(imp)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
 
 function computeTypeCheck(typeCheck, devMode, watchMode) {