@nrwl/angular 14.6.0-beta.3 → 14.6.0-beta.6
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/CHANGELOG.md +1 -1
- package/generators.d.ts +15 -13
- package/generators.js +15 -13
- package/generators.js.map +1 -1
- package/generators.json +10 -0
- package/migrations.json +18 -0
- package/package.json +9 -9
- package/src/generators/add-linting/add-linting.js +1 -0
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/schema.d.ts +1 -0
- package/src/generators/application/application.js +6 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-e2e.js +4 -2
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/add-linting.js +1 -0
- package/src/generators/application/lib/add-linting.js.map +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +3 -2
- package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.d.ts +3 -0
- package/src/generators/application/lib/convert-to-standalone-app.js +83 -0
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -0
- package/src/generators/application/lib/index.d.ts +1 -0
- package/src/generators/application/lib/index.js +1 -0
- package/src/generators/application/lib/index.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -1
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +3 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +5 -0
- package/src/generators/host/schema.d.ts +6 -0
- package/src/generators/init/init.js +7 -6
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/karma.d.ts +1 -1
- package/src/generators/library/lib/add-children.d.ts +1 -1
- package/src/generators/library/lib/add-children.js +18 -7
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-load-children.d.ts +1 -1
- package/src/generators/library/lib/add-load-children.js +13 -4
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-standalone-component.d.ts +3 -0
- package/src/generators/library/lib/add-standalone-component.js +44 -0
- package/src/generators/library/lib/add-standalone-component.js.map +1 -0
- package/src/generators/library/lib/normalize-options.js +10 -10
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/normalized-schema.d.ts +1 -0
- package/src/generators/library/lib/update-project.js +2 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/library.d.ts +1 -1
- package/src/generators/library/library.js +27 -19
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -0
- package/src/generators/library/schema.json +7 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/e2e.migrator.js +1 -0
- package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
- package/src/generators/ng-add/utilities/workspace.js +2 -2
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/remote/schema.d.ts +6 -0
- package/src/generators/scam-to-standalone/compat.d.ts +2 -0
- package/src/generators/scam-to-standalone/compat.js +6 -0
- package/src/generators/scam-to-standalone/compat.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts +3 -0
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js +34 -0
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.d.ts +6 -0
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js +19 -0
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.d.ts +9 -0
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js +65 -0
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/get-target-project.d.ts +2 -0
- package/src/generators/scam-to-standalone/lib/get-target-project.js +15 -0
- package/src/generators/scam-to-standalone/lib/get-target-project.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/index.d.ts +8 -0
- package/src/generators/scam-to-standalone/lib/index.js +12 -0
- package/src/generators/scam-to-standalone/lib/index.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.d.ts +2 -0
- package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js +20 -0
- package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.d.ts +2 -0
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js +9 -0
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.d.ts +2 -0
- package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.js +12 -0
- package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.js.map +1 -0
- package/src/generators/scam-to-standalone/lib/verify-module-is-scam.d.ts +1 -0
- package/src/generators/scam-to-standalone/lib/verify-module-is-scam.js +13 -0
- package/src/generators/scam-to-standalone/lib/verify-module-is-scam.js.map +1 -0
- package/src/generators/scam-to-standalone/scam-to-standalone.d.ts +4 -0
- package/src/generators/scam-to-standalone/scam-to-standalone.js +31 -0
- package/src/generators/scam-to-standalone/scam-to-standalone.js.map +1 -0
- package/src/generators/scam-to-standalone/schema.d.ts +5 -0
- package/src/generators/scam-to-standalone/schema.json +28 -0
- package/src/generators/utils/testing.js +2 -1
- package/src/generators/utils/testing.js.map +1 -1
- package/src/utils/mf/mf-webpack.js +23 -11
- package/src/utils/mf/mf-webpack.js.map +1 -1
- package/src/utils/nx-devkit/standalone-utils.d.ts +2 -0
- package/src/utils/nx-devkit/standalone-utils.js +37 -0
- package/src/utils/nx-devkit/standalone-utils.js.map +1 -0
- package/src/utils/test-runners.d.ts +2 -2
- package/src/utils/test-runners.js +17 -0
- package/src/utils/test-runners.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
|
@@ -8,6 +8,7 @@ const devkit_2 = require("@nrwl/devkit");
|
|
|
8
8
|
const jest_1 = require("@nrwl/jest");
|
|
9
9
|
const linter_1 = require("@nrwl/linter");
|
|
10
10
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
11
|
+
const test_runners_1 = require("../../utils/test-runners");
|
|
11
12
|
const versions_1 = require("../../utils/versions");
|
|
12
13
|
const karma_1 = require("../karma/karma");
|
|
13
14
|
function angularInitGenerator(host, rawOptions) {
|
|
@@ -33,14 +34,14 @@ exports.angularInitGenerator = angularInitGenerator;
|
|
|
33
34
|
function normalizeOptions(options) {
|
|
34
35
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
35
36
|
return {
|
|
36
|
-
e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a :
|
|
37
|
+
e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : test_runners_1.E2eTestRunner.Cypress,
|
|
37
38
|
linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint,
|
|
38
39
|
skipFormat: (_c = options.skipFormat) !== null && _c !== void 0 ? _c : false,
|
|
39
40
|
skipInstall: (_d = options.skipInstall) !== null && _d !== void 0 ? _d : false,
|
|
40
41
|
skipPostInstall: (_e = options.skipPostInstall) !== null && _e !== void 0 ? _e : false,
|
|
41
42
|
skipPackageJson: (_f = options.skipPackageJson) !== null && _f !== void 0 ? _f : false,
|
|
42
43
|
style: (_g = options.style) !== null && _g !== void 0 ? _g : 'css',
|
|
43
|
-
unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h :
|
|
44
|
+
unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h : test_runners_1.UnitTestRunner.Jest,
|
|
44
45
|
};
|
|
45
46
|
}
|
|
46
47
|
function setDefaults(host, options) {
|
|
@@ -87,9 +88,9 @@ function updateDependencies(host) {
|
|
|
87
88
|
}
|
|
88
89
|
function addUnitTestRunner(host, options) {
|
|
89
90
|
switch (options.unitTestRunner) {
|
|
90
|
-
case
|
|
91
|
+
case test_runners_1.UnitTestRunner.Karma:
|
|
91
92
|
return (0, karma_1.karmaGenerator)(host, { skipPackageJson: options.skipPackageJson });
|
|
92
|
-
case
|
|
93
|
+
case test_runners_1.UnitTestRunner.Jest:
|
|
93
94
|
if (!options.skipPackageJson) {
|
|
94
95
|
(0, devkit_2.addDependenciesToPackageJson)(host, {}, {
|
|
95
96
|
'jest-preset-angular': versions_1.jestPresetAngularVersion,
|
|
@@ -104,7 +105,7 @@ function addUnitTestRunner(host, options) {
|
|
|
104
105
|
}
|
|
105
106
|
function addE2ETestRunner(host, options) {
|
|
106
107
|
switch (options.e2eTestRunner) {
|
|
107
|
-
case
|
|
108
|
+
case test_runners_1.E2eTestRunner.Protractor:
|
|
108
109
|
return !options.skipPackageJson
|
|
109
110
|
? (0, devkit_2.addDependenciesToPackageJson)(host, {}, {
|
|
110
111
|
protractor: versions_1.protractorVersion,
|
|
@@ -115,7 +116,7 @@ function addE2ETestRunner(host, options) {
|
|
|
115
116
|
'@types/jasminewd2': versions_1.typesJasminewd2Version,
|
|
116
117
|
})
|
|
117
118
|
: () => { };
|
|
118
|
-
case
|
|
119
|
+
case test_runners_1.E2eTestRunner.Cypress:
|
|
119
120
|
return (0, cypress_1.cypressInitGenerator)(host, {
|
|
120
121
|
skipPackageJson: options.skipPackageJson,
|
|
121
122
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;AAGhD,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,cAAc,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,eAAe;YACvC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACb,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CAAA;AAvBD,oDAuBC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACvC,OAAO;QACL,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,4BAAa,CAAC,OAAO;QAC7D,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK;QACvC,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;QACzC,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,KAAK;QACjD,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,KAAK;QACjD,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK;QAC7B,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI;KAC9D,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC/C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC7D,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAC3C,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACzD,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC7C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;QAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,8CAA8C,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;SACvC;aAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxD,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,OAAO,EAAE,CAAC;SAC9E;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,qBAAqB,EAAE,yBAAc;QACrC,iBAAiB,EAAE,yBAAc;QACjC,mBAAmB,EAAE,yBAAc;QACnC,eAAe,EAAE,yBAAc;QAC/B,gBAAgB,EAAE,yBAAc;QAChC,2BAA2B,EAAE,yBAAc;QAC3C,mCAAmC,EAAE,yBAAc;QACnD,iBAAiB,EAAE,yBAAc;QACjC,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,SAAS,EAAE,wBAAa;KACzB,EACD;QACE,cAAc,EAAE,+BAAoB;QACpC,uBAAuB,EAAE,yBAAc;QACvC,2BAA2B,EAAE,yBAAc;QAC3C,+BAA+B,EAAE,+BAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAe;IACpD,QAAQ,OAAO,CAAC,cAAc,EAAE;QAC9B,KAAK,6BAAc,CAAC,KAAK;YACvB,OAAO,IAAA,sBAAc,EAAC,IAAI,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;QAC5E,KAAK,6BAAc,CAAC,IAAI;YACtB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBAC5B,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;oBACE,qBAAqB,EAAE,mCAAwB;iBAChD,CACF,CAAC;aACH;YAED,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE;gBAC7B,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;QACL;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,QAAQ,OAAO,CAAC,aAAa,EAAE;QAC7B,KAAK,4BAAa,CAAC,UAAU;YAC3B,OAAO,CAAC,OAAO,CAAC,eAAe;gBAC7B,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;oBACE,UAAU,EAAE,4BAAiB;oBAC7B,cAAc,EAAE,6BAAkB;oBAClC,uBAAuB,EAAE,qCAA0B;oBACnD,SAAS,EAAE,wBAAa;oBACxB,gBAAgB,EAAE,8BAAmB;oBACrC,mBAAmB,EAAE,iCAAsB;iBAC5C,CACF;gBACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACf,KAAK,4BAAa,CAAC,OAAO;YACxB,OAAO,IAAA,8BAAoB,EAAC,IAAI,EAAE;gBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;QACL;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO;SACR;QAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { GeneratorOptions } from './schema';
|
|
3
|
-
export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): ()
|
|
3
|
+
export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): import("@nrwl/devkit").GeneratorCallback;
|
|
4
4
|
export default karmaGenerator;
|
|
@@ -5,17 +5,28 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
6
|
const ts = require("typescript");
|
|
7
7
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
|
|
9
|
+
function addChildren(tree, options) {
|
|
10
|
+
if (!tree.exists(options.parentModule)) {
|
|
10
11
|
throw new Error(`Cannot find '${options.parentModule}'`);
|
|
11
12
|
}
|
|
12
|
-
const moduleSource =
|
|
13
|
-
const constName =
|
|
13
|
+
const moduleSource = tree.read(options.parentModule, 'utf-8');
|
|
14
|
+
const constName = options.standalone
|
|
15
|
+
? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
|
|
16
|
+
: `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
14
17
|
const importPath = options.importPath;
|
|
15
18
|
let sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
if (!options.standalone) {
|
|
20
|
+
sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parentModule, options.moduleName);
|
|
21
|
+
}
|
|
22
|
+
sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.parentModule, options.standalone ? constName : `${options.moduleName}, ${constName}`, importPath);
|
|
23
|
+
const route = `{ path: '${(0, devkit_1.names)(options.fileName).fileName}', children: ${constName} }`;
|
|
24
|
+
if (moduleSource.includes('@NgModule')) {
|
|
25
|
+
sourceFile = (0, ast_utils_2.addRoute)(tree, options.parentModule, sourceFile, route);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
(0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route, false, constName, importPath);
|
|
29
|
+
}
|
|
19
30
|
}
|
|
20
31
|
exports.addChildren = addChildren;
|
|
21
32
|
//# sourceMappingURL=add-children.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,kEAG4C;AAE5C,gFAA+E;AAE/E,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,UAAU,GAAG,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACtE;SAAM;QACL,IAAA,qCAAkB,EAChB,IAAI,EACJ,OAAO,CAAC,YAAY,EACpB,KAAK,EACL,KAAK,EACL,SAAS,EACT,UAAU,CACX,CAAC;KACH;AACH,CAAC;AAlDD,kCAkDC"}
|
|
@@ -4,13 +4,22 @@ exports.addLoadChildren = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ts = require("typescript");
|
|
6
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
|
|
8
|
+
function addLoadChildren(tree, options) {
|
|
9
|
+
if (!tree.exists(options.parentModule)) {
|
|
9
10
|
throw new Error(`Cannot find '${options.parentModule}'`);
|
|
10
11
|
}
|
|
11
|
-
const moduleSource =
|
|
12
|
+
const moduleSource = tree.read(options.parentModule).toString('utf-8');
|
|
12
13
|
const sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
|
|
13
|
-
|
|
14
|
+
const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
|
|
15
|
+
? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
|
|
16
|
+
: options.moduleName})}`;
|
|
17
|
+
if (moduleSource.includes('@NgModule')) {
|
|
18
|
+
(0, ast_utils_1.addRoute)(tree, options.parentModule, sourceFile, route);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
(0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route);
|
|
22
|
+
}
|
|
14
23
|
}
|
|
15
24
|
exports.addLoadChildren = addLoadChildren;
|
|
16
25
|
//# sourceMappingURL=add-load-children.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AACjC,kEAA8D;
|
|
1
|
+
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AACjC,kEAA8D;AAE9D,gFAA+E;AAE/E,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACzD;SAAM;QACL,IAAA,qCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;KACvD;AACH,CAAC;AA1BD,0CA0BC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addStandaloneComponent = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const component_1 = require("../../component/component");
|
|
6
|
+
const path_1 = require("nx/src/utils/path");
|
|
7
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
8
|
+
const add_load_children_1 = require("./add-load-children");
|
|
9
|
+
const add_children_1 = require("./add-children");
|
|
10
|
+
const project_1 = require("../../utils/project");
|
|
11
|
+
function addStandaloneComponent(tree, options) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
yield (0, component_1.default)(tree, {
|
|
14
|
+
name: options.name,
|
|
15
|
+
standalone: true,
|
|
16
|
+
export: true,
|
|
17
|
+
project: (0, project_1.normalizeProjectName)(options.name, options.directory),
|
|
18
|
+
});
|
|
19
|
+
if (options.routing) {
|
|
20
|
+
const pathToRoutes = (0, path_1.joinPathFragments)(options.projectRoot, 'src/lib/routes.ts');
|
|
21
|
+
const routesContents = `import { Route } from '@angular/router';
|
|
22
|
+
import { ${options.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(options.fileName, `${options.fileName}.component`)}';
|
|
23
|
+
|
|
24
|
+
export const ${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES: Route[] = [
|
|
25
|
+
{path: '', component: ${options.standaloneComponentName}}
|
|
26
|
+
];`;
|
|
27
|
+
tree.write(pathToRoutes, routesContents);
|
|
28
|
+
const pathToEntryFile = (0, path_1.joinPathFragments)(options.projectRoot, 'src', `${options.entryFile}.ts`);
|
|
29
|
+
const entryFileContents = tree.read(pathToEntryFile, 'utf-8');
|
|
30
|
+
tree.write(pathToEntryFile, `${entryFileContents}
|
|
31
|
+
export * from './lib/routes'`);
|
|
32
|
+
if (options.parentModule) {
|
|
33
|
+
if (options.lazy) {
|
|
34
|
+
(0, add_load_children_1.addLoadChildren)(tree, options);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
(0, add_children_1.addChildren)(tree, options);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
exports.addStandaloneComponent = addStandaloneComponent;
|
|
44
|
+
//# sourceMappingURL=add-standalone-component.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAC7C,iDAA2D;AAE3D,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAyB;;QAEzB,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC;SAC/D,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,OAAO,CAAC,WAAW,EACnB,mBAAmB,CACpB,CAAC;YAEF,MAAM,cAAc,GAAG;eACZ,OAAO,CAAC,uBAAuB,cAAc,IAAA,wBAAiB,EACvE,OAAO,CAAC,QAAQ,EAChB,GAAG,OAAO,CAAC,QAAQ,YAAY,CAChC;;uBAEkB,IAAA,cAAK,EAClB,OAAO,CAAC,IAAI,CACb,CAAC,SAAS,CAAC,WAAW,EAAE;kCACC,OAAO,CAAC,uBAAuB;WACtD,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,GAAG,OAAO,CAAC,SAAS,KAAK,CAC1B,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;qCACW,CAChC,CAAC;YAEF,IAAI,OAAO,CAAC,YAAY,EAAE;gBACxB,IAAI,OAAO,CAAC,IAAI,EAAE;oBAChB,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;iBAChC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;iBAC5B;aACF;SACF;IACH,CAAC;CAAA;AAlDD,wDAkDC"}
|
|
@@ -3,20 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("nx/src/utils/path");
|
|
6
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
7
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
|
+
const test_runners_1 = require("../../../utils/test-runners");
|
|
8
8
|
const project_1 = require("../../utils/project");
|
|
9
9
|
function normalizeOptions(host, schema) {
|
|
10
|
-
var _a, _b, _c, _d
|
|
10
|
+
var _a, _b, _c, _d;
|
|
11
11
|
// Create a schema with populated default values
|
|
12
|
-
const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner:
|
|
12
|
+
const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest,
|
|
13
13
|
// Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
|
|
14
14
|
compilationMode: schema.publishable
|
|
15
15
|
? 'partial'
|
|
16
|
-
: (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule:
|
|
17
|
-
const name = (0,
|
|
16
|
+
: (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
|
|
17
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
18
18
|
const projectDirectory = options.directory
|
|
19
|
-
? `${(0,
|
|
19
|
+
? `${(0, devkit_1.names)(options.directory).fileName}/${name}`.replace(/\/+/g, '/')
|
|
20
20
|
: name;
|
|
21
21
|
const { libsDir, npmScope, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
22
22
|
const projectName = projectDirectory
|
|
@@ -24,13 +24,13 @@ function normalizeOptions(host, schema) {
|
|
|
24
24
|
.replace(/-\d+/g, '');
|
|
25
25
|
const fileName = options.simpleModuleName ? name : projectName;
|
|
26
26
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
27
|
-
const moduleName = `${(0,
|
|
27
|
+
const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
|
|
28
28
|
const parsedTags = options.tags
|
|
29
29
|
? options.tags.split(',').map((s) => s.trim())
|
|
30
30
|
: [];
|
|
31
31
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
32
32
|
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
33
|
-
options.standaloneConfig = (
|
|
33
|
+
options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
|
|
34
34
|
const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, projectDirectory);
|
|
35
35
|
// Determine the roots where @schematics/angular will place the projects
|
|
36
36
|
// This might not be where the projects actually end up
|
|
@@ -42,13 +42,13 @@ function normalizeOptions(host, schema) {
|
|
|
42
42
|
const ngCliSchematicLibRoot = newProjectRoot
|
|
43
43
|
? `${newProjectRoot}/${projectName}`
|
|
44
44
|
: projectName;
|
|
45
|
-
return Object.assign(Object.assign({}, options), { linter: (
|
|
45
|
+
return Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
46
46
|
projectDirectory,
|
|
47
47
|
modulePath,
|
|
48
48
|
parsedTags,
|
|
49
49
|
fileName,
|
|
50
50
|
importPath,
|
|
51
|
-
ngCliSchematicLibRoot });
|
|
51
|
+
ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(name).className}Component` });
|
|
52
52
|
}
|
|
53
53
|
exports.normalizeOptions = normalizeOptions;
|
|
54
54
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ function updateFiles(host, options) {
|
|
|
41
41
|
if (options.name !== options.fileName) {
|
|
42
42
|
host.delete(path.join(libRoot, `${options.name}.module.ts`));
|
|
43
43
|
}
|
|
44
|
-
if (!options.skipModule) {
|
|
44
|
+
if (!options.skipModule && !options.standalone) {
|
|
45
45
|
host.write(path.join(libRoot, `${options.fileName}.module.ts`), `
|
|
46
46
|
import { NgModule } from '@angular/core';
|
|
47
47
|
import { CommonModule } from '@angular/common';
|
|
@@ -80,7 +80,7 @@ function updateFiles(host, options) {
|
|
|
80
80
|
else {
|
|
81
81
|
host.delete((0, devkit_1.joinPathFragments)(libRoot, `${options.fileName}.module.ts`));
|
|
82
82
|
}
|
|
83
|
-
host.write(`${options.projectRoot}/src/index.ts`, options.skipModule
|
|
83
|
+
host.write(`${options.projectRoot}/src/index.ts`, options.skipModule || options.standalone
|
|
84
84
|
? ``
|
|
85
85
|
: `
|
|
86
86
|
export * from './lib/${options.fileName}.module';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,iFAAoF;AACpF,yEAAyF;AACzF,6BAA6B;AAE7B,2DAAsD;AAEtD,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;CAAA;AAND,sCAMC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,WAAW,CAAC;IAClD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,OAAO,EACP,GAAG,OAAO,CAAC,IAAI,oBAAoB,CACpC,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;IAE9D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC;IAEhE,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;KACtE;IAED,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAChE;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAElE,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC;KAC9D;IACD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function libraryGenerator(
|
|
3
|
+
export declare function libraryGenerator(tree: Tree, schema: Partial<Schema>): Promise<() => void>;
|
|
4
4
|
export default libraryGenerator;
|
|
@@ -8,6 +8,7 @@ const jest_1 = require("@nrwl/jest");
|
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
9
|
const generators_1 = require("@nrwl/workspace/generators");
|
|
10
10
|
const init_1 = require("../../generators/init/init");
|
|
11
|
+
const test_runners_1 = require("../../utils/test-runners");
|
|
11
12
|
const versions_1 = require("../../utils/versions");
|
|
12
13
|
const add_linting_1 = require("../add-linting/add-linting");
|
|
13
14
|
const karma_project_1 = require("../karma-project/karma-project");
|
|
@@ -19,7 +20,8 @@ const normalize_options_1 = require("./lib/normalize-options");
|
|
|
19
20
|
const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
|
|
20
21
|
const update_project_1 = require("./lib/update-project");
|
|
21
22
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
22
|
-
|
|
23
|
+
const add_standalone_component_1 = require("./lib/add-standalone-component");
|
|
24
|
+
function libraryGenerator(tree, schema) {
|
|
23
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
26
|
// Do some validation checks
|
|
25
27
|
if (!schema.routing && schema.lazy) {
|
|
@@ -31,10 +33,10 @@ function libraryGenerator(host, schema) {
|
|
|
31
33
|
if (schema.addTailwind && !schema.buildable && !schema.publishable) {
|
|
32
34
|
throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
|
|
33
35
|
}
|
|
34
|
-
const options = (0, normalize_options_1.normalizeOptions)(
|
|
35
|
-
yield (0, init_1.default)(
|
|
36
|
+
const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
|
|
37
|
+
yield (0, init_1.default)(tree, Object.assign(Object.assign({}, options), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
|
|
36
38
|
const runAngularLibrarySchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
|
|
37
|
-
yield runAngularLibrarySchematic(
|
|
39
|
+
yield runAngularLibrarySchematic(tree, {
|
|
38
40
|
name: options.name,
|
|
39
41
|
prefix: options.prefix,
|
|
40
42
|
entryFile: 'index',
|
|
@@ -42,40 +44,45 @@ function libraryGenerator(host, schema) {
|
|
|
42
44
|
skipTsConfig: true,
|
|
43
45
|
});
|
|
44
46
|
if (options.ngCliSchematicLibRoot !== options.projectRoot) {
|
|
45
|
-
(0, devkit_1.moveFilesToNewDirectory)(
|
|
47
|
+
(0, devkit_1.moveFilesToNewDirectory)(tree, options.ngCliSchematicLibRoot, options.projectRoot);
|
|
46
48
|
}
|
|
47
|
-
yield (0, update_project_1.updateProject)(
|
|
48
|
-
(0, update_tsconfig_1.updateTsConfig)(
|
|
49
|
-
yield addUnitTestRunner(
|
|
50
|
-
updateNpmScopeIfBuildableOrPublishable(
|
|
51
|
-
(
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
yield (0, update_project_1.updateProject)(tree, options);
|
|
50
|
+
(0, update_tsconfig_1.updateTsConfig)(tree, options);
|
|
51
|
+
yield addUnitTestRunner(tree, options);
|
|
52
|
+
updateNpmScopeIfBuildableOrPublishable(tree, options);
|
|
53
|
+
if (!options.standalone) {
|
|
54
|
+
(0, add_module_1.addModule)(tree, options);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
yield (0, add_standalone_component_1.addStandaloneComponent)(tree, options);
|
|
58
|
+
}
|
|
59
|
+
setStrictMode(tree, options);
|
|
60
|
+
yield addLinting(tree, options);
|
|
54
61
|
if (options.addTailwind) {
|
|
55
|
-
yield (0, setup_tailwind_1.default)(
|
|
62
|
+
yield (0, setup_tailwind_1.default)(tree, {
|
|
56
63
|
project: options.name,
|
|
57
64
|
skipFormat: true,
|
|
58
65
|
});
|
|
59
66
|
}
|
|
60
67
|
if (options.buildable || options.publishable) {
|
|
61
|
-
(0, devkit_1.removeDependenciesFromPackageJson)(
|
|
62
|
-
(0, devkit_1.addDependenciesToPackageJson)(
|
|
68
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['ng-packagr']);
|
|
69
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
63
70
|
'ng-packagr': versions_1.ngPackagrVersion,
|
|
64
71
|
});
|
|
65
|
-
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(
|
|
72
|
+
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
|
|
66
73
|
}
|
|
67
74
|
if (options.standaloneConfig) {
|
|
68
|
-
yield (0, generators_1.convertToNxProjectGenerator)(
|
|
75
|
+
yield (0, generators_1.convertToNxProjectGenerator)(tree, {
|
|
69
76
|
project: options.name,
|
|
70
77
|
all: false,
|
|
71
78
|
skipFormat: true,
|
|
72
79
|
});
|
|
73
80
|
}
|
|
74
81
|
if (!options.skipFormat) {
|
|
75
|
-
yield (0, devkit_1.formatFiles)(
|
|
82
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
76
83
|
}
|
|
77
84
|
return () => {
|
|
78
|
-
(0, devkit_1.installPackagesTask)(
|
|
85
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
79
86
|
};
|
|
80
87
|
});
|
|
81
88
|
}
|
|
@@ -121,6 +128,7 @@ function addLinting(host, options) {
|
|
|
121
128
|
projectName: options.name,
|
|
122
129
|
projectRoot: options.projectRoot,
|
|
123
130
|
prefix: options.prefix,
|
|
131
|
+
unitTestRunner: options.unitTestRunner,
|
|
124
132
|
setParserOptionsProject: options.setParserOptionsProject,
|
|
125
133
|
skipFormat: true,
|
|
126
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AACtC,2DAAyE;AACzE,qDAA8C;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,7 +78,8 @@
|
|
|
78
78
|
},
|
|
79
79
|
"parentModule": {
|
|
80
80
|
"type": "string",
|
|
81
|
-
"description": "Update the router configuration of the parent module using `loadChildren` or `children`, depending on what `lazy` is set to."
|
|
81
|
+
"description": "Update the router configuration of the parent module using `loadChildren` or `children`, depending on what `lazy` is set to.",
|
|
82
|
+
"alias": "parent"
|
|
82
83
|
},
|
|
83
84
|
"tags": {
|
|
84
85
|
"type": "string",
|
|
@@ -128,6 +129,11 @@
|
|
|
128
129
|
"type": "boolean",
|
|
129
130
|
"description": "Whether to skip the creation of a default module when generating the library.",
|
|
130
131
|
"default": false
|
|
132
|
+
},
|
|
133
|
+
"standalone": {
|
|
134
|
+
"type": "boolean",
|
|
135
|
+
"description": "Generate a library that uses a standalone component instead of a module as the entry point.",
|
|
136
|
+
"default": false
|
|
131
137
|
}
|
|
132
138
|
},
|
|
133
139
|
"additionalProperties": false,
|
|
@@ -61,7 +61,7 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
61
61
|
(0, workspace_1.createRootKarmaConfig)(tree);
|
|
62
62
|
}
|
|
63
63
|
if (workspaceCapabilities.eslint) {
|
|
64
|
-
(0, workspace_1.updateRootEsLintConfig)(tree, eslintConfig);
|
|
64
|
+
(0, workspace_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
|
|
65
65
|
(0, workspace_1.cleanupEsLintPackages)(tree);
|
|
66
66
|
}
|
|
67
67
|
yield (0, devkit_1.formatFiles)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,2DAAuD;AACvD,qEAAiE;AAEjE,qEAAiE;AACjE,qDAY+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,wBAAwB;YACxB,IAAA,oCAAgB,EAAC,SAAS,CAAC,CAAC;YAE5B,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -192,6 +192,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
192
192
|
project: this.project.name,
|
|
193
193
|
linter: linter_1.Linter.EsLint,
|
|
194
194
|
eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
|
|
195
|
+
unitTestRunner: this.options.unitTestRunner,
|
|
195
196
|
tsConfigPaths: [
|
|
196
197
|
(0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
|
|
197
198
|
],
|