@aj-shadow/z-build-project 0.0.0-aj-beta.261 → 0.0.0-aj-beta.263
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aj-shadow/z-build-project",
|
|
3
|
-
"version": "0.0.0-aj-beta.
|
|
3
|
+
"version": "0.0.0-aj-beta.263",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@aj-shadow/z-build-project",
|
|
9
|
-
"version": "0.0.0-aj-beta.
|
|
9
|
+
"version": "0.0.0-aj-beta.263",
|
|
10
10
|
"license": "MIT"
|
|
11
11
|
}
|
|
12
12
|
}
|
package/package.json
CHANGED
package/package_release.json
CHANGED
package/project/server/build.js
CHANGED
|
@@ -208,7 +208,7 @@ class Build {
|
|
|
208
208
|
cb(null, build, dependencyNames);
|
|
209
209
|
}
|
|
210
210
|
|
|
211
|
-
static addDependencyData(isCurrentFolder, dependency, part, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, cb) {
|
|
211
|
+
static addDependencyData(releaseStep, isCurrentFolder, dependency, part, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, cb) {
|
|
212
212
|
let clientBldFile;
|
|
213
213
|
let clientBldType;
|
|
214
214
|
if('AppLayer-client' === dependency) {
|
|
@@ -220,7 +220,12 @@ class Build {
|
|
|
220
220
|
clientBldType = Build.BUNDLE_TYPE_CS;
|
|
221
221
|
}
|
|
222
222
|
else {
|
|
223
|
-
|
|
223
|
+
if('delivery' === releaseStep) {
|
|
224
|
+
clientBldFile = `.${Path.sep}node_modules${Path.sep}@aj-shadow${Path.sep}${dependency}${Path.sep}project${Path.sep}${Build.BUNDLE_TYPE_TEXT[part]}${Path.sep}_build`;
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
clientBldFile = `..${Path.sep}${dependency}${Path.sep}project${Path.sep}${Build.BUNDLE_TYPE_TEXT[part]}${Path.sep}_build`;
|
|
228
|
+
}
|
|
224
229
|
clientBldType = part;
|
|
225
230
|
}
|
|
226
231
|
Build.findClientBld(clientBldFile, clientBldType, (foundBld) => {
|
|
@@ -250,7 +255,7 @@ class Build {
|
|
|
250
255
|
});
|
|
251
256
|
}
|
|
252
257
|
|
|
253
|
-
static load(appName, folderName, fileName, requireName, bottleneckQueue, cb) {
|
|
258
|
+
static load(appName, releaseStep, folderName, fileName, requireName, bottleneckQueue, cb) {
|
|
254
259
|
Fs.readFile(fileName, (err, data) => {
|
|
255
260
|
if(err) {
|
|
256
261
|
return cb(err);
|
|
@@ -259,7 +264,7 @@ class Build {
|
|
|
259
264
|
const keys = Reflect.ownKeys(dataObject);
|
|
260
265
|
const parameters = [];
|
|
261
266
|
const parametersNames = [];
|
|
262
|
-
|
|
267
|
+
let dependencyNames = new Set();
|
|
263
268
|
const externalsGlobMap = new Map();
|
|
264
269
|
const externalsMap = new Map();
|
|
265
270
|
const dependencyMap = new Map();
|
|
@@ -288,7 +293,7 @@ class Build {
|
|
|
288
293
|
let pendings = dataObject.dependencies.length;
|
|
289
294
|
Build.p += pendings;
|
|
290
295
|
dataObject.dependencies.forEach((dependency) => {
|
|
291
|
-
Build.addDependencyData(dependency[0] === folderName, dependency[0], 'cs' === dependency[1] ? Build.BUNDLE_TYPE_CS : Build.BUNDLE_TYPE_CLIENT, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, () => {
|
|
296
|
+
Build.addDependencyData(releaseStep, dependency[0] === folderName, dependency[0], 'cs' === dependency[1] ? Build.BUNDLE_TYPE_CS : Build.BUNDLE_TYPE_CLIENT, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, () => {
|
|
292
297
|
if(0 === --pendings) {
|
|
293
298
|
const appDependencies = folderName === 'AppLayer-client' ? dataObject.dependencies.map(d=>d[0]).reverse() : null;
|
|
294
299
|
const entryFiles = [];
|
|
@@ -149,7 +149,7 @@ class AbsProcess {
|
|
|
149
149
|
Tr.task(coreTask, Tr.serial(Tr.parallel(npmInstall, readPackageJson), (cb) => {
|
|
150
150
|
try {
|
|
151
151
|
if(null === workspace) {
|
|
152
|
-
workspace = new Workspace(appName, appNameShort, settings.name, coreTask, build, dev, organization, bottleneck, silent);
|
|
152
|
+
workspace = new Workspace(appName, appNameShort, settings.name, coreTask, build, releaseStep, dev, organization, bottleneck, silent);
|
|
153
153
|
releaseData.workspace = workspace;
|
|
154
154
|
}
|
|
155
155
|
workspace.load((err) => {
|
|
@@ -13,11 +13,12 @@ const Path = require('path');
|
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
class Workspace {
|
|
16
|
-
constructor(appName, appNameShort, name, task, build, dev, organization, bottleneck, silent = false) {
|
|
16
|
+
constructor(appName, appNameShort, name, task, build, releaseStep, dev, organization, bottleneck, silent = false) {
|
|
17
17
|
this.appName = appName;
|
|
18
18
|
this.appNameShort = appNameShort;
|
|
19
19
|
this.name = name;
|
|
20
20
|
this.task = task;
|
|
21
|
+
this.releaseStep = releaseStep;
|
|
21
22
|
this.dev = dev;
|
|
22
23
|
this.organization = organization;
|
|
23
24
|
this.build = build;
|
|
@@ -125,7 +126,7 @@ class Workspace {
|
|
|
125
126
|
if('clientServer' === workspace.type || buildData.type === workspace.type) {
|
|
126
127
|
++pendings;
|
|
127
128
|
const build = projectData.new ? `_build${Path.sep}` : '';
|
|
128
|
-
Build.load(this.appName, projectData.name, `${projectBuild.path}${Path.sep}${build}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
|
|
129
|
+
Build.load(this.appName, this.releaseStep, projectData.name, `${projectBuild.path}${Path.sep}${build}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
|
|
129
130
|
if(err) {
|
|
130
131
|
Log.log(Clc.red('Build.load'), Clc.yellow(projectData.name), err);
|
|
131
132
|
}
|
|
@@ -147,7 +148,7 @@ class Workspace {
|
|
|
147
148
|
});
|
|
148
149
|
workspace.builds.forEach((buildData) => {
|
|
149
150
|
++pendings;
|
|
150
|
-
Build.load(this.appName, buildData.fileName.substring(buildData.fileName.indexOf('-') + 1), `.${Path.sep}workspace${Path.sep}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
|
|
151
|
+
Build.load(this.appName, this.releaseStep, buildData.fileName.substring(buildData.fileName.indexOf('-') + 1), `.${Path.sep}workspace${Path.sep}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
|
|
151
152
|
if(err) {
|
|
152
153
|
return Log.log(err);
|
|
153
154
|
}
|
package/project/server/new 1.txt
DELETED