neo.mjs 9.6.0 → 9.6.1

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='9.6.0'
+         * @member {String} version='9.6.1'
          */
-        version: '9.6.0'
+        version: '9.6.1'
     }
 
     /**

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v9.6.0'
+                html  : 'v9.6.1'
             }]
         }],
         /**

package/apps/portal/view/learn/MainContainerStateProvider.mjs

@@ -14,9 +14,9 @@ class MainContainerStateProvider extends StateProvider {
          */
         className: 'Portal.view.learn.MainContainerStateProvider',
         /**
-         * @member {String} contentBasePath='../../resources/data/deck/'
+         * @member {String} contentBasePath=Neo.config.basePath+'resources/data/deck/'
          */
-        contentBasePath: '../../resources/data/deck/',
+        contentBasePath: Neo.config.basePath + 'resources/data/deck/',
         /**
          * @member {Object} data
          */

package/buildScripts/buildESModules.mjs

@@ -8,7 +8,10 @@ const
     __filename       = fileURLToPath(import.meta.url),
     __dirname        = path.dirname(__filename),
     inputDirectories = ['apps', 'docs', 'examples', 'src'],
-    outputBasePath   = '../dist/esm/';
+    outputBasePath   = '../dist/esm/',
+    // Regex to find import statements with 'node_modules' in the path
+    // It captures the entire import statement (excluding the leading 'import') and the path itself.
+    regexImport      = /(import(?:["'\s]*(?:[\w*{}\n\r\t, ]+)from\s*)?)(["'`])((?:(?!\2).)*node_modules(?:(?!\2).)*)\2/g;
 
 async function minifyDirectory(inputDir, outputDir) {
     if (fs.existsSync(inputDir)) {
@@ -32,7 +35,11 @@ async function minifyDirectory(inputDir, outputDir) {
                         const jsonContent = JSON.parse(content);
 
                         if (dirent.name === 'neo-config.json') {
-                            jsonContent.environment = 'dist/esm';
+                            Object.assign(jsonContent, {
+                                basePath      : '../../' + jsonContent.basePath,
+                                environment   : 'dist/esm',
+                                workerBasePath: jsonContent.basePath + 'src/worker/'
+                            })
                         }
 
                         fs.writeFileSync(outputPath, JSON.stringify(jsonContent));
@@ -47,7 +54,18 @@ async function minifyDirectory(inputDir, outputDir) {
                     }
                     // Minify JS files
                     else if (dirent.name.endsWith('.mjs')) {
-                        const result = await minifyJs(content, {
+                        let adjustedContent = content.replace(regexImport, (match, p1, p2, p3) => {
+                            // p1 will be "import {marked}    from " (or similar, including the 'import' keyword and everything up to the first quote)
+                            // p2 will be the quote character (', ", or `)
+                            // p3 will be the original path string (e.g., '../../../../node_modules/marked/lib/marked.esm.js')
+
+                            const newPath = '../../' + p3; // Prepend 2 levels up
+
+                            // Reconstruct the import statement with the new path
+                            return p1 + p2 + newPath + p2;
+                        });
+
+                        const result = await minifyJs(adjustedContent, {
                             module: true,
                             compress: {
                                 dead_code: true

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='9.6.0'
+         * @member {String} version='9.6.1'
          */
-        version: '9.6.0'
+        version: '9.6.1'
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name"           : "neo.mjs",
-    "version"        : "9.6.0",
+    "version"        : "9.6.1",
     "description"    : "The webworkers driven UI framework",
     "type"           : "module",
     "repository"     : {

package/src/DefaultConfig.mjs

@@ -263,12 +263,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '9.6.0'
+     * @default '9.6.1'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '9.6.0'
+    version: '9.6.1'
 };
 
 Object.assign(DefaultConfig, {

package/src/main/addon/Stylesheet.mjs

@@ -48,11 +48,7 @@ class Stylesheet extends Base {
 
         if (neoConfig.useFontAwesome) {
             if (env === 'development' || env === 'dist/esm') {
-                faPath = neoConfig.basePath + 'node_modules/@fortawesome/fontawesome-free/css/all.min.css';
-
-                if (env === 'dist/esm') {
-                    faPath = '../../' + faPath
-                }
+                faPath = neoConfig.basePath + 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
             } else {
                 faPath = neoConfig.basePath.substring(6) + 'resources/fontawesome-free/css/all.min.css'
             }
@@ -78,10 +74,6 @@ class Stylesheet extends Base {
 
         document.body.classList.add(themes[0]);
 
-        if (env === 'dist/esm') {
-            path = '../../' + path;
-        }
-
         folders.forEach(folder => {
             if (folder.startsWith('neo-')) {
                 folder = folder.substring(4)
@@ -109,10 +101,6 @@ class Stylesheet extends Base {
             promises    = [],
             rootPath    = config.basePath.substring(6);
 
-        if (env === 'dist/esm') {
-            path = '../../' + path;
-        }
-
         if (className.startsWith('Neo.')) {
             className = className.substring(4)
         }

package/src/worker/Manager.mjs

@@ -42,12 +42,6 @@ class Manager extends Base {
          * @protected
          */
         appNames: [],
-        /**
-         * The base path for the worker file URLs, can e.g. get set inside the index.html.
-         * @member {String|null} basePath=Neo.config.workerBasePath || 'worker/'
-         * @protected
-         */
-        basePath: NeoConfig.workerBasePath || 'worker/',
         /**
          * @member {Number} constructedThreads=0
          * @protected
@@ -164,7 +158,7 @@ class Manager extends Base {
     createWorker(opts) {
         let me         = this,
             {fileName} = opts,
-            filePath   = (opts.basePath || me.basePath) + fileName,
+            filePath   = (opts.basePath || Neo.config.workerBasePath) + fileName,
             name       = `neomjs-${fileName.substring(0, fileName.indexOf('.')).toLowerCase()}-worker`,
             isShared   = me.sharedWorkersEnabled && NeoConfig.useSharedWorkers,
             cls        = isShared ? SharedWorker : Worker,