@nrwl/angular 13.2.0-beta.3 → 13.2.0-rc.1
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/fesm2015/nrwl-angular-testing.mjs +0 -1
- package/fesm2015/nrwl-angular.mjs +0 -1
- package/fesm2020/nrwl-angular-testing.mjs +0 -1
- package/fesm2020/nrwl-angular.mjs +0 -1
- package/migrations.json +16 -28
- package/package.json +6 -6
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +5 -0
- 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/generators/storybook-configuration/lib/assert-compatible-storybook-version.js +2 -2
- package/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.js.map +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +14 -2
- package/src/generators/storybook-configuration/storybook-configuration.js.map +1 -1
- package/src/migrations/update-13-2-0/update-angular-config.js +27 -11
- package/src/migrations/update-13-2-0/update-angular-config.js.map +1 -1
- package/src/migrations/update-13-2-0/update-angular-jest-config.js +1 -23
- package/src/migrations/update-13-2-0/update-angular-jest-config.js.map +1 -1
- package/src/utils/versions.d.ts +2 -1
- package/src/utils/versions.js +4 -3
- 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
|
|
@@ -1082,6 +1054,22 @@
|
|
|
1082
1054
|
"jest-preset-angular": {
|
|
1083
1055
|
"version": "11.0.0-rc.3",
|
|
1084
1056
|
"alwaysAddToPackageJson": false
|
|
1057
|
+
},
|
|
1058
|
+
"@storybook/manager-webpack5": {
|
|
1059
|
+
"version": "6.4.0-rc.1",
|
|
1060
|
+
"alwaysAddToPackageJson": false
|
|
1061
|
+
},
|
|
1062
|
+
"@storybook/builder-webpack5": {
|
|
1063
|
+
"version": "6.4.0-rc.1",
|
|
1064
|
+
"alwaysAddToPackageJson": false
|
|
1065
|
+
},
|
|
1066
|
+
"@storybook/angular": {
|
|
1067
|
+
"version": "6.4.0-rc.1",
|
|
1068
|
+
"alwaysAddToPackageJson": false
|
|
1069
|
+
},
|
|
1070
|
+
"@storybook/addon-essentials": {
|
|
1071
|
+
"version": "6.4.0-rc.1",
|
|
1072
|
+
"alwaysAddToPackageJson": false
|
|
1085
1073
|
}
|
|
1086
1074
|
}
|
|
1087
1075
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.2.0-
|
|
3
|
+
"version": "13.2.0-rc.1",
|
|
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-
|
|
62
|
-
"@nrwl/devkit": "13.2.0-
|
|
63
|
-
"@nrwl/jest": "13.2.0-
|
|
64
|
-
"@nrwl/linter": "13.2.0-
|
|
65
|
-
"@nrwl/storybook": "13.2.0-
|
|
61
|
+
"@nrwl/cypress": "13.2.0-rc.1",
|
|
62
|
+
"@nrwl/devkit": "13.2.0-rc.1",
|
|
63
|
+
"@nrwl/jest": "13.2.0-rc.1",
|
|
64
|
+
"@nrwl/linter": "13.2.0-rc.1",
|
|
65
|
+
"@nrwl/storybook": "13.2.0-rc.1",
|
|
66
66
|
"@schematics/angular": "~13.0.0",
|
|
67
67
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
68
68
|
"ignore": "^5.0.4",
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { JsonObject } from '@angular-devkit/core';
|
|
2
2
|
import { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
|
|
3
|
+
export declare type BrowserBuilderSchema = Schema & {
|
|
4
|
+
customWebpackConfig?: {
|
|
5
|
+
path: string;
|
|
6
|
+
};
|
|
7
|
+
};
|
|
3
8
|
declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & Schema & {
|
|
4
9
|
customWebpackConfig?: {
|
|
5
10
|
path: string;
|
|
@@ -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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"}
|
|
@@ -8,8 +8,8 @@ function assertCompatibleStorybookVersion() {
|
|
|
8
8
|
storybookVersion = require(require.resolve('@storybook/angular/package.json')).version;
|
|
9
9
|
}
|
|
10
10
|
catch (_a) { }
|
|
11
|
-
if (storybookVersion && (0, semver_1.lt)(storybookVersion, '6.
|
|
12
|
-
throw new Error('Incompatible Storybook Version');
|
|
11
|
+
if (storybookVersion && (0, semver_1.lt)(storybookVersion, '6.4.0-rc.1')) {
|
|
12
|
+
throw new Error('Incompatible Storybook Version: Please use a version of @storybook/angular higher than 6.4.0-rc.1');
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
exports.assertCompatibleStorybookVersion = assertCompatibleStorybookVersion;
|
package/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert-compatible-storybook-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAE5B,SAAgB,gCAAgC;IAC9C,IAAI,gBAAwB,CAAC;IAC7B,IAAI;QACF,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CACxC,iCAAiC,CAClC,CAAC,CAAC,OAAO,CAAC;KACZ;IAAC,WAAM,GAAE;IAEV,IAAI,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"assert-compatible-storybook-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAE5B,SAAgB,gCAAgC;IAC9C,IAAI,gBAAwB,CAAC;IAC7B,IAAI;QACF,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CACxC,iCAAiC,CAClC,CAAC,CAAC,OAAO,CAAC;KACZ;IAAC,WAAM,GAAE;IAEV,IAAI,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;KACH;AACH,CAAC;AAbD,4EAaC"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.storybookConfigurationGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
5
7
|
const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
|
|
6
8
|
const generate_stories_1 = require("./lib/generate-stories");
|
|
7
9
|
const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
|
|
@@ -10,11 +12,21 @@ function storybookConfigurationGenerator(tree, options) {
|
|
|
10
12
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
13
|
(0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
|
|
12
14
|
(0, validate_options_1.validateOptions)(options);
|
|
13
|
-
|
|
15
|
+
// TODO(coly010/juristr): remove when @nrwl/storybook has been updated
|
|
16
|
+
const angularStorybookInstallTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
17
|
+
'@storybook/angular': versions_1.storybookVersion,
|
|
18
|
+
'@storybook/manager-webpack5': versions_1.storybookVersion,
|
|
19
|
+
'@storybook/builder-webpack5': versions_1.storybookVersion,
|
|
20
|
+
'@storybook/addon-essentials': versions_1.storybookVersion,
|
|
21
|
+
});
|
|
22
|
+
const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
|
|
14
23
|
if (options.generateStories) {
|
|
15
24
|
(0, generate_stories_1.generateStories)(tree, options);
|
|
16
25
|
}
|
|
17
|
-
return
|
|
26
|
+
return () => {
|
|
27
|
+
angularStorybookInstallTask();
|
|
28
|
+
storybookGeneratorInstallTask();
|
|
29
|
+
};
|
|
18
30
|
});
|
|
19
31
|
}
|
|
20
32
|
exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,yCAA4D;AAC5D,mDAAwD;AACxD,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,sEAAsE;QACtE,MAAM,2BAA2B,GAAG,IAAA,qCAA4B,EAC9D,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,2BAAgB;YACtC,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;SAChD,CACF,CAAC;QACF,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,2BAA2B,EAAE,CAAC;YAC9B,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}
|
|
@@ -2,19 +2,35 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
5
6
|
function default_1(tree) {
|
|
6
7
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
8
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-server', (options, projectName, targetName, configurationName) => {
|
|
9
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
10
|
+
const config = configurationName
|
|
11
|
+
? projectConfiguration.targets[targetName].configurations[configurationName]
|
|
12
|
+
: projectConfiguration.targets[targetName].options;
|
|
13
|
+
delete config.optimization;
|
|
14
|
+
delete config.aot;
|
|
15
|
+
delete config.progress;
|
|
16
|
+
delete config.deployUrl;
|
|
17
|
+
delete config.sourceMap;
|
|
18
|
+
delete config.vendorChunk;
|
|
19
|
+
delete config.commonChunk;
|
|
20
|
+
delete config.baseHref;
|
|
21
|
+
delete config.servePathDefaultWarning;
|
|
22
|
+
delete config.hmrWarning;
|
|
23
|
+
delete config.extractCss;
|
|
24
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
25
|
+
});
|
|
26
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-browser', (options, projectName, targetName, configurationName) => {
|
|
27
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
28
|
+
const config = configurationName
|
|
29
|
+
? projectConfiguration.targets[targetName].configurations[configurationName]
|
|
30
|
+
: projectConfiguration.targets[targetName];
|
|
31
|
+
delete config.extractCss;
|
|
32
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
33
|
+
});
|
|
18
34
|
});
|
|
19
35
|
}
|
|
20
36
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-angular-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-config.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"update-angular-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-config.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,iGAA8F;AAK9F,mBAA+B,IAAU;;QACvC,IAAA,+CAAsB,EACpB,IAAI,EACJ,8BAA8B,EAC9B,CAAC,OAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAC3D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,iBAAiB;gBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;gBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACrD,OAAO,MAAM,CAAC,YAAY,CAAC;YAC3B,OAAO,MAAM,CAAC,GAAG,CAAC;YAClB,OAAO,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,MAAM,CAAC,SAAS,CAAC;YACxB,OAAO,MAAM,CAAC,SAAS,CAAC;YACxB,OAAO,MAAM,CAAC,WAAW,CAAC;YAC1B,OAAO,MAAM,CAAC,WAAW,CAAC;YAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,MAAM,CAAC,uBAAuB,CAAC;YACtC,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC,CACF,CAAC;QACF,IAAA,+CAAsB,EACpB,IAAI,EACJ,+BAA+B,EAC/B,CAAC,OAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAC3D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,iBAAiB;gBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;gBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC,CACF,CAAC;IACJ,CAAC;CAAA;AAvCD,4BAuCC"}
|
|
@@ -20,6 +20,7 @@ function default_1(tree) {
|
|
|
20
20
|
angularProjects[projectName] = [jestConfigPath, jestConfig];
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
23
24
|
}
|
|
24
25
|
for (const [_, [jestConfigPath, jestFileContents]] of Object.entries(angularProjects)) {
|
|
25
26
|
tree.write(jestConfigPath, replaceTransformAndAddIgnorePattern(jestFileContents));
|
|
@@ -34,7 +35,6 @@ function replaceTransformAndAddIgnorePattern(fileContents) {
|
|
|
34
35
|
if (fileContents === updatedFileContents) {
|
|
35
36
|
return updatedFileContents;
|
|
36
37
|
}
|
|
37
|
-
updatedFileContents = updateModuleFileExtenstions(updatedFileContents);
|
|
38
38
|
return updatedFileContents;
|
|
39
39
|
}
|
|
40
40
|
exports.replaceTransformAndAddIgnorePattern = replaceTransformAndAddIgnorePattern;
|
|
@@ -72,26 +72,4 @@ function updateTransformIgnorePattern(fileContents) {
|
|
|
72
72
|
}
|
|
73
73
|
return `${fileContents.slice(0, transformEndIndex)}${TRANSFORM_IGNORE_PATTERN_STRING}${fileContents.slice(transformEndIndex)}`;
|
|
74
74
|
}
|
|
75
|
-
function updateModuleFileExtenstions(fileContents) {
|
|
76
|
-
const MODULE_FILE_EXTENSIONS_AST_QUERY = 'Identifier[name=moduleFileExtensions] ~ ArrayLiteralExpression > StringLiteral';
|
|
77
|
-
const MODULE_FILE_EXTENSIONS_STRING = 'mjs';
|
|
78
|
-
const MODULE_FILE_EXTENSIONS_FULL_STRING = `moduleFileExtensions: ['mjs', 'ts', 'js', 'html'],`;
|
|
79
|
-
const ast = tsquery_1.tsquery.ast(fileContents);
|
|
80
|
-
const moduleFileExtensionsNodes = (0, tsquery_1.tsquery)(ast, MODULE_FILE_EXTENSIONS_AST_QUERY, {
|
|
81
|
-
visitAllChildren: true,
|
|
82
|
-
});
|
|
83
|
-
if (!moduleFileExtensionsNodes || moduleFileExtensionsNodes.length === 0) {
|
|
84
|
-
// add the full property
|
|
85
|
-
const insertPosition = fileContents.lastIndexOf('}') - 1;
|
|
86
|
-
return `${fileContents.slice(0, insertPosition)}\n${MODULE_FILE_EXTENSIONS_FULL_STRING}${fileContents.slice(insertPosition)}`;
|
|
87
|
-
}
|
|
88
|
-
// check if the extension already exists
|
|
89
|
-
const hasExtensionAlready = Boolean(moduleFileExtensionsNodes.find((node) => node.getText().includes(MODULE_FILE_EXTENSIONS_STRING)));
|
|
90
|
-
if (hasExtensionAlready) {
|
|
91
|
-
return fileContents;
|
|
92
|
-
}
|
|
93
|
-
// add the extension
|
|
94
|
-
const insertPosition = moduleFileExtensionsNodes[moduleFileExtensionsNodes.length - 1].getEnd();
|
|
95
|
-
return `${fileContents.slice(0, insertPosition)}, '${MODULE_FILE_EXTENSIONS_STRING}'${fileContents.slice(insertPosition)}`;
|
|
96
|
-
}
|
|
97
75
|
//# sourceMappingURL=update-angular-jest-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ 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";
|
|
9
|
+
export declare const storybookVersion = "~6.4.0-rc.1";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
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-
|
|
3
|
+
exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
+
exports.nxVersion = '13.2.0-rc.1';
|
|
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';
|
|
12
|
+
exports.storybookVersion = '~6.4.0-rc.1';
|
|
12
13
|
//# sourceMappingURL=versions.js.map
|
|
@@ -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;AACjC,QAAA,gBAAgB,GAAG,aAAa,CAAC"}
|