@nrwl/angular 13.2.0-beta.3 → 13.2.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/migrations.json +0 -28
- package/package.json +6 -6
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +2 -6
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
- package/src/executors/package/package.impl.d.ts +1 -1
- package/src/executors/package/package.impl.js +6 -11
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/utils/versions.js.map +1 -1
package/migrations.json
CHANGED
|
@@ -1027,34 +1027,6 @@
|
|
|
1027
1027
|
"version": "^13.0.0",
|
|
1028
1028
|
"alwaysAddToPackageJson": false
|
|
1029
1029
|
},
|
|
1030
|
-
"@ngrx/store": {
|
|
1031
|
-
"version": "~13.0.0-beta.0",
|
|
1032
|
-
"alwaysAddToPackageJson": false
|
|
1033
|
-
},
|
|
1034
|
-
"@ngrx/effects": {
|
|
1035
|
-
"version": "~13.0.0-beta.0",
|
|
1036
|
-
"alwaysAddToPackageJson": false
|
|
1037
|
-
},
|
|
1038
|
-
"@ngrx/entity": {
|
|
1039
|
-
"version": "~13.0.0-beta.0",
|
|
1040
|
-
"alwaysAddToPackageJson": false
|
|
1041
|
-
},
|
|
1042
|
-
"@ngrx/router-store": {
|
|
1043
|
-
"version": "~13.0.0-beta.0",
|
|
1044
|
-
"alwaysAddToPackageJson": false
|
|
1045
|
-
},
|
|
1046
|
-
"@ngrx/schematics": {
|
|
1047
|
-
"version": "~13.0.0-beta.0",
|
|
1048
|
-
"alwaysAddToPackageJson": false
|
|
1049
|
-
},
|
|
1050
|
-
"@ngrx/store-devtools": {
|
|
1051
|
-
"version": "~13.0.0-beta.0",
|
|
1052
|
-
"alwaysAddToPackageJson": false
|
|
1053
|
-
},
|
|
1054
|
-
"@ngrx/component-store": {
|
|
1055
|
-
"version": "~13.0.0-beta.0",
|
|
1056
|
-
"alwaysAddToPackageJson": false
|
|
1057
|
-
},
|
|
1058
1030
|
"zone.js": {
|
|
1059
1031
|
"version": "~0.11.4",
|
|
1060
1032
|
"alwaysAddToPackageJson": false
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.2.0-beta.
|
|
3
|
+
"version": "13.2.0-beta.4",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
60
|
"@angular-devkit/schematics": "~13.0.0",
|
|
61
|
-
"@nrwl/cypress": "13.2.0-beta.
|
|
62
|
-
"@nrwl/devkit": "13.2.0-beta.
|
|
63
|
-
"@nrwl/jest": "13.2.0-beta.
|
|
64
|
-
"@nrwl/linter": "13.2.0-beta.
|
|
65
|
-
"@nrwl/storybook": "13.2.0-beta.
|
|
61
|
+
"@nrwl/cypress": "13.2.0-beta.4",
|
|
62
|
+
"@nrwl/devkit": "13.2.0-beta.4",
|
|
63
|
+
"@nrwl/jest": "13.2.0-beta.4",
|
|
64
|
+
"@nrwl/linter": "13.2.0-beta.4",
|
|
65
|
+
"@nrwl/storybook": "13.2.0-beta.4",
|
|
66
66
|
"@schematics/angular": "~13.0.0",
|
|
67
67
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
68
68
|
"ignore": "^5.0.4",
|
|
@@ -4,7 +4,6 @@ exports.ngPackagrLiteExecutor = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
6
6
|
const ng_packagr_1 = require("ng-packagr");
|
|
7
|
-
const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
const package_impl_1 = require("../package/package.impl");
|
|
10
9
|
const entry_point_di_1 = require("./ng-packagr-adjustments/entry-point.di");
|
|
@@ -19,11 +18,8 @@ function initializeNgPackgrLite(options, context, projectDependencies) {
|
|
|
19
18
|
packager.forProject((0, path_1.resolve)(context.root, options.project));
|
|
20
19
|
packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
|
|
21
20
|
if (options.tsConfig) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const parsedTSConfig = (yield (0, ng_compiler_cli_1.ngCompilerCli)()).readConfiguration(options.tsConfig);
|
|
25
|
-
(0, buildable_libs_utils_1.updatePaths)(projectDependencies, parsedTSConfig.options.paths);
|
|
26
|
-
packager.withTsConfig(parsedTSConfig);
|
|
21
|
+
const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
|
|
22
|
+
packager.withTsConfig(tsConfigPath);
|
|
27
23
|
}
|
|
28
24
|
return packager;
|
|
29
25
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,6FAG4D;AAC5D,2CAAuC;AACvC,+BAA+B;AAC/B,0DAAgE;AAEhE,4EAAmF;AACnF,oEAG6C;AAE7C,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,YAAY,GAAG,IAAA,wCAAiB,EACpC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACpD,mBAAmB,CACpB,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import
|
|
2
|
+
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
3
3
|
import type { NgPackagr } from 'ng-packagr';
|
|
4
4
|
import type { BuildAngularLibraryExecutorOptions } from './schema';
|
|
5
5
|
/**
|
|
@@ -4,7 +4,7 @@ exports.packageExecutor = exports.createLibraryExecutor = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
6
6
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
7
|
-
const
|
|
7
|
+
const buildable_libs_utils_2 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const rxjs_1 = require("rxjs");
|
|
10
10
|
const rxjs_for_await_1 = require("rxjs-for-await");
|
|
@@ -19,14 +19,9 @@ function initializeNgPackagr(options, context, projectDependencies) {
|
|
|
19
19
|
]);
|
|
20
20
|
packager.forProject((0, path_1.resolve)(context.root, options.project));
|
|
21
21
|
packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
|
|
22
|
-
// read the tsconfig and modify its path in memory to
|
|
23
|
-
// pass it on to ngpackagr if specified
|
|
24
22
|
if (options.tsConfig) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const parsedTSConfig = (yield (0, ng_compiler_cli_1.ngCompilerCli)()).readConfiguration(options.tsConfig);
|
|
28
|
-
(0, buildable_libs_utils_1.updatePaths)(projectDependencies, parsedTSConfig.options.paths);
|
|
29
|
-
packager.withTsConfig(parsedTSConfig);
|
|
23
|
+
const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
|
|
24
|
+
packager.withTsConfig(tsConfigPath);
|
|
30
25
|
}
|
|
31
26
|
return packager;
|
|
32
27
|
});
|
|
@@ -39,14 +34,14 @@ function initializeNgPackagr(options, context, projectDependencies) {
|
|
|
39
34
|
function createLibraryExecutor(initializeNgPackagr) {
|
|
40
35
|
return function (options, context) {
|
|
41
36
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* () {
|
|
42
|
-
const { target, dependencies } = (0,
|
|
43
|
-
if (!(0,
|
|
37
|
+
const { target, dependencies } = (0, buildable_libs_utils_2.calculateProjectDependencies)((0, project_graph_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
38
|
+
if (!(0, buildable_libs_utils_2.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
|
|
44
39
|
return yield (0, tslib_1.__await)(Promise.resolve({ success: false }));
|
|
45
40
|
}
|
|
46
41
|
function updatePackageJson() {
|
|
47
42
|
if (dependencies.length > 0 &&
|
|
48
43
|
options.updateBuildableProjectDepsInPackageJson) {
|
|
49
|
-
(0,
|
|
44
|
+
(0, buildable_libs_utils_2.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
|
|
50
45
|
}
|
|
51
46
|
}
|
|
52
47
|
if (options.watch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AACA,0EAAgF;
|
|
1
|
+
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export declare const nxVersion = "*";
|
|
|
2
2
|
export declare const angularVersion = "^13.0.0";
|
|
3
3
|
export declare const angularDevkitVersion = "~13.0.0";
|
|
4
4
|
export declare const angularJsVersion = "1.7.9";
|
|
5
|
-
export declare const ngrxVersion = "~
|
|
5
|
+
export declare const ngrxVersion = "~12.5.0";
|
|
6
6
|
export declare const rxjsVersion = "~7.4.0";
|
|
7
7
|
export declare const jestPresetAngularVersion = "11.0.0-rc.3";
|
|
8
8
|
export declare const angularEslintVersion = "~12.6.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.2.0-beta.
|
|
4
|
+
exports.nxVersion = '13.2.0-beta.4';
|
|
5
5
|
exports.angularVersion = '^13.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.0.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
|
8
|
-
exports.ngrxVersion = '~
|
|
8
|
+
exports.ngrxVersion = '~12.5.0';
|
|
9
9
|
exports.rxjsVersion = '~7.4.0';
|
|
10
10
|
exports.jestPresetAngularVersion = '11.0.0-rc.3';
|
|
11
11
|
exports.angularEslintVersion = '~12.6.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,aAAa,CAAC;AACzC,QAAA,oBAAoB,GAAG,SAAS,CAAC"}
|