@nrwl/angular 14.4.0-beta.0 → 14.4.0-beta.5
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 +1 -0
- package/generators.js +1 -0
- package/generators.js.map +1 -1
- package/migrations.json +16 -0
- package/package.json +9 -9
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +1 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +3 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.d.ts +2 -3
- package/src/builders/webpack-server/webpack-server.impl.js +4 -2
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.d.ts +2 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +5 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/change-storybook-targets/compat.d.ts +1 -1
- package/src/generators/change-storybook-targets/schema.d.ts +3 -0
- package/src/generators/change-storybook-targets/schema.json +7 -1
- package/src/generators/component/component.d.ts +1 -1
- package/src/generators/component/component.js +7 -4
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/component.d.ts +2 -2
- package/src/generators/component/lib/component.js +8 -15
- package/src/generators/component/lib/component.js.map +1 -1
- package/src/generators/component/lib/entry-point.d.ts +0 -1
- package/src/generators/component/lib/entry-point.js +3 -21
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/component/lib/module.d.ts +2 -2
- package/src/generators/component/lib/module.js.map +1 -1
- package/src/generators/component/lib/normalize-options.d.ts +3 -0
- package/src/generators/component/lib/normalize-options.js +16 -0
- package/src/generators/component/lib/normalize-options.js.map +1 -0
- package/src/generators/component/schema.d.ts +6 -0
- package/src/generators/component-cypress-spec/component-cypress-spec.js +3 -0
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-cypress-spec/schema.d.ts +1 -0
- package/src/generators/component-cypress-spec/schema.json +5 -0
- package/src/generators/component-story/component-story.js +3 -0
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/component-story/schema.d.ts +1 -0
- package/src/generators/component-story/schema.json +5 -0
- package/src/generators/library/lib/normalize-options.js +2 -1
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/normalize-options.js +5 -9
- package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +7 -13
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.actions.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__ +3 -3
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.selectors.spec.ts__tmpl__ +5 -5
- package/src/generators/scam/lib/convert-component-to-scam.d.ts +4 -0
- package/src/generators/scam/lib/convert-component-to-scam.js +44 -0
- package/src/generators/scam/lib/convert-component-to-scam.js.map +1 -0
- package/src/generators/scam/lib/export-scam.d.ts +4 -0
- package/src/generators/scam/lib/export-scam.js +37 -0
- package/src/generators/scam/lib/export-scam.js.map +1 -0
- package/src/generators/scam/lib/index.d.ts +3 -0
- package/src/generators/scam/lib/index.js +6 -0
- package/src/generators/scam/lib/index.js.map +1 -1
- package/src/generators/scam/lib/normalize-options.d.ts +3 -0
- package/src/generators/scam/lib/normalize-options.js +16 -0
- package/src/generators/scam/lib/normalize-options.js.map +1 -0
- package/src/generators/scam/scam.d.ts +1 -1
- package/src/generators/scam/scam.js +10 -6
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/scam/schema.d.ts +6 -0
- package/src/generators/stories/schema.d.ts +1 -0
- package/src/generators/stories/schema.json +5 -0
- package/src/generators/stories/stories.js +5 -0
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -0
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +5 -0
- package/src/generators/storybook-configuration/storybook-configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +5 -1
- package/src/generators/storybook-configuration/storybook-configuration.js.map +1 -1
- package/src/generators/utils/component.d.ts +14 -0
- package/src/generators/utils/component.js +20 -0
- package/src/generators/utils/component.js.map +1 -0
- package/src/generators/utils/entry-point.d.ts +2 -0
- package/src/generators/utils/entry-point.js +22 -0
- package/src/generators/utils/entry-point.js.map +1 -0
- package/src/generators/utils/path.d.ts +1 -0
- package/src/generators/utils/path.js +7 -1
- package/src/generators/utils/path.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +5 -4
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/component/lib/path.d.ts +0 -1
- package/src/generators/component/lib/path.js +0 -11
- package/src/generators/component/lib/path.js.map +0 -1
- package/src/generators/scam/lib/create-module.d.ts +0 -3
- package/src/generators/scam/lib/create-module.js +0 -90
- package/src/generators/scam/lib/create-module.js.map +0 -1
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.locateLibraryEntryPointFromDirectory = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
function locateLibraryEntryPointFromDirectory(tree, directory, projectRoot, projectSourceRoot) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
const ngPackageJsonPath = (0, devkit_1.joinPathFragments)(directory, 'ng-package.json');
|
|
9
|
+
let entryPointFile = tree.exists(ngPackageJsonPath)
|
|
10
|
+
? (_b = (_a = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _a === void 0 ? void 0 : _a.entryFile) !== null && _b !== void 0 ? _b : 'src/public_api.ts'
|
|
11
|
+
: null;
|
|
12
|
+
if (entryPointFile) {
|
|
13
|
+
return (0, devkit_1.joinPathFragments)(directory, entryPointFile);
|
|
14
|
+
}
|
|
15
|
+
if (directory === projectRoot) {
|
|
16
|
+
const indexFile = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'index.ts');
|
|
17
|
+
return tree.exists(indexFile) ? indexFile : null;
|
|
18
|
+
}
|
|
19
|
+
return locateLibraryEntryPointFromDirectory(tree, (0, path_1.dirname)(directory), projectRoot, projectSourceRoot);
|
|
20
|
+
}
|
|
21
|
+
exports.locateLibraryEntryPointFromDirectory = locateLibraryEntryPointFromDirectory;
|
|
22
|
+
//# sourceMappingURL=entry-point.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/entry-point.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAC3D,+BAA+B;AAE/B,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,MAAA,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,GAAG,0CAAE,SAAS,mCAAI,mBAAmB;QACzE,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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pathStartsWith = void 0;
|
|
3
|
+
exports.getRelativeImportToFile = exports.pathStartsWith = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
4
5
|
const path_1 = require("path");
|
|
5
6
|
function pathStartsWith(path1, path2) {
|
|
6
7
|
path1 = (0, path_1.normalize)(path1).replace(/\\/g, '/');
|
|
@@ -8,4 +9,9 @@ function pathStartsWith(path1, path2) {
|
|
|
8
9
|
return path1.startsWith(path2);
|
|
9
10
|
}
|
|
10
11
|
exports.pathStartsWith = pathStartsWith;
|
|
12
|
+
function getRelativeImportToFile(sourceFilePath, targetFilePath) {
|
|
13
|
+
const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
|
|
14
|
+
return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
|
|
15
|
+
}
|
|
16
|
+
exports.getRelativeImportToFile = getRelativeImportToFile;
|
|
11
17
|
//# sourceMappingURL=path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAA8D;AAE9D,SAAgB,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AALD,wCAKC;AAED,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"}
|
|
@@ -8,6 +8,7 @@ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
11
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
11
12
|
function collectDependencies(projectGraph, name, dependencies = {
|
|
12
13
|
workspaceLibraries: new Set(),
|
|
13
14
|
npmPackages: new Set(),
|
|
@@ -30,7 +31,7 @@ function collectDependencies(projectGraph, name, dependencies = {
|
|
|
30
31
|
}
|
|
31
32
|
function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
32
33
|
var _a, _b;
|
|
33
|
-
const {
|
|
34
|
+
const { nodes: projectGraphNodes } = (0, devkit_1.readCachedProjectGraph)();
|
|
34
35
|
const tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)();
|
|
35
36
|
const tsConfig = (0, typescript_1.readTsConfig)(tsConfigPath);
|
|
36
37
|
const tsconfigPathAliases = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths;
|
|
@@ -39,7 +40,7 @@ function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
|
39
40
|
}
|
|
40
41
|
const mappedLibraries = [];
|
|
41
42
|
for (const lib of workspaceLibraries) {
|
|
42
|
-
const sourceRoot =
|
|
43
|
+
const sourceRoot = projectGraphNodes[lib].data.sourceRoot;
|
|
43
44
|
let found = false;
|
|
44
45
|
for (const [key, value] of Object.entries(tsconfigPathAliases)) {
|
|
45
46
|
if (value.find((p) => p.startsWith(sourceRoot))) {
|
|
@@ -66,10 +67,10 @@ function getDependentPackagesForProject(projectGraph, name) {
|
|
|
66
67
|
});
|
|
67
68
|
}
|
|
68
69
|
function determineRemoteUrl(remote) {
|
|
69
|
-
const
|
|
70
|
+
const remoteProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
70
71
|
let publicHost = '';
|
|
71
72
|
try {
|
|
72
|
-
publicHost =
|
|
73
|
+
publicHost = remoteProjectConfiguration.targets.serve.options.publicHost;
|
|
73
74
|
}
|
|
74
75
|
catch (error) {
|
|
75
76
|
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "publicHost" in the project's "serve" target.\n
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,+CAKuB;AACvB,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare const angularJsVersion = "1.7.9";
|
|
|
6
6
|
export declare const ngrxVersion = "~14.0.0";
|
|
7
7
|
export declare const rxjsVersion = "~7.4.0";
|
|
8
8
|
export declare const jestPresetAngularVersion = "~11.1.2";
|
|
9
|
-
export declare const angularEslintVersion = "~
|
|
9
|
+
export declare const angularEslintVersion = "~14.0.0";
|
|
10
10
|
export declare const tailwindVersion = "^3.0.2";
|
|
11
11
|
export declare const postcssVersion = "^8.4.5";
|
|
12
12
|
export declare const autoprefixerVersion = "^10.4.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.angularJsVersion = '1.7.9';
|
|
|
9
9
|
exports.ngrxVersion = '~14.0.0';
|
|
10
10
|
exports.rxjsVersion = '~7.4.0';
|
|
11
11
|
exports.jestPresetAngularVersion = '~11.1.2';
|
|
12
|
-
exports.angularEslintVersion = '~
|
|
12
|
+
exports.angularEslintVersion = '~14.0.0';
|
|
13
13
|
exports.tailwindVersion = '^3.0.2';
|
|
14
14
|
exports.postcssVersion = '^8.4.5';
|
|
15
15
|
exports.autoprefixerVersion = '^10.4.0';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;
|
|
@@ -1,11 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,90 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createScam = void 0;
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
6
|
-
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
7
|
-
const typescript_1 = require("typescript");
|
|
8
|
-
function createScam(tree, schema) {
|
|
9
|
-
var _a, _b, _c;
|
|
10
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_2.readWorkspaceConfiguration)(tree).defaultProject;
|
|
11
|
-
const projectConfig = (0, devkit_2.readProjectConfiguration)(tree, project);
|
|
12
|
-
const componentNames = (0, devkit_2.names)(schema.name);
|
|
13
|
-
const typeNames = (0, devkit_2.names)((_b = schema.type) !== null && _b !== void 0 ? _b : 'component');
|
|
14
|
-
const componentFileName = `${componentNames.fileName}.${(_c = schema.type) !== null && _c !== void 0 ? _c : 'component'}`;
|
|
15
|
-
let componentDirectory = schema.flat
|
|
16
|
-
? (0, devkit_2.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib')
|
|
17
|
-
: (0, devkit_2.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib', componentNames.fileName);
|
|
18
|
-
if (schema.path) {
|
|
19
|
-
componentDirectory = schema.flat
|
|
20
|
-
? (0, devkit_2.normalizePath)(schema.path)
|
|
21
|
-
: (0, devkit_2.joinPathFragments)(schema.path, componentNames.fileName);
|
|
22
|
-
}
|
|
23
|
-
const componentFilePath = (0, devkit_2.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
24
|
-
if (!tree.exists(componentFilePath)) {
|
|
25
|
-
throw new Error(`Couldn't find component at path ${componentFilePath} to add SCAM setup.`);
|
|
26
|
-
}
|
|
27
|
-
if (schema.inlineScam) {
|
|
28
|
-
const currentComponentContents = tree.read(componentFilePath, 'utf-8');
|
|
29
|
-
let source = (0, typescript_1.createSourceFile)(componentFilePath, currentComponentContents, typescript_1.ScriptTarget.Latest, true);
|
|
30
|
-
source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'NgModule', '@angular/core');
|
|
31
|
-
source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'CommonModule', '@angular/common');
|
|
32
|
-
let updatedComponentSource = source.getText();
|
|
33
|
-
updatedComponentSource = `${updatedComponentSource}${createAngularComponentModule(`${componentNames.className}${typeNames.className}`)}`;
|
|
34
|
-
tree.write(componentFilePath, updatedComponentSource);
|
|
35
|
-
exportScam(tree, schema, componentFilePath);
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
const scamFilePath = (0, devkit_2.joinPathFragments)(componentDirectory, `${componentNames.fileName}.module.ts`);
|
|
39
|
-
tree.write(scamFilePath, createSeparateAngularComponentModuleFile(`${componentNames.className}${typeNames.className}`, componentFileName));
|
|
40
|
-
exportScam(tree, schema, scamFilePath);
|
|
41
|
-
}
|
|
42
|
-
exports.createScam = createScam;
|
|
43
|
-
function exportScam(tree, schema, scamFilePath) {
|
|
44
|
-
var _a, _b;
|
|
45
|
-
if (!schema.export) {
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_2.readWorkspaceConfiguration)(tree).defaultProject;
|
|
49
|
-
const { root, sourceRoot, projectType } = (0, devkit_2.readProjectConfiguration)(tree, project);
|
|
50
|
-
if (projectType === 'application') {
|
|
51
|
-
devkit_1.logger.warn('--export=true was ignored as the project the SCAM is being generated in is not a library.');
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
const ngPackageJsonPath = (0, devkit_2.joinPathFragments)(root, 'ng-package.json');
|
|
55
|
-
const ngPackageEntryPoint = tree.exists(ngPackageJsonPath)
|
|
56
|
-
? (_b = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _b === void 0 ? void 0 : _b.entryFile
|
|
57
|
-
: undefined;
|
|
58
|
-
const projectEntryPoint = ngPackageEntryPoint
|
|
59
|
-
? (0, devkit_2.joinPathFragments)(root, ngPackageEntryPoint)
|
|
60
|
-
: (0, devkit_2.joinPathFragments)(sourceRoot, `index.ts`);
|
|
61
|
-
if (!tree.exists(projectEntryPoint)) {
|
|
62
|
-
// Let's not error, simply warn the user
|
|
63
|
-
// It's not too much effort to manually do this
|
|
64
|
-
// It would be more frustrating to have to find the correct path and re-run the command
|
|
65
|
-
devkit_1.logger.warn(`Could not export SCAM. Unable to determine project's entry point. Path ${projectEntryPoint} does not exist. SCAM has still been created.`);
|
|
66
|
-
return;
|
|
67
|
-
}
|
|
68
|
-
const relativePathFromEntryPoint = `.${scamFilePath
|
|
69
|
-
.split(sourceRoot)[1]
|
|
70
|
-
.replace('.ts', '')}`;
|
|
71
|
-
const updateEntryPointContent = `${tree.read(projectEntryPoint, 'utf-8')}
|
|
72
|
-
export * from "${relativePathFromEntryPoint}";`;
|
|
73
|
-
tree.write(projectEntryPoint, updateEntryPointContent);
|
|
74
|
-
}
|
|
75
|
-
function createAngularComponentModule(name) {
|
|
76
|
-
return `
|
|
77
|
-
@NgModule({
|
|
78
|
-
imports: [CommonModule],
|
|
79
|
-
declarations: [${name}],
|
|
80
|
-
exports: [${name}],
|
|
81
|
-
})
|
|
82
|
-
export class ${name}Module {}`;
|
|
83
|
-
}
|
|
84
|
-
function createSeparateAngularComponentModuleFile(name, componentFileName) {
|
|
85
|
-
return `import { NgModule } from '@angular/core';
|
|
86
|
-
import { CommonModule } from '@angular/common';
|
|
87
|
-
import { ${name} } from './${componentFileName}';
|
|
88
|
-
${createAngularComponentModule(name)}`;
|
|
89
|
-
}
|
|
90
|
-
//# sourceMappingURL=create-module.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/create-module.ts"],"names":[],"mappings":"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"}
|