@aj-shadow/z-build-project 0.0.0-aj-beta.263 → 0.0.0-aj-beta.265

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.263",
+  "version": "0.0.0-aj-beta.265",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aj-shadow/z-build-project",
-      "version": "0.0.0-aj-beta.263",
+      "version": "0.0.0-aj-beta.265",
       "license": "MIT"
     }
   }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.263",
+  "version": "0.0.0-aj-beta.265",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
-  "author": "ActorJs",
+  "author": "Hagnell Konsulting AB",
   "license": "MIT",
   "repository": "https://gitlab.com/actorjs-shadow-delivery-public/z-build-project.git",
   "dependencies": {}

package/package_release.json

@@ -1,9 +1,9 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.263",
+  "version": "0.0.0-aj-beta.265",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
-  "author": "ActorJs",
+  "author": "Hagnell Konsulting AB",
   "license": "MIT",
   "repository": "https://gitlab.com/actorjs-shadow-delivery-public/z-build-project.git"
 }

package/project/server/build-client-bundle.js

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildClientBundle extends Build {
-  constructor(appName, folderName, layer, part, source, dest, ignores, maps, exports, allowRequire, entryFiles, externalsGlobMap, externalsMap) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest, ignores, maps, exports, allowRequire, entryFiles, externalsGlobMap, externalsMap) {
     super(appName, folderName, `Bundle:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;

package/project/server/build-client-js.js

@@ -9,8 +9,9 @@ const Clc = require('cli-color');
 
 
 class BuildClientJs extends Build {
-  constructor(appName, folderName, layer, part, source, dest) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest) {
     super(appName, folderName, `Client:${layer}Layer/${part}`, __filename, source, dest);
+    this.releaseStep = releaseStep;
     this.layer = layer;
     this.part = part;
     this.destFolder = 'App' === this.layer ? `${layer}Layer-${part}` : '';
@@ -31,7 +32,7 @@ class BuildClientJs extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-client-js.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.repo, this.source, this.dest, this.destFolder, process.env.NODE_ENV])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-js.js'), [JSON.stringify([this.appName, this.folderName, this.releaseStep, this.name, this.silent, this.repo, this.source, this.dest, this.destFolder, process.env.NODE_ENV])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {

package/project/server/build-client-jsx.js

@@ -9,7 +9,7 @@ const Clc = require('cli-color');
 
 
 class BuildClientJsx extends Build {
-  constructor(appName, folderName, layer, part, source, dest) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest) {
     super(appName, folderName, `Client:${layer}Layer/${part}-jsx`, __filename, source, dest);
     this.layer = layer;
     this.part = part;

package/project/server/build-client-rc-bundle.js

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildClientRcBundle extends Build {
-  constructor(appName, folderName, part, source, dest, remove) {
+  constructor(appName, folderName, releaseStep, part, source, dest, remove) {
     super(appName, folderName, `client-css-${part}-bundle`, __filename, source, dest);
     this.part = part;
     this.remove = remove;

package/project/server/build-server-js.js

@@ -9,7 +9,7 @@ const Clc = require('cli-color');
 
 
 class BuildServerJs extends Build {
-  constructor(appName, folderName, layer, part, source, dest, replaceCondition, replaceHandle) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest, replaceCondition, replaceHandle) {
     super(appName, folderName, `Server:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;

package/project/server/build-server-rc.js

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildServerRc extends Build {
-  constructor(appName, folderName, part, source, dest) {
+  constructor(appName, folderName, releaseStep, part, source, dest) {
     super(appName, folderName, `server-${part}-rc`, __filename, source, dest);
     this.part = part;
   }

package/project/server/build.js

@@ -194,11 +194,11 @@ class Build {
     }
   }
   
-  static createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, dependencyNames, entryFiles, externalsGlobMap, externalsMap, cb) {
+  static createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, dependencyNames, entryFiles, externalsGlobMap, externalsMap, cb) {
     let build = null;
     try {
       const B = require(`.${Path.sep}` + requireName);
-      build = new B(appName, folderName, ...parameters, entryFiles, externalsGlobMap, externalsMap);
+      build = new B(appName, folderName, releaseStep, ...parameters, entryFiles, externalsGlobMap, externalsMap);
       build.setBottleneckQueue(bottleneckQueue);
       build.isBundle = undefined !== dataObject._bundle ? dataObject._bundle : false;
     }
@@ -302,7 +302,7 @@ class Build {
                     entryFiles.push(dependencyMap.get(dependency));
                   });
                 }
-                Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), entryFiles, externalsGlobMap, externalsMap, (err, build) => {
+                Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), entryFiles, externalsGlobMap, externalsMap, (err, build) => {
                   cb(err, build, Array.from(dependencyNames));
                 });
               }
@@ -311,13 +311,13 @@ class Build {
           return;
         }
         else {
-          Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+          Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
             cb(err, build, Array.from(dependencyNames));
           });
         }
       }
       else {
-        Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+        Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
           cb(err, build, Array.from(dependencyNames));
         });
       }

package/project/server/child-client-js.js

@@ -13,14 +13,18 @@ const Path = require('path');
 
 
 class ChildClientJs {
-  constructor(appName, folderName, name, silent, repo, source, dest, nodeEnv) {
+  static NODE_MODULES = 'node_modules';
+  
+  constructor(appName, folderName, releaseStep, name, silent, repo, source, dest, nodeEnv) {
     this.appName = appName;
     this.folderName = folderName;
+    this.releaseStep = releaseStep;
     this.name = name;
     this.silent = silent;
     this.repo = repo;
     this.source = source;
     this.dest = dest;
+    this.releaseStep = releaseStep;
     this.isDebug = 'development' === nodeEnv;
     this.readyFiles = new Map();
     process.env.NODE_ENV = nodeEnv;
@@ -184,10 +188,20 @@ class ChildClientJs {
     const bundleInculde = data.substring(bundleIndex + ChildMacro.SEARCH_start, stopIndex).toString().replaceAll('/', Path.sep);
     let file = null;
     if(bundleInculde.startsWith('.')) {
-      const lastIndex = srcFile.lastIndexOf(Path.sep);
-      let srcBase = buildPath + srcFile.substring(rootPath.length, lastIndex);
-      srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
-      file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      if('delivery' === this.releaseStep) {
+        const lastSepIndex = srcFile.lastIndexOf(Path.sep);
+        const lastNodeModulesIndex = srcFile.lastIndexOf(ChildClientJs.NODE_MODULES);
+        const secondSepAfterNodeModulesIndex = srcFile.indexOf(Path.sep, lastNodeModulesIndex + ChildClientJs.NODE_MODULES.length + 2);
+        let srcBase = buildPath + srcFile.substring(secondSepAfterNodeModulesIndex, lastSepIndex);
+        srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
+        file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      }
+      else {
+        const lastSepIndex = srcFile.lastIndexOf(Path.sep);
+        let srcBase = buildPath + srcFile.substring(rootPath.length, lastSepIndex);
+        srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
+        file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      }
     }
     else {
       const firstIndex = bundleInculde.indexOf(Path.sep);