@nrwl/angular 14.1.9 → 14.2.0-beta.2
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/esm2020/src/runtime/nx/data-persistence.mjs +4 -4
- package/esm2020/src/runtime/nx/nx.module.mjs +5 -5
- package/fesm2015/nrwl-angular.mjs +7 -7
- package/fesm2015/nrwl-angular.mjs.map +1 -1
- package/fesm2020/nrwl-angular.mjs +7 -7
- package/fesm2020/nrwl-angular.mjs.map +1 -1
- package/generators.json +2 -0
- package/migrations.json +171 -0
- package/package.json +14 -14
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +30 -3
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-browser/schema.json +59 -38
- package/src/builders/webpack-server/webpack-server.impl.js +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +108 -76
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +3 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +12 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +0 -6
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +1 -8
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +3 -2
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +12 -0
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/utilities/tailwindcss.js +14 -9
- package/src/executors/utilities/tailwindcss.js.map +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +3 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/component/component.d.ts +1 -1
- package/src/generators/component/component.js +29 -38
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/entry-point.d.ts +3 -0
- package/src/generators/component/lib/entry-point.js +35 -0
- package/src/generators/component/lib/entry-point.js.map +1 -0
- package/src/generators/component/lib/index.d.ts +3 -0
- package/src/generators/component/lib/index.js +7 -0
- package/src/generators/component/lib/index.js.map +1 -0
- package/src/generators/component/lib/module.d.ts +3 -0
- package/src/generators/component/lib/module.js +64 -0
- package/src/generators/component/lib/module.js.map +1 -0
- package/src/generators/component/lib/path.d.ts +1 -0
- package/src/generators/component/lib/path.js +11 -0
- package/src/generators/component/lib/path.js.map +1 -0
- package/src/generators/component/schema.d.ts +1 -0
- package/src/generators/component/schema.json +6 -1
- package/src/generators/init/init.js +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -0
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.js +5 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/stories/lib/component-info.d.ts +2 -1
- package/src/generators/stories/lib/component-info.js +29 -1
- package/src/generators/stories/lib/component-info.js.map +1 -1
- package/src/generators/stories/stories.js +5 -1
- package/src/generators/stories/stories.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.d.ts +2 -0
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js +27 -0
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js.map +1 -0
- package/src/migrations/update-14-2-0/update-angular-cli.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-angular-cli.js +26 -0
- package/src/migrations/update-14-2-0/update-angular-cli.js.map +1 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js +38 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js.map +1 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.js +22 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.js.map +1 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.js +158 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.js.map +1 -0
- package/src/utils/mfe/mfe-webpack.js +24 -8
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +2 -3
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/testing.d.ts +1 -1
- package/src/utils/versions.d.ts +6 -5
- package/src/utils/versions.js +7 -6
- package/src/utils/versions.js.map +1 -1
- package/mfe/nrwl-angular-mfe.d.ts +0 -5
- package/mfe/package.json +0 -10
- package/nrwl-angular.d.ts +0 -5
- package/testing/nrwl-angular-testing.d.ts +0 -5
- package/testing/package.json +0 -10
|
@@ -4,15 +4,15 @@ exports.componentGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
8
7
|
const path_1 = require("../utils/path");
|
|
8
|
+
const lib_1 = require("./lib");
|
|
9
9
|
function componentGenerator(tree, schema) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
checkPathUnderProjectRoot(tree, schema);
|
|
12
12
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
13
13
|
yield angularComponentSchematic(tree, Object.assign({}, schema));
|
|
14
|
-
|
|
15
|
-
yield (0,
|
|
14
|
+
exportComponentInEntryPoint(tree, schema);
|
|
15
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
exports.componentGenerator = componentGenerator;
|
|
@@ -21,58 +21,49 @@ function checkPathUnderProjectRoot(tree, schema) {
|
|
|
21
21
|
if (!schema.path) {
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0,
|
|
25
|
-
const { root } = (0,
|
|
26
|
-
let pathToComponent = (0,
|
|
24
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
25
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
26
|
+
let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
|
|
27
27
|
pathToComponent = pathToComponent.startsWith('/')
|
|
28
28
|
? pathToComponent.slice(1)
|
|
29
29
|
: pathToComponent;
|
|
30
30
|
if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
|
|
31
|
-
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root})
|
|
31
|
+
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
|
|
32
|
+
`Please make sure to provide a path that exists under the project root.`);
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
|
-
function
|
|
35
|
-
var _a, _b
|
|
35
|
+
function exportComponentInEntryPoint(tree, schema) {
|
|
36
|
+
var _a, _b;
|
|
36
37
|
if (!schema.export || schema.skipImport) {
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0,
|
|
40
|
-
const { root, sourceRoot, projectType } = (0,
|
|
40
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
41
|
+
const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
41
42
|
if (projectType === 'application') {
|
|
42
|
-
devkit_1.logger.warn('--export=true was ignored as the project the component being generated in is not a library.');
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
const componentNames = (0, devkit_1.names)(schema.name);
|
|
46
|
-
const componentFileName = `${componentNames.fileName}.${
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
? (0, devkit_2.normalizePath)(schema.path)
|
|
53
|
-
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
54
|
-
}
|
|
46
|
+
const componentFileName = `${componentNames.fileName}.${schema.type ? (0, devkit_1.names)(schema.type).fileName : 'component'}`;
|
|
47
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
48
|
+
(_b = schema.path) !== null && _b !== void 0 ? _b : (schema.path = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'lib'));
|
|
49
|
+
const componentDirectory = schema.flat
|
|
50
|
+
? (0, devkit_1.normalizePath)(schema.path)
|
|
51
|
+
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
55
52
|
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
if (!
|
|
64
|
-
// Let's not error, simply warn the user
|
|
65
|
-
// It's not too much effort to manually do this
|
|
66
|
-
// It would be more frustrating to have to find the correct path and re-run the command
|
|
67
|
-
devkit_1.logger.warn(`Could not export the component in the library's entry point. Unable to determine project's entry point. The path ${projectEntryPoint} does not exist. The component has still been created.`);
|
|
53
|
+
const entryPointPath = (0, lib_1.locateLibraryEntryPointFromDirectory)(tree, componentDirectory, root, projectSourceRoot);
|
|
54
|
+
if (!entryPointPath) {
|
|
55
|
+
devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
|
|
56
|
+
`The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const modulePath = (0, lib_1.findModuleFromOptions)(tree, schema, root);
|
|
60
|
+
if (!(0, lib_1.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
|
|
68
61
|
return;
|
|
69
62
|
}
|
|
70
|
-
const relativePathFromEntryPoint =
|
|
71
|
-
|
|
72
|
-
.replace('.ts', '')}`;
|
|
73
|
-
const updateEntryPointContent = `${tree.read(projectEntryPoint, 'utf-8')}
|
|
63
|
+
const relativePathFromEntryPoint = (0, lib_1.getRelativeImportToFile)(entryPointPath, componentFilePath);
|
|
64
|
+
const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
|
|
74
65
|
export * from "${relativePathFromEntryPoint}";`;
|
|
75
|
-
tree.write(
|
|
66
|
+
tree.write(entryPointPath, updateEntryPointContent);
|
|
76
67
|
}
|
|
77
68
|
exports.default = componentGenerator;
|
|
78
69
|
//# sourceMappingURL=component.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function locateLibraryEntryPointFromDirectory(tree: Tree, directory: string, projectRoot: string, projectSourceRoot: string): string | null;
|
|
3
|
+
export declare function shouldExportInEntryPoint(tree: Tree, entryPoint: string, modulePath: string): boolean;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldExportInEntryPoint = exports.locateLibraryEntryPointFromDirectory = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const path_2 = require("./path");
|
|
8
|
+
function locateLibraryEntryPointFromDirectory(tree, directory, projectRoot, projectSourceRoot) {
|
|
9
|
+
var _a;
|
|
10
|
+
const ngPackageJsonPath = (0, devkit_1.joinPathFragments)(directory, 'ng-package.json');
|
|
11
|
+
let entryPointFile = tree.exists(ngPackageJsonPath)
|
|
12
|
+
? (_a = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _a === void 0 ? void 0 : _a.entryFile
|
|
13
|
+
: null;
|
|
14
|
+
if (entryPointFile) {
|
|
15
|
+
return (0, devkit_1.joinPathFragments)(directory, entryPointFile);
|
|
16
|
+
}
|
|
17
|
+
if (directory === projectRoot) {
|
|
18
|
+
const indexFile = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'index.ts');
|
|
19
|
+
return tree.exists(indexFile) ? indexFile : null;
|
|
20
|
+
}
|
|
21
|
+
return locateLibraryEntryPointFromDirectory(tree, (0, path_1.dirname)(directory), projectRoot, projectSourceRoot);
|
|
22
|
+
}
|
|
23
|
+
exports.locateLibraryEntryPointFromDirectory = locateLibraryEntryPointFromDirectory;
|
|
24
|
+
function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
|
|
25
|
+
if (!modulePath) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
const moduleImportPath = (0, path_2.getRelativeImportToFile)(entryPoint, modulePath);
|
|
29
|
+
const entryPointContent = tree.read(entryPoint, 'utf-8');
|
|
30
|
+
const entryPointAst = tsquery_1.tsquery.ast(entryPointContent);
|
|
31
|
+
const moduleExport = (0, tsquery_1.tsquery)(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
|
|
32
|
+
return Boolean(moduleExport);
|
|
33
|
+
}
|
|
34
|
+
exports.shouldExportInEntryPoint = shouldExportInEntryPoint;
|
|
35
|
+
//# sourceMappingURL=entry-point.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAC3D,uDAAoD;AACpD,+BAA+B;AAE/B,iCAAiD;AAEjD,SAAgB,oCAAoC,CAClD,IAAU,EACV,SAAiB,EACjB,WAAmB,EACnB,iBAAyB;;IAEzB,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC1E,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;QACjD,CAAC,CAAC,MAAA,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,GAAG,0CAAE,SAAS;QAClD,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,cAAc,EAAE;QAClB,OAAO,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;KACrD;IAED,IAAI,SAAS,KAAK,WAAW,EAAE;QAC7B,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAEnE,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;KAClD;IAED,OAAO,oCAAoC,CACzC,IAAI,EACJ,IAAA,cAAO,EAAC,SAAS,CAAC,EAClB,WAAW,EACX,iBAAiB,CAClB,CAAC;AACJ,CAAC;AA3BD,oFA2BC;AAED,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAA,iBAAO,EAC1B,aAAa,EACb,0CAA0C,gBAAgB,IAAI,EAC9D,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAkB,CAAC;IAEtB,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AAnBD,4DAmBC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./entry-point"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./module"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./path"), exports);
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,mDAAyB;AACzB,iDAAuB"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findModuleFromOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
// Adapted from https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/find-module.ts#L29
|
|
7
|
+
// to match the logic in the component schematic. It doesn't throw if it can't
|
|
8
|
+
// find a module since the schematic would have thrown before getting here.
|
|
9
|
+
const moduleExt = '.module.ts';
|
|
10
|
+
const routingModuleExt = '-routing.module.ts';
|
|
11
|
+
function findModuleFromOptions(tree, options, projectRoot) {
|
|
12
|
+
if (!options.module) {
|
|
13
|
+
const pathToCheck = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
14
|
+
return (0, devkit_1.normalizePath)(findModule(tree, pathToCheck, projectRoot));
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
const modulePath = (0, devkit_1.joinPathFragments)(options.path, options.module);
|
|
18
|
+
const componentPath = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
19
|
+
const moduleBaseName = (0, path_1.basename)(modulePath);
|
|
20
|
+
const candidateSet = new Set([options.path]);
|
|
21
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
22
|
+
for (let dir = modulePath; dir !== projectRootParent; dir = (0, path_1.dirname)(dir)) {
|
|
23
|
+
candidateSet.add(dir);
|
|
24
|
+
}
|
|
25
|
+
for (let dir = componentPath; dir !== projectRoot; dir = (0, path_1.dirname)(dir)) {
|
|
26
|
+
candidateSet.add(dir);
|
|
27
|
+
}
|
|
28
|
+
const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
|
|
29
|
+
for (const c of candidatesDirs) {
|
|
30
|
+
const candidateFiles = [
|
|
31
|
+
'',
|
|
32
|
+
`${moduleBaseName}.ts`,
|
|
33
|
+
`${moduleBaseName}${moduleExt}`,
|
|
34
|
+
].map((x) => (0, devkit_1.joinPathFragments)(c, x));
|
|
35
|
+
for (const sc of candidateFiles) {
|
|
36
|
+
if (tree.isFile(sc)) {
|
|
37
|
+
return (0, devkit_1.normalizePath)(sc);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.findModuleFromOptions = findModuleFromOptions;
|
|
45
|
+
function findModule(tree, generateDir, projectRoot) {
|
|
46
|
+
let dir = generateDir;
|
|
47
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
48
|
+
while (dir !== projectRootParent) {
|
|
49
|
+
const allMatches = tree
|
|
50
|
+
.children(dir)
|
|
51
|
+
.map((path) => (0, devkit_1.joinPathFragments)(dir, path))
|
|
52
|
+
.filter((path) => tree.isFile(path) && path.endsWith(moduleExt));
|
|
53
|
+
const filteredMatches = allMatches.filter((path) => !path.endsWith(routingModuleExt));
|
|
54
|
+
if (filteredMatches.length == 1) {
|
|
55
|
+
return filteredMatches[0];
|
|
56
|
+
}
|
|
57
|
+
else if (filteredMatches.length > 1) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
dir = (0, path_1.dirname)(dir);
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getRelativeImportToFile = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
function getRelativeImportToFile(sourceFilePath, targetFilePath) {
|
|
7
|
+
const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
|
|
8
|
+
return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
|
|
9
|
+
}
|
|
10
|
+
exports.getRelativeImportToFile = getRelativeImportToFile;
|
|
11
|
+
//# sourceMappingURL=path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/path.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAAmD;AAEnD,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC"}
|
|
@@ -5,6 +5,7 @@ export interface Schema {
|
|
|
5
5
|
displayBlock?: boolean;
|
|
6
6
|
inlineStyle?: boolean;
|
|
7
7
|
inlineTemplate?: boolean;
|
|
8
|
+
standalone?: boolean;
|
|
8
9
|
viewEncapsulation?: 'Emulated' | 'None' | 'ShadowDom';
|
|
9
10
|
changeDetection?: 'Default' | 'OnPush';
|
|
10
11
|
style?: 'css' | 'scss' | 'sass' | 'less' | 'none';
|
|
@@ -47,6 +47,11 @@
|
|
|
47
47
|
"default": false,
|
|
48
48
|
"alias": "t"
|
|
49
49
|
},
|
|
50
|
+
"standalone": {
|
|
51
|
+
"description": "Whether the generated component is standalone.",
|
|
52
|
+
"type": "boolean",
|
|
53
|
+
"default": false
|
|
54
|
+
},
|
|
50
55
|
"viewEncapsulation": {
|
|
51
56
|
"description": "The view encapsulation strategy to use in the new component.",
|
|
52
57
|
"enum": ["Emulated", "None", "ShadowDom"],
|
|
@@ -103,7 +108,7 @@
|
|
|
103
108
|
},
|
|
104
109
|
"export": {
|
|
105
110
|
"type": "boolean",
|
|
106
|
-
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`).",
|
|
111
|
+
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`) if the module it belongs to is also exported.",
|
|
107
112
|
"default": false
|
|
108
113
|
}
|
|
109
114
|
},
|
|
@@ -57,7 +57,7 @@ function addPostInstall(host) {
|
|
|
57
57
|
(0, devkit_2.updateJson)(host, 'package.json', (pkgJson) => {
|
|
58
58
|
var _a;
|
|
59
59
|
pkgJson.scripts = (_a = pkgJson.scripts) !== null && _a !== void 0 ? _a : {};
|
|
60
|
-
const command = 'ngcc --properties
|
|
60
|
+
const command = 'ngcc --properties es2020 browser module main';
|
|
61
61
|
if (!pkgJson.scripts.postinstall) {
|
|
62
62
|
pkgJson.scripts.postinstall = command;
|
|
63
63
|
}
|
|
@@ -30,7 +30,7 @@ function updateTsConfig(host, options) {
|
|
|
30
30
|
// update the TypeScript settings
|
|
31
31
|
json.compilerOptions = Object.assign(Object.assign({}, ((_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {})), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
32
32
|
// update Angular Template Settings
|
|
33
|
-
json.angularCompilerOptions = Object.assign(Object.assign({}, ((_b = json.angularCompilerOptions) !== null && _b !== void 0 ? _b : {})), { strictInjectionParameters: true, strictInputAccessModifiers: true, strictTemplates: true });
|
|
33
|
+
json.angularCompilerOptions = Object.assign(Object.assign({}, ((_b = json.angularCompilerOptions) !== null && _b !== void 0 ? _b : {})), { enableI18nLegacyMessageIdFormat: false, strictInjectionParameters: true, strictInputAccessModifiers: true, strictTemplates: true });
|
|
34
34
|
return json;
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB;;KAEK;AACL,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AALD,4DAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU,EAAE,QAAiB;;IACnE,6CAA6C;IAC7C,gDAAgD;IAChD,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC3C,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;IAEtD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM;QAClD,MAAA,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM,mCAAI,QAAQ,CAAC;IACnE,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAbD,0DAaC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,+EAA+E;IAC/E,4FAA4F;IAC5F,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;;QAChE,iCAAiC;QACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;QAEF,mCAAmC;QACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB;;KAEK;AACL,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AALD,4DAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU,EAAE,QAAiB;;IACnE,6CAA6C;IAC7C,gDAAgD;IAChD,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC3C,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;IAEtD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM;QAClD,MAAA,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM,mCAAI,QAAQ,CAAC;IACnE,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAbD,0DAaC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,+EAA+E;IAC/E,4FAA4F;IAC5F,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;;QAChE,iCAAiC;QACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;QAEF,mCAAmC;QACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,+BAA+B,EAAE,KAAK,EACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -25,6 +25,8 @@ function updateProjectConfig(host, options) {
|
|
|
25
25
|
];
|
|
26
26
|
return json;
|
|
27
27
|
});
|
|
28
|
+
// tsconfig.json
|
|
29
|
+
(0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'es2020' }) })));
|
|
28
30
|
}
|
|
29
31
|
function updateProjectIvyConfig(host, options) {
|
|
30
32
|
if (options.buildable || options.publishable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCAAO,IAAI,CAAC,eAAe,KAAE,MAAM,EAAE,QAAQ,OAC5D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
|
|
@@ -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 versions_1 = require("../../utils/versions");
|
|
11
12
|
const add_linting_1 = require("../add-linting/add-linting");
|
|
12
13
|
const karma_project_1 = require("../karma-project/karma-project");
|
|
13
14
|
const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
@@ -57,6 +58,10 @@ function libraryGenerator(host, schema) {
|
|
|
57
58
|
});
|
|
58
59
|
}
|
|
59
60
|
if (options.buildable || options.publishable) {
|
|
61
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(host, [], ['ng-packagr']);
|
|
62
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
63
|
+
'ng-packagr': versions_1.ngPackagrVersion,
|
|
64
|
+
});
|
|
60
65
|
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(host);
|
|
61
66
|
}
|
|
62
67
|
if (options.standaloneConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
export interface ComponentInfo {
|
|
3
3
|
componentFileName: string;
|
|
4
4
|
moduleFolderPath: string;
|
|
@@ -6,3 +6,4 @@ export interface ComponentInfo {
|
|
|
6
6
|
path: string;
|
|
7
7
|
}
|
|
8
8
|
export declare function getComponentsInfo(tree: Tree, moduleFilePaths: string[], projectName: string): ComponentInfo[];
|
|
9
|
+
export declare function getStandaloneComponentsInfo(tree: Tree, projectPath: string): ComponentInfo[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getComponentsInfo = void 0;
|
|
3
|
+
exports.getStandaloneComponentsInfo = exports.getComponentsInfo = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
6
|
const path_1 = require("path");
|
|
@@ -21,6 +21,34 @@ function getComponentsInfo(tree, moduleFilePaths, projectName) {
|
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
exports.getComponentsInfo = getComponentsInfo;
|
|
24
|
+
function getStandaloneComponentsInfo(tree, projectPath) {
|
|
25
|
+
const componentsInfo = [];
|
|
26
|
+
(0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (filePath) => {
|
|
27
|
+
if ((0, path_1.extname)(filePath) !== '.ts') {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
const standaloneComponents = getStandaloneComponents(tree, filePath);
|
|
31
|
+
if (!standaloneComponents.length) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
standaloneComponents.forEach((componentName) => {
|
|
35
|
+
componentsInfo.push({
|
|
36
|
+
componentFileName: (0, path_1.basename)(filePath, '.ts'),
|
|
37
|
+
moduleFolderPath: projectPath,
|
|
38
|
+
name: componentName,
|
|
39
|
+
path: (0, path_1.dirname)((0, path_1.relative)(projectPath, filePath)),
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
return componentsInfo;
|
|
44
|
+
}
|
|
45
|
+
exports.getStandaloneComponentsInfo = getStandaloneComponentsInfo;
|
|
46
|
+
function getStandaloneComponents(tree, filePath) {
|
|
47
|
+
const fileContent = tree.read(filePath, 'utf-8');
|
|
48
|
+
const ast = tsquery_1.tsquery.ast(fileContent);
|
|
49
|
+
const components = (0, tsquery_1.tsquery)(ast, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression PropertyAssignment Identifier[name=standalone] ~ TrueKeyword) > Identifier', { visitAllChildren: true });
|
|
50
|
+
return components.map((component) => component.getText());
|
|
51
|
+
}
|
|
24
52
|
function getComponentImportPath(componentName, imports) {
|
|
25
53
|
const componentImportStatement = imports.find((statement) => {
|
|
26
54
|
const namedImports = statement
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,11 @@ function angularStoriesGenerator(tree, options) {
|
|
|
14
14
|
const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
|
|
15
15
|
const projectPath = (0, project_type_1.getProjectRootPath)(tree, options.name);
|
|
16
16
|
const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, projectPath);
|
|
17
|
-
const componentsInfo =
|
|
17
|
+
const componentsInfo = [
|
|
18
|
+
...(0, component_info_1.getComponentsInfo)(tree, moduleFilePaths, options.name),
|
|
19
|
+
// TODO(leo): uncomment once Storybook supports standalone components https://github.com/storybookjs/storybook/pull/18272
|
|
20
|
+
// ...getStandaloneComponentsInfo(tree, projectPath),
|
|
21
|
+
];
|
|
18
22
|
if (options.generateCypressSpecs && !e2eProject) {
|
|
19
23
|
devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
|
|
20
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AACtC,6EAAgF;AAChF,6FAA6F;AAC7F,wEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AACtC,6EAAgF;AAChF,6FAA6F;AAC7F,wEAAyE;AACzE,yDAG8B;AAC9B,2DAAsD;AACtD,mDAAuD;AAGvD,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAgC;;IAEhC,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,iCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG;QACrB,GAAG,IAAA,kCAAiB,EAAC,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC;QACzD,yHAAyH;QACzH,qDAAqD;KACtD,CAAC;IAEF,IAAI,OAAO,CAAC,oBAAoB,IAAI,CAAC,UAAU,EAAE;QAC/C,eAAM,CAAC,IAAI,CACT,6BAA6B,cAAc,mHAAmH,CAC/J,CAAC;KACH;IAED,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO;SACR;QAED,IAAA,yBAAuB,EAAC,IAAI,EAAE;YAC5B,WAAW,EAAE,IAAI,CAAC,gBAAgB;YAClC,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,oBAAoB,IAAI,UAAU,EAAE;YAC9C,IAAA,gCAA6B,EAAC,IAAI,EAAE;gBAClC,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA3CD,0DA2CC;AAED,kBAAe,uBAAuB,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
6
|
+
const executors = [
|
|
7
|
+
'@angular-devkit/build-angular:browser',
|
|
8
|
+
'@angular-devkit/build-angular:server',
|
|
9
|
+
'@nrwl/angular:webpack-browser',
|
|
10
|
+
];
|
|
11
|
+
function default_1(tree) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
executors.forEach((executor) => {
|
|
14
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
|
|
15
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
16
|
+
const config = configurationName
|
|
17
|
+
? projectConfiguration.targets[targetName].configurations[configurationName]
|
|
18
|
+
: projectConfiguration.targets[targetName].options;
|
|
19
|
+
delete config.showCircularDependencies;
|
|
20
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.default = default_1;
|
|
27
|
+
//# sourceMappingURL=remove-show-circular-dependencies-option.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-show-circular-dependencies-option.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,iGAA8F;AAE9F,MAAM,SAAS,GAAG;IAChB,uCAAuC;IACvC,sCAAsC;IACtC,+BAA+B;CAChC,CAAC;AAEF,mBAA+B,IAAU;;QACvC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7B,IAAA,+CAAsB,EACpB,IAAI,EACJ,QAAQ,EACR,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;gBACvD,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,WAAW,CACZ,CAAC;gBACF,MAAM,MAAM,GAAG,iBAAiB;oBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;oBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;gBACrD,OAAO,MAAM,CAAC,wBAAwB,CAAC;gBACvC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACtE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,4BAsBC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
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
|
+
let shouldFormat = false;
|
|
8
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
9
|
+
var _a, _b;
|
|
10
|
+
if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
|
|
11
|
+
json.devDependencies['@angular/cli'] = '~14.0.0-rc.2';
|
|
12
|
+
shouldFormat = true;
|
|
13
|
+
}
|
|
14
|
+
else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
|
|
15
|
+
json.dependencies['@angular/cli'] = '~14.0.0-rc.2';
|
|
16
|
+
shouldFormat = true;
|
|
17
|
+
}
|
|
18
|
+
return json;
|
|
19
|
+
});
|
|
20
|
+
if (shouldFormat) {
|
|
21
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
exports.default = default_1;
|
|
26
|
+
//# sourceMappingURL=update-angular-cli.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-angular-cli.ts"],"names":[],"mappings":";;;AAAA,yCAA6D;AAE7D,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,cAAc,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;gBACtD,YAAY,GAAG,IAAI,CAAC;aACrB;iBAAM,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,cAAc,CAAC,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;gBACnD,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}
|