@nrwl/angular 12.10.0 → 13.0.0-beta.12
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 +43 -0
- package/package.json +6 -6
- package/src/builders/webpack-browser/webpack-browser.impl.js +1 -1
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ivy/styles/stylesheet-processor.d.ts +30 -0
- package/src/executors/package/ng-packagr-adjustments/ivy/styles/stylesheet-processor.js +189 -0
- package/src/executors/package/ng-packagr-adjustments/ivy/styles/stylesheet-processor.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.d.ts +14 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +27 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +10 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +83 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.d.ts +13 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.js +33 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.d.ts +12 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js +37 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor-worker.d.ts +9 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor-worker.js +178 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor-worker.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +37 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.di.d.ts +10 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.di.js +18 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.di.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +70 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.d.ts +1 -0
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js +50 -0
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map +1 -0
- package/src/executors/package/package.impl.js +8 -2
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-protractor.d.ts +1 -1
- package/src/generators/application/lib/add-protractor.js +4 -3
- package/src/generators/application/lib/add-protractor.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +3 -3
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +4 -11
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +2 -0
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/schema.json +1 -2
- package/src/generators/library/lib/normalize-options.js +3 -3
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/update-project.js +1 -4
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/library.js +8 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +1 -2
- package/src/generators/setup-mfe/lib/add-entry-module.js +6 -1
- package/src/generators/setup-mfe/lib/add-entry-module.js.map +1 -1
- package/src/generators/stories/lib/get-e2e-project.d.ts +2 -2
- package/src/generators/stories/lib/get-e2e-project.js.map +1 -1
- package/src/generators/stories/lib/module-info.js +76 -19
- package/src/generators/stories/lib/module-info.js.map +1 -1
- package/src/generators/utils/testing.js +30 -0
- package/src/generators/utils/testing.js.map +1 -1
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js +2 -2
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js.map +1 -1
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map +1 -1
- package/src/migrations/update-12-9-0/update-invalid-import-paths.d.ts +3 -3
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js +19 -9
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js.map +1 -1
- package/src/migrations/update-13-0-0/add-postcss-packages.d.ts +2 -0
- package/src/migrations/update-13-0-0/add-postcss-packages.js +23 -0
- package/src/migrations/update-13-0-0/add-postcss-packages.js.map +1 -0
- package/src/utils/nx-devkit/testing.js +1 -1
- package/src/utils/nx-devkit/testing.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const devkit_2 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
function normalizeOptions(host, schema) {
|
|
8
|
-
var _a;
|
|
8
|
+
var _a, _b;
|
|
9
9
|
// Create a schema with populated default values
|
|
10
10
|
const options = Object.assign({ buildable: false, enableIvy: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */ }, schema);
|
|
11
11
|
const name = devkit_2.names(options.name).fileName;
|
|
@@ -22,9 +22,9 @@ function normalizeOptions(host, schema) {
|
|
|
22
22
|
: [];
|
|
23
23
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
24
24
|
const defaultPrefix = npmScope;
|
|
25
|
-
options.standaloneConfig = options.standaloneConfig
|
|
25
|
+
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
26
26
|
const importPath = options.importPath || `@${defaultPrefix}/${projectDirectory}`;
|
|
27
|
-
return Object.assign(Object.assign({}, options), { prefix: (
|
|
27
|
+
return Object.assign(Object.assign({}, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
28
28
|
projectDirectory,
|
|
29
29
|
modulePath,
|
|
30
30
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAGxD,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,uBACX,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAErD,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAGxD,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,uBACX,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAErD,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAEhE,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU,IACV;AACJ,CAAC;AArDD,4CAqDC"}
|
|
@@ -8,7 +8,6 @@ const path = require("path");
|
|
|
8
8
|
const update_ng_package_1 = require("./update-ng-package");
|
|
9
9
|
function updateProject(host, options) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
updateNxConfigWithProject(host, options);
|
|
12
11
|
createFiles(host, options);
|
|
13
12
|
updateProjectTsConfig(host, options);
|
|
14
13
|
fixProjectWorkspaceConfig(host, options);
|
|
@@ -83,6 +82,7 @@ function createFiles(host, options) {
|
|
|
83
82
|
}
|
|
84
83
|
function fixProjectWorkspaceConfig(host, options) {
|
|
85
84
|
const project = devkit_1.readProjectConfiguration(host, options.name);
|
|
85
|
+
project.tags = options.parsedTags;
|
|
86
86
|
const fixedProject = workspace_1.replaceAppNameWithPath(project, options.name, options.projectRoot);
|
|
87
87
|
if (!options.publishable && !options.buildable) {
|
|
88
88
|
delete fixedProject.targets.build;
|
|
@@ -118,7 +118,4 @@ function updateProjectTsConfig(host, options) {
|
|
|
118
118
|
return Object.assign(Object.assign({}, json), { extends: `./tsconfig.json`, compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${devkit_1.offsetFromRoot(options.projectRoot)}dist/out-tsc` }) });
|
|
119
119
|
});
|
|
120
120
|
}
|
|
121
|
-
function updateNxConfigWithProject(host, options) {
|
|
122
|
-
devkit_1.updateJson(host, `/nx.json`, (json) => (Object.assign(Object.assign({}, json), { projects: Object.assign(Object.assign({}, json.projects), { [options.name]: { tags: options.parsedTags } }) })));
|
|
123
|
-
}
|
|
124
121
|
//# sourceMappingURL=update-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,+CAAyD;AACzD,6BAA6B;AAE7B,2DAAsD;AAEtD,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,14 @@ function libraryGenerator(host, schema) {
|
|
|
46
46
|
add_module_1.addModule(host, options);
|
|
47
47
|
setStrictMode(host, options);
|
|
48
48
|
yield addLinting(host, options);
|
|
49
|
+
if (options.publishable) {
|
|
50
|
+
devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
51
|
+
postcss: '^8.3.9',
|
|
52
|
+
'postcss-import': '^14.0.2',
|
|
53
|
+
'postcss-preset-env': '^6.7.0',
|
|
54
|
+
'postcss-url': '^10.1.1',
|
|
55
|
+
});
|
|
56
|
+
}
|
|
49
57
|
if (options.standaloneConfig) {
|
|
50
58
|
yield workspace_1.convertToNxProjectGenerator(host, {
|
|
51
59
|
project: options.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AAEtC,qDAA8C;AAC9C,4DAA6D;AAC7D,kEAAmE;AAEnE,iDAA6C;AAC7C,+DAA2D;AAC3D,qFAA8E;AAC9E,yDAAqD;AACrD,2DAAuD;AACvD,mFAG2C;AAG3C,+CAA8D;AAE9D,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,4BAA4B;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,MAAM,OAAO,GAAG,oCAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,cAAI,CAAC,IAAI,kCACV,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,0BAA0B,GAAG,0CAA0B,CAC3D,qBAAqB,EACrB,SAAS,CACV,CAAC;QACF,MAAM,0BAA0B,CAAC,IAAI,EAAE;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO;YAClB,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;YAC5D,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,gCAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,sCAAsC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,sBAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,uCAA2B,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,4BAAmB,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,8 +106,7 @@
|
|
|
106
106
|
},
|
|
107
107
|
"standaloneConfig": {
|
|
108
108
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
109
|
-
"type": "boolean"
|
|
110
|
-
"default": false
|
|
109
|
+
"type": "boolean"
|
|
111
110
|
}
|
|
112
111
|
},
|
|
113
112
|
"required": []
|
|
@@ -11,7 +11,12 @@ function addEntryModule(host, { appName, routing, mfeType }, appRoot) {
|
|
|
11
11
|
npmScope,
|
|
12
12
|
routing,
|
|
13
13
|
});
|
|
14
|
-
host.write(`${appRoot}/src/app/app.module.ts`,
|
|
14
|
+
host.write(`${appRoot}/src/app/app.module.ts`, `/*
|
|
15
|
+
* This RemoteEntryModule is imported here to allow TS to find the Module during
|
|
16
|
+
* compilation, allowing it to be included in the built bundle. This is required
|
|
17
|
+
* for the Module Federation Plugin to expose the Module correctly.
|
|
18
|
+
* */
|
|
19
|
+
import { RemoteEntryModule } from './remote-entry/entry.module';
|
|
15
20
|
${host.read(`${appRoot}/src/app/app.module.ts`, 'utf-8')}`);
|
|
16
21
|
}
|
|
17
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-entry-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-entry-module.ts"],"names":[],"mappings":";;;AAEA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAU,EACrC,OAAe;IAEf,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;QACtD,sBAAa,CACX,IAAI,EACJ,0BAAiB,CAAC,SAAS,EAAE,6BAA6B,CAAC,EAC3D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,QAAQ;YACR,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC
|
|
1
|
+
{"version":3,"file":"add-entry-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-entry-module.ts"],"names":[],"mappings":";;;AAEA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAU,EACrC,OAAe;IAEf,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;QACtD,sBAAa,CACX,IAAI,EACJ,0BAAiB,CAAC,SAAS,EAAE,6BAA6B,CAAC,EAC3D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,QAAQ;YACR,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AA9BD,wCA8BC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function getE2EProject(tree: Tree, e2eProjectName: string): ProjectConfiguration
|
|
1
|
+
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function getE2EProject(tree: Tree, e2eProjectName: string): ProjectConfiguration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/get-e2e-project.ts"],"names":[],"mappings":";;;AAKA,yCAAwD;AAExD,SAAgB,aAAa,CAC3B,IAAU,EACV,cAAsB;IAEtB,IAAI,
|
|
1
|
+
{"version":3,"file":"get-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/get-e2e-project.ts"],"names":[],"mappings":";;;AAKA,yCAAwD;AAExD,SAAgB,aAAa,CAC3B,IAAU,EACV,cAAsB;IAEtB,IAAI,UAAgC,CAAC;IACrC,IAAI;QACF,UAAU,GAAG,iCAAwB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC7D;IAAC,WAAM;QACN,UAAU,GAAG,SAAS,CAAC;KACxB;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAZD,sCAYC"}
|
|
@@ -41,29 +41,86 @@ function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePa
|
|
|
41
41
|
let declarationArray = declarationsPropertyAssignment
|
|
42
42
|
.getChildren()
|
|
43
43
|
.find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
|
|
44
|
+
if (declarationArray) {
|
|
45
|
+
return declarationArray;
|
|
46
|
+
}
|
|
47
|
+
// Attempt to follow a variable instead of the literal
|
|
48
|
+
declarationArray = getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssignment);
|
|
49
|
+
if (declarationArray) {
|
|
50
|
+
return declarationArray;
|
|
51
|
+
}
|
|
52
|
+
// Attempt to follow a class declaration instead of the literal
|
|
53
|
+
declarationArray = getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment);
|
|
44
54
|
if (!declarationArray) {
|
|
45
|
-
|
|
46
|
-
const declarationVariable = declarationsPropertyAssignment
|
|
47
|
-
.getChildren()
|
|
48
|
-
.filter((node) => node.kind === typescript_2.SyntaxKind.Identifier)[1];
|
|
49
|
-
const variableName = declarationVariable.getText();
|
|
50
|
-
const variableDeclaration = typescript_1.findNodes(file, typescript_2.SyntaxKind.VariableDeclaration).find((variableDeclaration) => {
|
|
51
|
-
const identifier = variableDeclaration
|
|
52
|
-
.getChildren()
|
|
53
|
-
.find((node) => node.kind === typescript_2.SyntaxKind.Identifier);
|
|
54
|
-
return identifier.getText() === variableName;
|
|
55
|
-
});
|
|
56
|
-
if (variableDeclaration) {
|
|
57
|
-
declarationArray = variableDeclaration
|
|
58
|
-
.getChildren()
|
|
59
|
-
.find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
|
|
60
|
-
}
|
|
61
|
-
else {
|
|
62
|
-
devkit_1.logger.warn(devkit_1.stripIndents `No stories generated because the declaration in ${moduleFilePath} is not an array literal or the variable could not be found. Hint: you can always generate stories later with the 'nx generate @nrwl/angular:stories --name=${projectName}' command.`);
|
|
63
|
-
}
|
|
55
|
+
devkit_1.logger.warn(devkit_1.stripIndents `No stories generated because the declarations in ${moduleFilePath} is not an array literal or the variable could not be found. Hint: you can always generate stories later with the 'nx generate @nrwl/angular:stories --name=${projectName}' command.`);
|
|
64
56
|
}
|
|
65
57
|
return declarationArray;
|
|
66
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Try to get declared components like `declarations: someComponentsArrayConst`
|
|
61
|
+
*/
|
|
62
|
+
function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssignment) {
|
|
63
|
+
let declarationsVariable = declarationsPropertyAssignment
|
|
64
|
+
.getChildren()
|
|
65
|
+
.filter((node) => node.kind === typescript_2.SyntaxKind.Identifier)[1];
|
|
66
|
+
if (!declarationsVariable) {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
// Attempt to find variable declaration in the file
|
|
70
|
+
let variableDeclaration = getVariableDeclaration(declarationsVariable.getText(), file);
|
|
71
|
+
if (!variableDeclaration) {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
const declarationArray = variableDeclaration
|
|
75
|
+
.getChildren()
|
|
76
|
+
.find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
|
|
77
|
+
return declarationArray;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Try to get declared components like `declarations: SomeClass.components` as in
|
|
81
|
+
* https://github.com/nrwl/nx/issues/7276.
|
|
82
|
+
*/
|
|
83
|
+
function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment) {
|
|
84
|
+
const propertyAccessExpression = declarationsPropertyAssignment
|
|
85
|
+
.getChildren()
|
|
86
|
+
.filter((node) => node.kind === typescript_2.SyntaxKind.PropertyAccessExpression)[0];
|
|
87
|
+
if (!propertyAccessExpression) {
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
// Should contain 2 identifiers [SomeClass, components]
|
|
91
|
+
const [clazz, componentsProperty] = propertyAccessExpression
|
|
92
|
+
.getChildren()
|
|
93
|
+
.filter((node) => node.kind === typescript_2.SyntaxKind.Identifier);
|
|
94
|
+
if (!clazz || !componentsProperty) {
|
|
95
|
+
return undefined;
|
|
96
|
+
}
|
|
97
|
+
// Attempt to find class declaration in the file
|
|
98
|
+
let classDeclaration = getClassDeclaration(clazz.getText(), file);
|
|
99
|
+
if (!classDeclaration) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
const declarationArray = classDeclaration.members
|
|
103
|
+
.filter((node) => node.kind === typescript_2.SyntaxKind.PropertyDeclaration)
|
|
104
|
+
.find((propertyDeclaration) => propertyDeclaration
|
|
105
|
+
.getChildren()
|
|
106
|
+
.find((node) => node.kind === typescript_2.SyntaxKind.Identifier &&
|
|
107
|
+
node.getText() === componentsProperty.getText()))
|
|
108
|
+
.getChildren()
|
|
109
|
+
.find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
|
|
110
|
+
return declarationArray;
|
|
111
|
+
}
|
|
112
|
+
function getClassDeclaration(className, file) {
|
|
113
|
+
const classDeclaration = typescript_1.findNodes(file, typescript_2.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
|
|
114
|
+
.getChildren()
|
|
115
|
+
.find((node) => node.kind === typescript_2.SyntaxKind.Identifier && node.getText() === className));
|
|
116
|
+
return classDeclaration;
|
|
117
|
+
}
|
|
118
|
+
function getVariableDeclaration(variableName, file) {
|
|
119
|
+
const variableDeclaration = typescript_1.findNodes(file, typescript_2.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
|
|
120
|
+
.getChildren()
|
|
121
|
+
.find((node) => node.kind === typescript_2.SyntaxKind.Identifier && node.getText() === variableName));
|
|
122
|
+
return variableDeclaration;
|
|
123
|
+
}
|
|
67
124
|
function getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName) {
|
|
68
125
|
const syntaxList = ngModuleDecorator.getChildren().find((node) => {
|
|
69
126
|
return node.kind === typescript_2.SyntaxKind.SyntaxList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAC1E,yEAAqE;
|
|
1
|
+
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,6 +98,36 @@ const COMPONENTS = [
|
|
|
98
98
|
exports: COMPONENTS
|
|
99
99
|
})
|
|
100
100
|
export class VariableDeclareModule {}`);
|
|
101
|
+
// create a module where declared components are pulled from a static member of the module
|
|
102
|
+
yield moduleGenerator(tree, {
|
|
103
|
+
name: 'static-member-declarations',
|
|
104
|
+
project: libName,
|
|
105
|
+
});
|
|
106
|
+
yield componentGenerator(tree, {
|
|
107
|
+
name: 'cmp1',
|
|
108
|
+
project: libName,
|
|
109
|
+
path: `libs/${libName}/src/lib/static-member-declarations`,
|
|
110
|
+
module: 'static-member-declarations',
|
|
111
|
+
});
|
|
112
|
+
yield componentGenerator(tree, {
|
|
113
|
+
name: 'cmp2',
|
|
114
|
+
project: libName,
|
|
115
|
+
path: `libs/${libName}/src/lib/static-member-declarations`,
|
|
116
|
+
module: 'static-member-declarations',
|
|
117
|
+
});
|
|
118
|
+
tree.write(`libs/${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
|
|
119
|
+
import { CommonModule } from '@angular/common';
|
|
120
|
+
import { Cmp1Component } from './cmp1/cmp1.component';
|
|
121
|
+
import { Cmp2Component } from './cmp2/cmp2.component';
|
|
122
|
+
|
|
123
|
+
@NgModule({
|
|
124
|
+
imports: [CommonModule],
|
|
125
|
+
declarations: StaticMemberDeclarationsModule.COMPONENTS,
|
|
126
|
+
exports: StaticMemberDeclarationsModule.COMPONENTS
|
|
127
|
+
})
|
|
128
|
+
export class StaticMemberDeclarationsModule {
|
|
129
|
+
static readonly COMPONENTS = [Cmp1Component, Cmp2Component];
|
|
130
|
+
}`);
|
|
101
131
|
// create another button in a nested subpath
|
|
102
132
|
yield moduleGenerator(tree, {
|
|
103
133
|
name: 'nested',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ function addHTMLPatternToBuilderConfig(projectName, projectSourceRoot, targetNam
|
|
|
23
23
|
function updateProjectESLintConfigsAndBuilders(host) {
|
|
24
24
|
var _a;
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const graph = yield project_graph_1.createProjectGraphAsync(
|
|
26
|
+
const graph = yield project_graph_1.createProjectGraphAsync();
|
|
27
27
|
/**
|
|
28
28
|
* Make sure user is already using ESLint and is up to date with
|
|
29
29
|
* previous migrations
|
|
@@ -40,7 +40,7 @@ function updateProjectESLintConfigsAndBuilders(host) {
|
|
|
40
40
|
Object.keys(workspace.projects).forEach((projectName) => {
|
|
41
41
|
const project = workspace.projects[projectName];
|
|
42
42
|
if (!graph.dependencies[projectName].some((dependency) => dependency.target.startsWith('npm:@angular/') &&
|
|
43
|
-
|
|
43
|
+
graph.externalNodes[dependency.target])) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
Object.keys(project.architect || {}).forEach((targetName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AACjD,2DAA+D;AAC/D,+CAQyB;AACzB,+BAA4B;AAC5B,yCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":"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"}
|
package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
declare type AffectedLib = ProjectConfiguration
|
|
1
|
+
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
declare type AffectedLib = ProjectConfiguration;
|
|
3
3
|
declare type InvalidLibs = {
|
|
4
4
|
buildableLibs: AffectedLib[];
|
|
5
5
|
publishableLibs: AffectedLib[];
|
|
6
6
|
};
|
|
7
7
|
export default function (tree: Tree): Promise<void>;
|
|
8
8
|
export declare function findBuildableAndPublishableLibs(tree: Tree): InvalidLibs;
|
|
9
|
-
export declare function findInvalidLibs(tree: Tree, libs: InvalidLibs): InvalidLibs;
|
|
9
|
+
export declare function findInvalidLibs(tree: Tree, libs: InvalidLibs, tsconfigPath: string): InvalidLibs;
|
|
10
10
|
export {};
|
|
@@ -5,9 +5,14 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function default_1(tree) {
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
const tsconfigPath = getBaseTsConfigPath(tree);
|
|
9
|
+
if (!tree.exists(tsconfigPath)) {
|
|
10
|
+
devkit_1.logger.error('Could not find `tsconfig.base.json` or `tsconfig.json` at the root of the workspace. Skipping this migration...');
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
8
13
|
const possibleAffectedLibs = findBuildableAndPublishableLibs(tree);
|
|
9
|
-
const invalidLibs = findInvalidLibs(tree, possibleAffectedLibs);
|
|
10
|
-
fixLibs(tree, invalidLibs);
|
|
14
|
+
const invalidLibs = findInvalidLibs(tree, possibleAffectedLibs, tsconfigPath);
|
|
15
|
+
fixLibs(tree, invalidLibs, tsconfigPath);
|
|
11
16
|
yield devkit_1.formatFiles(tree);
|
|
12
17
|
});
|
|
13
18
|
}
|
|
@@ -29,8 +34,8 @@ function findBuildableAndPublishableLibs(tree) {
|
|
|
29
34
|
return { buildableLibs, publishableLibs };
|
|
30
35
|
}
|
|
31
36
|
exports.findBuildableAndPublishableLibs = findBuildableAndPublishableLibs;
|
|
32
|
-
function findInvalidLibs(tree, libs) {
|
|
33
|
-
const { compilerOptions } = devkit_1.readJson(tree,
|
|
37
|
+
function findInvalidLibs(tree, libs, tsconfigPath) {
|
|
38
|
+
const { compilerOptions } = devkit_1.readJson(tree, tsconfigPath);
|
|
34
39
|
const { paths: tsConfigPaths } = compilerOptions;
|
|
35
40
|
const invalidBuildableLibs = libs.buildableLibs.filter((lib) => checkInvalidLib(tree, lib, tsConfigPaths));
|
|
36
41
|
const invalidPublishableLibs = libs.publishableLibs.filter((lib) => checkInvalidLib(tree, lib, tsConfigPaths));
|
|
@@ -44,11 +49,11 @@ function checkInvalidLib(tree, lib, tsConfigPaths) {
|
|
|
44
49
|
const { name } = devkit_1.readJson(tree, devkit_1.joinPathFragments(lib.root, 'package.json'));
|
|
45
50
|
return !tsConfigPaths[name];
|
|
46
51
|
}
|
|
47
|
-
function fixLibs(tree, { buildableLibs, publishableLibs }) {
|
|
48
|
-
const { compilerOptions } = devkit_1.readJson(tree,
|
|
52
|
+
function fixLibs(tree, { buildableLibs, publishableLibs }, tsconfigFilePath) {
|
|
53
|
+
const { compilerOptions } = devkit_1.readJson(tree, tsconfigFilePath);
|
|
49
54
|
const { paths: tsConfigPaths } = compilerOptions;
|
|
50
55
|
buildableLibs.map((lib) => fixBuildableLib(tree, lib, tsConfigPaths));
|
|
51
|
-
publishableLibs.map((lib) => fixPublishableLib(tree, lib, tsConfigPaths));
|
|
56
|
+
publishableLibs.map((lib) => fixPublishableLib(tree, lib, tsConfigPaths, tsconfigFilePath));
|
|
52
57
|
}
|
|
53
58
|
function fixBuildableLib(tree, lib, tsConfigPaths) {
|
|
54
59
|
const srcRoot = devkit_1.joinPathFragments(lib.sourceRoot, 'index.ts');
|
|
@@ -62,7 +67,7 @@ function fixBuildableLib(tree, lib, tsConfigPaths) {
|
|
|
62
67
|
}
|
|
63
68
|
}
|
|
64
69
|
}
|
|
65
|
-
function fixPublishableLib(tree, lib, tsConfigPaths) {
|
|
70
|
+
function fixPublishableLib(tree, lib, tsConfigPaths, tsconfigFilePath) {
|
|
66
71
|
const srcRoot = devkit_1.joinPathFragments(lib.sourceRoot, 'index.ts');
|
|
67
72
|
const { name: pkgName } = devkit_1.readJson(tree, devkit_1.joinPathFragments(lib.root, 'package.json'));
|
|
68
73
|
const pkgNameParts = pkgName.split('/');
|
|
@@ -72,7 +77,7 @@ function fixPublishableLib(tree, lib, tsConfigPaths) {
|
|
|
72
77
|
}
|
|
73
78
|
for (const [invalidPathKey, tsLibSrcRoot] of Object.entries(tsConfigPaths)) {
|
|
74
79
|
if (tsLibSrcRoot[0] === srcRoot) {
|
|
75
|
-
devkit_1.updateJson(tree,
|
|
80
|
+
devkit_1.updateJson(tree, tsconfigFilePath, (tsconfig) => {
|
|
76
81
|
tsconfig.compilerOptions.paths[invalidPathKey] = undefined;
|
|
77
82
|
tsconfig.compilerOptions.paths[pkgName] = tsLibSrcRoot;
|
|
78
83
|
return tsconfig;
|
|
@@ -81,4 +86,9 @@ function fixPublishableLib(tree, lib, tsConfigPaths) {
|
|
|
81
86
|
}
|
|
82
87
|
}
|
|
83
88
|
}
|
|
89
|
+
function getBaseTsConfigPath(tree) {
|
|
90
|
+
return tree.exists('tsconfig.base.json')
|
|
91
|
+
? 'tsconfig.base.json'
|
|
92
|
+
: 'tsconfig.json';
|
|
93
|
+
}
|
|
84
94
|
//# sourceMappingURL=update-invalid-import-paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-invalid-import-paths.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-9-0/update-invalid-import-paths.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"update-invalid-import-paths.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-9-0/update-invalid-import-paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
function default_1(tree) {
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
const { devDependencies } = devkit_1.readJson(tree, 'package.json');
|
|
8
|
+
// Don't add if ng-packagr is not installed
|
|
9
|
+
if (!devDependencies['ng-packagr']) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const task = devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
13
|
+
postcss: '^8.3.9',
|
|
14
|
+
'postcss-import': '^14.0.2',
|
|
15
|
+
'postcss-preset-env': '^6.7.0',
|
|
16
|
+
'postcss-url': '^10.1.1',
|
|
17
|
+
});
|
|
18
|
+
yield devkit_1.formatFiles(tree);
|
|
19
|
+
return task;
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
exports.default = default_1;
|
|
23
|
+
//# sourceMappingURL=add-postcss-packages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-postcss-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-0-0/add-postcss-packages.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,mBAA+B,IAAU;;QACvC,MAAM,EAAE,eAAe,EAAE,GAAG,iBAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE3D,2CAA2C;QAC3C,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO;SACR;QAED,MAAM,IAAI,GAAG,qCAA4B,CACvC,IAAI,EACJ,EAAE,EACF;YACE,OAAO,EAAE,QAAQ;YACjB,gBAAgB,EAAE,SAAS;YAC3B,oBAAoB,EAAE,QAAQ;YAC9B,aAAa,EAAE,SAAS;SACzB,CACF,CAAC;QAEF,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAtBD,4BAsBC"}
|
|
@@ -69,10 +69,10 @@ function createApp(tree, appName, routing = true) {
|
|
|
69
69
|
options: {},
|
|
70
70
|
},
|
|
71
71
|
},
|
|
72
|
+
tags: [],
|
|
72
73
|
},
|
|
73
74
|
},
|
|
74
75
|
}));
|
|
75
|
-
devkit_1.updateJson(tree, './nx.json', (json) => (Object.assign(Object.assign({}, json), { projects: Object.assign(Object.assign({}, json.projects), { [appName]: { tags: [] } }) })));
|
|
76
76
|
}
|
|
77
77
|
exports.createApp = createApp;
|
|
78
78
|
function createLib(tree, libName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/testing.ts"],"names":[],"mappings":";;;AACA,yCAAiD;AAYjD,IAAI,SAAoB,CAAC,CAAC,iCAAiC;AAC3D,IAAI,SAAoB,CAAC;AAEzB,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AACD,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,OAAe,EACf,UAAmB,IAAI;IAEvB,OAAO,GAAG,cAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAClC,0DAA0D;IAC1D,SAAS,GAAG;QACV,OAAO;QACP,SAAS,EAAE,SAAS,OAAO,wBAAwB;KACpD,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,SAAS,EACnB;;;OAGG,OAAO,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC,EAAE;;;kCAGpC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE;;;;;GAKxE,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,cAAc,EAC9B;;;;;;;;;;;;;;GAcD,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,oBAAoB,EACpC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,SAAS,CAAC;KACrB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,wBAAwB,EACxC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,IAAI,CAAC,SAAS,CAAC;QACb,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE;YACR,CAAC,OAAO,CAAC,EAAE;gBACT,IAAI,EAAE,QAAQ,OAAO,EAAE;gBACvB,UAAU,EAAE,QAAQ,OAAO,MAAM;gBACjC,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,EAAE;4BACP,IAAI,EAAE,QAAQ,OAAO,cAAc;yBACpC;qBACF;oBACD,KAAK,EAAE;wBACL,OAAO,EAAE,EAAE;qBACZ;iBACF;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/testing.ts"],"names":[],"mappings":";;;AACA,yCAAiD;AAYjD,IAAI,SAAoB,CAAC,CAAC,iCAAiC;AAC3D,IAAI,SAAoB,CAAC;AAEzB,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AACD,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,OAAe,EACf,UAAmB,IAAI;IAEvB,OAAO,GAAG,cAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAClC,0DAA0D;IAC1D,SAAS,GAAG;QACV,OAAO;QACP,SAAS,EAAE,SAAS,OAAO,wBAAwB;KACpD,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,SAAS,EACnB;;;OAGG,OAAO,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC,EAAE;;;kCAGpC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE;;;;;GAKxE,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,cAAc,EAC9B;;;;;;;;;;;;;;GAcD,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,oBAAoB,EACpC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,SAAS,CAAC;KACrB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,wBAAwB,EACxC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,IAAI,CAAC,SAAS,CAAC;QACb,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE;YACR,CAAC,OAAO,CAAC,EAAE;gBACT,IAAI,EAAE,QAAQ,OAAO,EAAE;gBACvB,UAAU,EAAE,QAAQ,OAAO,MAAM;gBACjC,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,EAAE;4BACP,IAAI,EAAE,QAAQ,OAAO,cAAc;yBACpC;qBACF;oBACD,KAAK,EAAE;wBACL,OAAO,EAAE,EAAE;qBACZ;iBACF;gBACD,IAAI,EAAE,EAAE;aACT;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAjFD,8BAiFC;AAED,SAAgB,SAAS,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,cAAK,CAAC,OAAO,CAAC,CAAC;IAEnE,SAAS,GAAG;QACV,IAAI;QACJ,MAAM,EAAE,SAAS,YAAY,YAAY,QAAQ,YAAY;QAC7D,MAAM,EAAE,SAAS,YAAY,eAAe;KAC7C,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,MAAM,EAChB;;;;;;;;;qBASiB,SAAS;GAC3B,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,MAAM,EAChB;2BACuB,QAAQ;GAChC,CACA,CAAC;AACJ,CAAC;AA7BD,8BA6BC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export declare const nxVersion = "*";
|
|
|
2
2
|
export declare const angularVersion = "^12.2.0";
|
|
3
3
|
export declare const angularDevkitVersion = "~12.2.0";
|
|
4
4
|
export declare const angularJsVersion = "1.7.9";
|
|
5
|
-
export declare const ngrxVersion = "~12.
|
|
5
|
+
export declare const ngrxVersion = "~12.5.0";
|
|
6
6
|
export declare const rxjsVersion = "~6.6.0";
|
|
7
7
|
export declare const jestPresetAngularVersion = "10.0.1";
|
|
8
8
|
export declare const angularEslintVersion = "~12.3.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.webpackVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '
|
|
4
|
+
exports.nxVersion = '13.0.0-beta.12';
|
|
5
5
|
exports.angularVersion = '^12.2.0';
|
|
6
6
|
exports.angularDevkitVersion = '~12.2.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
|
8
|
-
exports.ngrxVersion = '~12.
|
|
8
|
+
exports.ngrxVersion = '~12.5.0';
|
|
9
9
|
exports.rxjsVersion = '~6.6.0';
|
|
10
10
|
exports.jestPresetAngularVersion = '10.0.1';
|
|
11
11
|
exports.angularEslintVersion = '~12.3.0';
|