@nrwl/workspace 12.10.0 → 13.0.0-beta.4
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/index.d.ts +1 -1
- package/index.js +2 -3
- package/index.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +5 -5
- package/src/command-line/dep-graph.js +17 -21
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/examples.js +38 -38
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/lint.js +5 -4
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/nx-commands.js +26 -3
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/supported-nx-commands.js +1 -0
- package/src/command-line/supported-nx-commands.js.map +1 -1
- package/src/command-line/utils.js +1 -1
- package/src/command-line/utils.js.map +1 -1
- package/src/core/dep-graph/main.es5.js +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/polyfills.es5.js +1 -1
- package/src/core/dep-graph/polyfills.esm.js +1 -1
- package/src/core/dep-graph/runtime.es5.js +1 -1
- package/src/core/dep-graph/runtime.esm.js +1 -1
- package/src/core/file-utils.d.ts +11 -4
- package/src/core/file-utils.js +103 -15
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher.d.ts +1 -16
- package/src/core/hasher/file-hasher.js +4 -20
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.d.ts +6 -6
- package/src/core/nx-deps/nx-deps-cache.js +9 -5
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +2 -0
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +12 -0
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -0
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +3 -2
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +14 -8
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.d.ts +3 -2
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js +12 -6
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js.map +1 -1
- package/src/core/project-graph/build-project-graph.d.ts +7 -0
- package/src/core/project-graph/build-project-graph.js +221 -0
- package/src/core/project-graph/build-project-graph.js.map +1 -0
- package/src/core/project-graph/daemon/cache.d.ts +5 -13
- package/src/core/project-graph/daemon/cache.js +39 -16
- package/src/core/project-graph/daemon/cache.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +31 -57
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/client/exec-is-server-available.d.ts +1 -0
- package/src/core/project-graph/daemon/client/exec-is-server-available.js +13 -0
- package/src/core/project-graph/daemon/client/exec-is-server-available.js.map +1 -0
- package/src/core/project-graph/daemon/client/generate-help-output.d.ts +1 -0
- package/src/core/project-graph/daemon/client/generate-help-output.js +28 -0
- package/src/core/project-graph/daemon/client/generate-help-output.js.map +1 -0
- package/src/core/project-graph/daemon/server/logger.d.ts +19 -0
- package/src/core/project-graph/daemon/server/logger.js +41 -0
- package/src/core/project-graph/daemon/server/logger.js.map +1 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +6 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +119 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -0
- package/src/core/project-graph/daemon/server/server.d.ts +1 -5
- package/src/core/project-graph/daemon/server/server.js +97 -184
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.d.ts +13 -0
- package/src/core/project-graph/daemon/server/shutdown-utils.js +28 -0
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -0
- package/src/core/project-graph/daemon/server/start.js +1 -8
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/stop.js +1 -11
- package/src/core/project-graph/daemon/server/stop.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.d.ts +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +1 -1
- package/src/core/project-graph/daemon/socket-utils.d.ts +13 -0
- package/src/core/project-graph/daemon/socket-utils.js +39 -10
- package/src/core/project-graph/daemon/socket-utils.js.map +1 -1
- package/src/core/project-graph/daemon/tmp-dir.d.ts +7 -0
- package/src/core/project-graph/daemon/tmp-dir.js +59 -0
- package/src/core/project-graph/daemon/tmp-dir.js.map +1 -0
- package/src/core/project-graph/index.d.ts +1 -1
- package/src/core/project-graph/index.js +1 -3
- package/src/core/project-graph/index.js.map +1 -1
- package/src/core/project-graph/project-graph-worker.d.ts +1 -0
- package/src/core/project-graph/project-graph-worker.js +17 -0
- package/src/core/project-graph/project-graph-worker.js.map +1 -0
- package/src/core/project-graph/project-graph.d.ts +1 -30
- package/src/core/project-graph/project-graph.js +5 -195
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/generators/init/init.js +27 -27
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/new/new.js +1 -1
- package/src/generators/new/new.js.map +1 -1
- package/src/migrations/update-10-0-0/update-10-0-0.js +1 -1
- package/src/migrations/update-10-0-0/update-10-0-0.js.map +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.d.ts +3 -0
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +30 -0
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -0
- package/src/utilities/default-base.js +2 -2
- package/src/utilities/default-base.js.map +1 -1
- package/src/utilities/run-webpack.d.ts +3 -2
- package/src/utilities/run-webpack.js +18 -34
- package/src/utilities/run-webpack.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -10
- package/src/utils/ast-utils.js +1 -19
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/testing-utils.js +1 -1
- package/src/utils/testing-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/core/file-graph/index.d.ts +0 -1
- package/src/core/file-graph/index.js +0 -5
- package/src/core/file-graph/index.js.map +0 -1
- package/src/core/file-graph/project-file-map.d.ts +0 -3
- package/src/core/file-graph/project-file-map.js +0 -35
- package/src/core/file-graph/project-file-map.js.map +0 -1
- package/src/utilities/create-project-graph-from-tree.d.ts +0 -5
- package/src/utilities/create-project-graph-from-tree.js +0 -13
- package/src/utilities/create-project-graph-from-tree.js.map +0 -1
|
@@ -135,6 +135,7 @@ function updateAngularCLIJson(host, options) {
|
|
|
135
135
|
implicitDependencies: [appName],
|
|
136
136
|
tags: [],
|
|
137
137
|
});
|
|
138
|
+
delete defaultProject.targets.e2e;
|
|
138
139
|
}
|
|
139
140
|
devkit_1.updateProjectConfiguration(host, appName, defaultProject);
|
|
140
141
|
workspaceConfig.cli = workspaceConfig.cli || {};
|
|
@@ -166,9 +167,8 @@ function updateTsConfig(host) {
|
|
|
166
167
|
}
|
|
167
168
|
}
|
|
168
169
|
function updateTsConfigsJson(host, options) {
|
|
169
|
-
const
|
|
170
|
-
const
|
|
171
|
-
const e2eProject = getE2eProject(workspaceJson);
|
|
170
|
+
const app = devkit_1.readProjectConfiguration(host, options.name);
|
|
171
|
+
const e2eProject = getE2eProject(host);
|
|
172
172
|
const tsConfigPath = getRootTsConfigPath(host);
|
|
173
173
|
const appOffset = devkit_1.offsetFromRoot(app.root);
|
|
174
174
|
devkit_1.updateJson(host, app.targets.build.options.tsConfig, (json) => {
|
|
@@ -256,32 +256,33 @@ function moveOutOfSrc(tree, appName, filePath, required = true) {
|
|
|
256
256
|
: devkit_1.joinPathFragments('apps', appName);
|
|
257
257
|
renameSyncInTree(tree, from, to, required);
|
|
258
258
|
}
|
|
259
|
-
function getE2eKey(
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
259
|
+
function getE2eKey(host) {
|
|
260
|
+
const projects = devkit_1.getProjects(host);
|
|
261
|
+
for (const [projectName, project] of projects) {
|
|
262
|
+
if (project.targets.e2e) {
|
|
263
|
+
return projectName;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
264
266
|
}
|
|
265
|
-
function getE2eProject(
|
|
266
|
-
const key = getE2eKey(
|
|
267
|
+
function getE2eProject(host) {
|
|
268
|
+
const key = getE2eKey(host);
|
|
267
269
|
if (key) {
|
|
268
|
-
return
|
|
270
|
+
return devkit_1.readProjectConfiguration(host, key);
|
|
269
271
|
}
|
|
270
272
|
else {
|
|
271
273
|
return null;
|
|
272
274
|
}
|
|
273
275
|
}
|
|
274
276
|
function moveExistingFiles(host, options) {
|
|
275
|
-
const
|
|
276
|
-
const
|
|
277
|
-
const e2eApp = getE2eProject(workspaceJson);
|
|
277
|
+
const app = devkit_1.readProjectConfiguration(host, options.name);
|
|
278
|
+
const e2eApp = getE2eProject(host);
|
|
278
279
|
// it is not required to have a browserslist
|
|
279
280
|
moveOutOfSrc(host, options.name, 'browserslist', false);
|
|
280
281
|
moveOutOfSrc(host, options.name, '.browserslistrc', false);
|
|
281
|
-
moveOutOfSrc(host, options.name, app.
|
|
282
|
-
if (app.
|
|
283
|
-
moveOutOfSrc(host, options.name, app.
|
|
284
|
-
moveOutOfSrc(host, options.name, app.
|
|
282
|
+
moveOutOfSrc(host, options.name, app.targets.build.options.tsConfig);
|
|
283
|
+
if (app.targets.test) {
|
|
284
|
+
moveOutOfSrc(host, options.name, app.targets.test.options.karmaConfig);
|
|
285
|
+
moveOutOfSrc(host, options.name, app.targets.test.options.tsConfig);
|
|
285
286
|
}
|
|
286
287
|
else {
|
|
287
288
|
// there could still be a karma.conf.js file in the root
|
|
@@ -291,15 +292,15 @@ function moveExistingFiles(host, options) {
|
|
|
291
292
|
moveOutOfSrc(host, options.name, 'karma.conf.js');
|
|
292
293
|
}
|
|
293
294
|
}
|
|
294
|
-
if (app.
|
|
295
|
-
moveOutOfSrc(host, options.name, app.
|
|
295
|
+
if (app.targets.server) {
|
|
296
|
+
moveOutOfSrc(host, options.name, app.targets.server.options.tsConfig);
|
|
296
297
|
}
|
|
297
298
|
const oldAppSourceRoot = app.sourceRoot;
|
|
298
299
|
const newAppSourceRoot = devkit_1.joinPathFragments('apps', options.name, 'src');
|
|
299
300
|
renameDirSyncInTree(host, oldAppSourceRoot, newAppSourceRoot);
|
|
300
301
|
if (e2eApp) {
|
|
301
302
|
const oldE2eRoot = devkit_1.joinPathFragments(app.root || '', 'e2e');
|
|
302
|
-
const newE2eRoot = devkit_1.joinPathFragments('apps', `${getE2eKey(
|
|
303
|
+
const newE2eRoot = devkit_1.joinPathFragments('apps', `${getE2eKey(host)}-e2e`);
|
|
303
304
|
renameDirSyncInTree(host, oldE2eRoot, newE2eRoot);
|
|
304
305
|
}
|
|
305
306
|
else {
|
|
@@ -309,7 +310,6 @@ function moveExistingFiles(host, options) {
|
|
|
309
310
|
}
|
|
310
311
|
function createAdditionalFiles(host, options) {
|
|
311
312
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
312
|
-
const workspaceJson = devkit_1.readJson(host, 'angular.json');
|
|
313
313
|
host.write('nx.json', fileutils_1.serializeJson({
|
|
314
314
|
npmScope: options.npmScope,
|
|
315
315
|
affected: {
|
|
@@ -326,7 +326,7 @@ function createAdditionalFiles(host, options) {
|
|
|
326
326
|
[options.name]: {
|
|
327
327
|
tags: [],
|
|
328
328
|
},
|
|
329
|
-
[`${getE2eKey(
|
|
329
|
+
[`${getE2eKey(host)}-e2e`]: {
|
|
330
330
|
tags: [],
|
|
331
331
|
},
|
|
332
332
|
},
|
|
@@ -377,11 +377,11 @@ function checkCanConvertToWorkspace(host) {
|
|
|
377
377
|
if (Object.keys(workspaceJson.projects).length > 2 || hasLibraries) {
|
|
378
378
|
throw new Error('Can only convert projects with one app');
|
|
379
379
|
}
|
|
380
|
-
const e2eKey = getE2eKey(
|
|
381
|
-
const e2eApp = getE2eProject(
|
|
382
|
-
if (e2eApp && !host.exists(e2eApp.
|
|
380
|
+
const e2eKey = getE2eKey(host);
|
|
381
|
+
const e2eApp = getE2eProject(host);
|
|
382
|
+
if (e2eApp && !host.exists(e2eApp.targets.e2e.options.protractorConfig)) {
|
|
383
383
|
console.info(`Make sure the ${e2eKey}.architect.e2e.options.protractorConfig is valid or the ${e2eKey} project is removed from angular.json.`);
|
|
384
|
-
throw new Error(`An e2e project was specified but ${e2eApp.
|
|
384
|
+
throw new Error(`An e2e project was specified but ${e2eApp.targets.e2e.options.protractorConfig} could not be found.`);
|
|
385
385
|
}
|
|
386
386
|
return host;
|
|
387
387
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,7 +93,7 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
95
|
yield execute(['init']);
|
|
96
|
-
yield execute(['checkout', '-b', defaultBase]);
|
|
96
|
+
yield execute(['checkout', '-b', defaultBase]); // Git < 2.28 doesn't support -b on git init.
|
|
97
97
|
}
|
|
98
98
|
yield execute(['add', '.']);
|
|
99
99
|
if (options.commit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,yCAYsB;AAEtB,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAoD;AAEpD,mCAA6B;AAE7B,sDAA4D;AAC5D,mDAAiD;AACjD,8CAA0C;AAC1C,+DAGsC;AAmBtC,SAAS,cAAc,CAAC,IAAU,EAAE,IAAY;IAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;KACzB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;QACtD,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACrC,CAAC;IACF,MAAM,GAAG,GAAG,iCAAwB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAG;QACX,GAAG;QACH,wBAAwB;QACxB,UAAU,IAAI,CAAC,OAAO,EAAE;QACxB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI;QAC3C,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9C,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE;QACzE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9C,SAAS,UAAU,EAAE;QACrB,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,qBAAqB;KACtE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,qBAAK,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjE,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,OAAO,GAAG,uCAAuC,CAAC;gBACxD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAe,iBAAiB,CAC9B,IAAU,EACV,aAAqB,EACrB,OAAe;;QAEf,MAAM,OAAO,GAAG,CAAC,IAA2B,EAAE,iBAAiB,GAAG,KAAK,EAAE,EAAE;YACzE,MAAM,YAAY,GAAG,QAAQ,CAAC;YAC9B,MAAM,WAAW,GAAG,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YAClE,MAAM,YAAY,GAAiB;gBACjC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC;gBACjD,KAAK,EAAE,IAAI;gBACX,GAAG,EAAE,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;gBACnC,GAAG,gDACE,OAAO,CAAC,GAAG,GACX,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;oBACrB,CAAC,CAAC;wBACE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;wBACpC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;qBACxC;oBACH,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK;oBACtB,CAAC,CAAC;wBACE,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK;wBACtC,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK;qBAC1C;oBACH,CAAC,CAAC,EAAE,CAAC,CACR;aACF,CAAC;YACF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3C,qBAAK,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBACpD,IAAI,IAAI,KAAK,CAAC,EAAE;wBACd,OAAO,EAAE,CAAC;qBACX;yBAAM;wBACL,MAAM,CAAC,IAAI,CAAC,CAAC;qBACd;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,MAAM,UAAU,GAAG,8BAAe,EAAE,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QACD,MAAM,UAAU,GAAG,MAAM,OAAO,CAC9B,CAAC,WAAW,EAAE,uBAAuB,CAAC,EACtC,IAAI,CACL,CAAC,IAAI,CACJ,GAAG,EAAE,CAAC,IAAI,EACV,GAAG,EAAE,CAAC,KAAK,CACZ,CAAC;QACF,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,IAAI,CACV,6EAA6E,CAC9E,CAAC;YACF,OAAO;SACR;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,gCAAiB,EAAE,CAAC;QAC/D,IAAI,YAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;YAC7B,MAAM,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACxB,MAAM,OAAO,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const path_1 = require("path");
|
|
|
7
7
|
const updatePackages = update_packages_in_package_json_1.updatePackagesInPackageJson(path_1.join(__dirname, '../../..', 'migrations.json'), '10.0.0');
|
|
8
8
|
const addNxJsonAffectedConfig = ast_utils_1.updateJsonInTree('nx.json', (json) => {
|
|
9
9
|
json.affected = {
|
|
10
|
-
defaultBase: '
|
|
10
|
+
defaultBase: 'main',
|
|
11
11
|
};
|
|
12
12
|
return json;
|
|
13
13
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-10-0-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/update-10-0-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,qDAAyD;AAEzD,iGAA0F;AAC1F,+BAA4B;AAE5B,MAAM,cAAc,GAAG,6DAA2B,CAChD,WAAI,CAAC,SAAS,EAAE,UAAU,EAAE,iBAAiB,CAAC,EAC9C,QAAQ,CACT,CAAC;AAEF,MAAM,uBAAuB,GAAG,4BAAgB,CAC9C,SAAS,EACT,CAAC,IAAyB,EAAE,EAAE;IAC5B,IAAI,CAAC,QAAQ,GAAG;QACd,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"update-10-0-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/update-10-0-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,qDAAyD;AAEzD,iGAA0F;AAC1F,+BAA4B;AAE5B,MAAM,cAAc,GAAG,6DAA2B,CAChD,WAAI,CAAC,SAAS,EAAE,UAAU,EAAE,iBAAiB,CAAC,EAC9C,QAAQ,CACT,CAAC;AAEF,MAAM,uBAAuB,GAAG,4BAAgB,CAC9C,SAAS,EACT,CAAC,IAAyB,EAAE,EAAE;IAC5B,IAAI,CAAC,QAAQ,GAAG;QACd,WAAW,EAAE,MAAM;KACpB,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CACF,CAAC;AAEF;IACE,OAAO,kBAAK,CAAC,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,4BAEC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setDefaultBaseIfNotSet = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const output_1 = require("../../utilities/output");
|
|
7
|
+
function setDefaultBaseIfNotSet(host) {
|
|
8
|
+
var _a, _b, _c;
|
|
9
|
+
var _d;
|
|
10
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
const config = devkit_1.readWorkspaceConfiguration(host);
|
|
12
|
+
if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
|
|
13
|
+
(_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
|
|
14
|
+
(_c = (_d = config.affected).defaultBase) !== null && _c !== void 0 ? _c : (_d.defaultBase = 'master');
|
|
15
|
+
output_1.output.note({
|
|
16
|
+
title: 'Default Base has been set in nx.json',
|
|
17
|
+
bodyLines: [
|
|
18
|
+
`Nx is moving to "main" as the default branch.`,
|
|
19
|
+
`To avoid your current defaults changing, defaultBase has been set to "master" in nx.json`,
|
|
20
|
+
`Read more here: https://nx.dev/core-concepts/configuration`,
|
|
21
|
+
],
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
devkit_1.updateWorkspaceConfiguration(host, config);
|
|
25
|
+
yield devkit_1.formatFiles(host);
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
exports.setDefaultBaseIfNotSet = setDefaultBaseIfNotSet;
|
|
29
|
+
exports.default = setDefaultBaseIfNotSet;
|
|
30
|
+
//# sourceMappingURL=set-default-base-if-not-set.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAA,EAAE;YACjC,MAAA,MAAM,CAAC,QAAQ,oCAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,YAAA,MAAM,CAAC,QAAQ,EAAC,WAAW,uCAAX,WAAW,GAAK,QAAQ,EAAC;YAEzC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sCAAsC;gBAC7C,SAAS,EAAE;oBACT,+CAA+C;oBAC/C,0FAA0F;oBAC1F,4DAA4D;iBAC7D;aACF,CAAC,CAAC;SACJ;QACD,qCAA4B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.checkGitVersion = exports.deduceDefaultBase = void 0;
|
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
// TODO (v13): Update to main
|
|
6
6
|
function deduceDefaultBase() {
|
|
7
|
-
const nxDefaultBase = '
|
|
7
|
+
const nxDefaultBase = 'main';
|
|
8
8
|
try {
|
|
9
9
|
return (child_process_1.execSync('git config --get init.defaultBranch').toString().trim() ||
|
|
10
10
|
nxDefaultBase);
|
|
@@ -17,7 +17,7 @@ exports.deduceDefaultBase = deduceDefaultBase;
|
|
|
17
17
|
function checkGitVersion() {
|
|
18
18
|
try {
|
|
19
19
|
let gitVersionOutput = child_process_1.execSync('git --version').toString().trim();
|
|
20
|
-
return gitVersionOutput.match(/
|
|
20
|
+
return gitVersionOutput.match(/[0-9]+\.[0-9]+\.+[0-9]+/)[0];
|
|
21
21
|
}
|
|
22
22
|
catch (_a) {
|
|
23
23
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-base.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/default-base.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,6BAA6B;AAC7B,SAAgB,iBAAiB;IAC/B,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"default-base.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/default-base.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,6BAA6B;AAC7B,SAAgB,iBAAiB;IAC/B,MAAM,aAAa,GAAG,MAAM,CAAC;IAC7B,IAAI;QACF,OAAO,CACL,wBAAQ,CAAC,qCAAqC,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;YACjE,aAAa,CACd,CAAC;KACH;IAAC,WAAM;QACN,OAAO,aAAa,CAAC;KACtB;AACH,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe;IAC7B,IAAI;QACF,IAAI,gBAAgB,GAAG,wBAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACnE,OAAO,gBAAgB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7D;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAPD,0CAOC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import * as webpack from 'webpack';
|
|
1
2
|
import { Observable } from 'rxjs/internal/Observable';
|
|
2
|
-
export declare function runWebpack(config:
|
|
3
|
+
export declare function runWebpack(config: webpack.Configuration): Observable<any>;
|
|
3
4
|
export declare function runWebpackDevServer(config: any, webpack: typeof import('webpack'), WebpackDevServer: typeof import('webpack-dev-server')): Observable<{
|
|
4
5
|
stats: any;
|
|
5
6
|
baseUrl: string;
|
|
@@ -12,4 +13,4 @@ export interface EmittedFile {
|
|
|
12
13
|
initial: boolean;
|
|
13
14
|
asset?: boolean;
|
|
14
15
|
}
|
|
15
|
-
export declare function getEmittedFiles(stats:
|
|
16
|
+
export declare function getEmittedFiles(stats: webpack.Stats): EmittedFile[];
|
|
@@ -1,37 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEmittedFiles = exports.runWebpackDevServer = exports.runWebpack = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const webpack = require("webpack");
|
|
4
6
|
const Observable_1 = require("rxjs/internal/Observable");
|
|
5
7
|
const path_1 = require("path");
|
|
6
|
-
|
|
7
|
-
function runWebpack(config, webpack) {
|
|
8
|
+
function runWebpack(config) {
|
|
8
9
|
return new Observable_1.Observable((subscriber) => {
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
// Passing `watch` option here will result in a warning due to missing callback.
|
|
11
|
+
// We manually call `.watch` or `.run` later so this option isn't needed here.
|
|
12
|
+
const { watch } = config, normalizedConfig = tslib_1.__rest(config, ["watch"]);
|
|
13
|
+
const webpackCompiler = webpack(normalizedConfig);
|
|
14
|
+
const callback = (err, stats) => {
|
|
11
15
|
if (err) {
|
|
12
16
|
subscriber.error(err);
|
|
13
17
|
}
|
|
14
18
|
subscriber.next(stats);
|
|
15
|
-
}
|
|
19
|
+
};
|
|
16
20
|
if (config.watch) {
|
|
17
21
|
const watchOptions = config.watchOptions || {};
|
|
18
22
|
const watching = webpackCompiler.watch(watchOptions, callback);
|
|
19
|
-
return () =>
|
|
20
|
-
watching.close(() => { });
|
|
21
|
-
};
|
|
23
|
+
return () => watching.close(() => subscriber.complete());
|
|
22
24
|
}
|
|
23
25
|
else {
|
|
24
26
|
webpackCompiler.run((err, stats) => {
|
|
25
27
|
callback(err, stats);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
subscriber.complete();
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
28
|
+
webpackCompiler.close((closeErr) => {
|
|
29
|
+
if (closeErr)
|
|
30
|
+
subscriber.error(closeErr);
|
|
33
31
|
subscriber.complete();
|
|
34
|
-
}
|
|
32
|
+
});
|
|
35
33
|
});
|
|
36
34
|
}
|
|
37
35
|
});
|
|
@@ -39,7 +37,6 @@ function runWebpack(config, webpack) {
|
|
|
39
37
|
exports.runWebpack = runWebpack;
|
|
40
38
|
function runWebpackDevServer(config, webpack, WebpackDevServer) {
|
|
41
39
|
return new Observable_1.Observable((subscriber) => {
|
|
42
|
-
var _a, _b;
|
|
43
40
|
const webpackCompiler = webpack(config);
|
|
44
41
|
let baseUrl;
|
|
45
42
|
webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
|
|
@@ -50,25 +47,12 @@ function runWebpackDevServer(config, webpack, WebpackDevServer) {
|
|
|
50
47
|
devServerConfig.onListening = function (server) {
|
|
51
48
|
originalOnListen(server);
|
|
52
49
|
const devServerOptions = server.options;
|
|
53
|
-
baseUrl =
|
|
54
|
-
protocol: devServerOptions.https ? 'https' : 'http',
|
|
55
|
-
hostname: server.hostname,
|
|
56
|
-
port: server.listeningApp.address().port,
|
|
57
|
-
pathname: devServerOptions.publicPath,
|
|
58
|
-
});
|
|
50
|
+
baseUrl = `${server.options.https ? 'https' : 'http'}://${server.options.host}:${server.options.port}${devServerOptions.devMiddleware.publicPath}`;
|
|
59
51
|
};
|
|
60
|
-
const webpackServer = new WebpackDevServer(
|
|
61
|
-
// Some type mismatches between webpack's built-in type defs and what webpack-dev-server expects.
|
|
62
|
-
webpackCompiler, devServerConfig);
|
|
52
|
+
const webpackServer = new WebpackDevServer(devServerConfig, webpackCompiler);
|
|
63
53
|
try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
subscriber.error(err);
|
|
67
|
-
}
|
|
68
|
-
});
|
|
69
|
-
return () => {
|
|
70
|
-
server.close();
|
|
71
|
-
};
|
|
54
|
+
webpackServer.start().catch((err) => subscriber.error(err));
|
|
55
|
+
return () => webpackServer.stop();
|
|
72
56
|
}
|
|
73
57
|
catch (e) {
|
|
74
58
|
throw new Error('Could not start start dev server');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-webpack.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/run-webpack.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-webpack.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/run-webpack.ts"],"names":[],"mappings":"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"}
|
package/src/utils/ast-utils.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { Rule, SchematicContext, Source, Tree } from '@angular-devkit/schematics
|
|
|
9
9
|
import * as ts from 'typescript';
|
|
10
10
|
import { FileData } from '../core/file-utils';
|
|
11
11
|
import { Path } from '@angular-devkit/core';
|
|
12
|
-
import type { NxJsonConfiguration, NxJsonProjectConfiguration
|
|
12
|
+
import type { NxJsonConfiguration, NxJsonProjectConfiguration } from '@nrwl/devkit';
|
|
13
13
|
export declare function sortObjectByKeys(obj: unknown): {};
|
|
14
14
|
export { findNodes } from '../utilities/typescript/find-nodes';
|
|
15
15
|
export { getSourceNodes } from '../utilities/typescript/get-source-nodes';
|
|
@@ -83,15 +83,6 @@ export declare function insert(host: Tree, modulePath: string, changes: Change[]
|
|
|
83
83
|
* @returns The JSON data in the file.
|
|
84
84
|
*/
|
|
85
85
|
export declare function readJsonInTree<T extends object = any>(host: Tree, path: string): T;
|
|
86
|
-
/**
|
|
87
|
-
* @deprecated This method is deprecated and `{@link onlyWorkspaceProjects}(await {@link createProjectGraphAsync}())` should be used instead.
|
|
88
|
-
* Method for utilizing the project graph in schematics
|
|
89
|
-
*/
|
|
90
|
-
export declare function getProjectGraphFromHost(host: Tree): ProjectGraph;
|
|
91
|
-
/**
|
|
92
|
-
* @deprecated This method is deprecated and `await {@link createProjectGraphAsync}()` should be used instead
|
|
93
|
-
*/
|
|
94
|
-
export declare function getFullProjectGraphFromHost(host: Tree): ProjectGraph;
|
|
95
86
|
/**
|
|
96
87
|
* @deprecated This method is deprecated
|
|
97
88
|
*/
|
package/src/utils/ast-utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.applyWithSkipExisting = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.replaceNodeValue = exports.insertImport = exports.createOrUpdate = exports.getProjectConfig = exports.updatePackageJsonDependencies = exports.addDepsToPackageJson = exports.readWorkspace = exports.addProjectToNxJsonInTree = exports.updateNxJsonInTree = exports.appsDir = exports.libsDir = exports.readNxJsonInTree = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.allFilesInDirInHost = exports.getFileDataInHost = exports.
|
|
3
|
+
exports.applyWithSkipExisting = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.replaceNodeValue = exports.insertImport = exports.createOrUpdate = exports.getProjectConfig = exports.updatePackageJsonDependencies = exports.addDepsToPackageJson = exports.readWorkspace = exports.addProjectToNxJsonInTree = exports.updateNxJsonInTree = exports.appsDir = exports.libsDir = exports.readNxJsonInTree = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.allFilesInDirInHost = exports.getFileDataInHost = exports.readJsonInTree = exports.insert = exports.addGlobal = exports.getImport = exports.addIncludeToTsConfig = exports.offset = exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.ReplaceChange = exports.RemoveChange = exports.InsertChange = exports.NoopChange = exports.getSourceNodes = exports.findNodes = exports.sortObjectByKeys = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* @license
|
|
6
6
|
* Copyright Google Inc. All Rights Reserved.
|
|
@@ -12,7 +12,6 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
12
12
|
const ts = require("typescript");
|
|
13
13
|
const devkit_1 = require("@nrwl/devkit");
|
|
14
14
|
const cli_config_utils_1 = require("./cli-config-utils");
|
|
15
|
-
const project_graph_1 = require("../core/project-graph");
|
|
16
15
|
const core_1 = require("@angular-devkit/core");
|
|
17
16
|
const add_install_task_1 = require("./rules/add-install-task");
|
|
18
17
|
const find_nodes_1 = require("../utilities/typescript/find-nodes");
|
|
@@ -270,23 +269,6 @@ function readJsonInTree(host, path) {
|
|
|
270
269
|
}
|
|
271
270
|
exports.readJsonInTree = readJsonInTree;
|
|
272
271
|
// TODO(v13): remove this deprecated method
|
|
273
|
-
/**
|
|
274
|
-
* @deprecated This method is deprecated and `{@link onlyWorkspaceProjects}(await {@link createProjectGraphAsync}())` should be used instead.
|
|
275
|
-
* Method for utilizing the project graph in schematics
|
|
276
|
-
*/
|
|
277
|
-
function getProjectGraphFromHost(host) {
|
|
278
|
-
return project_graph_1.onlyWorkspaceProjects(project_graph_1.createProjectGraph(undefined, undefined, undefined, '3.0'));
|
|
279
|
-
}
|
|
280
|
-
exports.getProjectGraphFromHost = getProjectGraphFromHost;
|
|
281
|
-
// TODO(v13): remove this deprecated method
|
|
282
|
-
/**
|
|
283
|
-
* @deprecated This method is deprecated and `await {@link createProjectGraphAsync}()` should be used instead
|
|
284
|
-
*/
|
|
285
|
-
function getFullProjectGraphFromHost(host) {
|
|
286
|
-
return project_graph_1.createProjectGraph(undefined, undefined, undefined, '3.0');
|
|
287
|
-
}
|
|
288
|
-
exports.getFullProjectGraphFromHost = getFullProjectGraphFromHost;
|
|
289
|
-
// TODO(v13): remove this deprecated method
|
|
290
272
|
/**
|
|
291
273
|
* @deprecated This method is deprecated
|
|
292
274
|
*/
|