@nrwl/angular 13.3.0-beta.8 → 13.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators.d.ts +1 -0
- package/generators.js +1 -0
- package/generators.js.map +1 -1
- package/generators.json +11 -1
- package/migrations.json +6 -0
- package/package.json +7 -10
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +2 -3
- 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/styles/stylesheet-processor.d.ts +3 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +14 -19
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +3 -2
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +14 -19
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +3 -1
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/library/files/lib/{README.md → README.md__tpl__} +0 -0
- package/src/generators/library/lib/normalize-options.js +3 -1
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/update-ng-package.js +1 -1
- package/src/generators/library/lib/update-ng-package.js.map +1 -1
- package/src/generators/library/lib/update-project.js +1 -1
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +1 -1
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/scam/lib/create-module.d.ts +3 -0
- package/src/generators/scam/lib/create-module.js +54 -0
- package/src/generators/scam/lib/create-module.js.map +1 -0
- package/src/generators/scam/lib/index.d.ts +0 -0
- package/src/generators/scam/lib/index.js +1 -0
- package/src/generators/scam/lib/index.js.map +1 -0
- package/src/generators/scam/scam.compat.d.ts +2 -0
- package/src/generators/scam/scam.compat.js +6 -0
- package/src/generators/scam/scam.compat.js.map +1 -0
- package/src/generators/scam/scam.d.ts +4 -0
- package/src/generators/scam/scam.js +36 -0
- package/src/generators/scam/scam.js.map +1 -0
- package/src/generators/scam/schema.d.ts +18 -0
- package/src/generators/scam/schema.json +115 -0
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +7 -1
- package/src/generators/setup-mfe/lib/add-remote-to-host.js +1 -1
- package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mfe/lib/setup-serve-target.js +4 -2
- package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +0 -10
- package/src/generators/storybook-configuration/storybook-configuration.js.map +1 -1
- package/src/migrations/update-13-2-0/update-testing-imports.js +14 -1
- package/src/migrations/update-13-2-0/update-testing-imports.js.map +1 -1
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.d.ts +6 -0
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.js +120 -0
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.js.map +1 -0
- package/src/runtime/nx/data-persistence.d.ts +3 -0
- package/src/runtime/nx/nx.module.d.ts +4 -0
- package/src/utils/versions.d.ts +0 -1
- package/src/utils/versions.js +2 -3
- package/src/utils/versions.js.map +1 -1
package/generators.d.ts
CHANGED
|
@@ -14,3 +14,4 @@ export * from './src/generators/storybook-migrate-defaults-5-to-6/storybook-migr
|
|
|
14
14
|
export * from './src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2';
|
|
15
15
|
export * from './src/generators/upgrade-module/upgrade-module';
|
|
16
16
|
export * from './src/generators/setup-mfe/setup-mfe';
|
|
17
|
+
export * from './src/generators/scam/scam';
|
package/generators.js
CHANGED
|
@@ -17,4 +17,5 @@ const tslib_1 = require("tslib");
|
|
|
17
17
|
(0, tslib_1.__exportStar)(require("./src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2"), exports);
|
|
18
18
|
(0, tslib_1.__exportStar)(require("./src/generators/upgrade-module/upgrade-module"), exports);
|
|
19
19
|
(0, tslib_1.__exportStar)(require("./src/generators/setup-mfe/setup-mfe"), exports);
|
|
20
|
+
(0, tslib_1.__exportStar)(require("./src/generators/scam/scam"), exports);
|
|
20
21
|
//# sourceMappingURL=generators.js.map
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD"}
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD;AACrD,0EAA2C"}
|
package/generators.json
CHANGED
|
@@ -106,10 +106,15 @@
|
|
|
106
106
|
},
|
|
107
107
|
|
|
108
108
|
"setup-mfe": {
|
|
109
|
-
"factory": "./src/generators/setup-mfe/compat",
|
|
109
|
+
"factory": "./src/generators/setup-mfe/setup-mfe.compat",
|
|
110
110
|
"schema": "./src/generators/setup-mfe/schema.json",
|
|
111
111
|
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
112
112
|
},
|
|
113
|
+
"scam": {
|
|
114
|
+
"factory": "./src/generators/scam/scam.compat",
|
|
115
|
+
"schema": "./src/generators/scam/schema.json",
|
|
116
|
+
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
117
|
+
},
|
|
113
118
|
|
|
114
119
|
"web-worker": {
|
|
115
120
|
"factory": "./src/generators/web-worker/compat",
|
|
@@ -199,6 +204,11 @@
|
|
|
199
204
|
"schema": "./src/generators/ngrx/schema.json",
|
|
200
205
|
"description": "Adds NgRx support to an application or library."
|
|
201
206
|
},
|
|
207
|
+
"scam": {
|
|
208
|
+
"factory": "./src/generators/scam/scam",
|
|
209
|
+
"schema": "./src/generators/scam/schema.json",
|
|
210
|
+
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
211
|
+
},
|
|
202
212
|
"stories": {
|
|
203
213
|
"factory": "./src/generators/stories/stories",
|
|
204
214
|
"schema": "./src/generators/stories/schema.json",
|
package/migrations.json
CHANGED
|
@@ -126,6 +126,12 @@
|
|
|
126
126
|
"version": "13.2.0",
|
|
127
127
|
"description": "In Angular version 13, the `teardown` flag in `TestBed` will be enabled by default. This migration automatically opts out existing apps from the new teardown behavior.",
|
|
128
128
|
"factory": "./src/migrations/update-13-2-0/opt-out-testbed-teardown"
|
|
129
|
+
},
|
|
130
|
+
"update-mfe-config-to-module-syntax": {
|
|
131
|
+
"cli": "nx",
|
|
132
|
+
"version": "13.3.0-beta.0",
|
|
133
|
+
"description": "In Angular version 13, the ESM became a first class citizen. This means the webpack config generated must be modified to support modules.",
|
|
134
|
+
"factory": "./src/migrations/update-13-3-0/update-mfe-webpack-config"
|
|
129
135
|
}
|
|
130
136
|
},
|
|
131
137
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.3.
|
|
3
|
+
"version": "13.3.1",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -17,10 +17,6 @@
|
|
|
17
17
|
"Cypress",
|
|
18
18
|
"CLI"
|
|
19
19
|
],
|
|
20
|
-
"main": "./bundles/nrwl-angular.umd.js",
|
|
21
|
-
"types": "./nrwl-angular.d.ts",
|
|
22
|
-
"module": "fesm2015/nrwl-angular.mjs",
|
|
23
|
-
"es2015": "esm2015/nrwl-angular.js",
|
|
24
20
|
"exports": {
|
|
25
21
|
"./generators": "./generators.js",
|
|
26
22
|
"./tailwind": "./tailwind.js",
|
|
@@ -59,11 +55,11 @@
|
|
|
59
55
|
},
|
|
60
56
|
"dependencies": {
|
|
61
57
|
"@angular-devkit/schematics": "~13.0.0",
|
|
62
|
-
"@nrwl/cypress": "13.3.
|
|
63
|
-
"@nrwl/devkit": "13.3.
|
|
64
|
-
"@nrwl/jest": "13.3.
|
|
65
|
-
"@nrwl/linter": "13.3.
|
|
66
|
-
"@nrwl/storybook": "13.3.
|
|
58
|
+
"@nrwl/cypress": "13.3.1",
|
|
59
|
+
"@nrwl/devkit": "13.3.1",
|
|
60
|
+
"@nrwl/jest": "13.3.1",
|
|
61
|
+
"@nrwl/linter": "13.3.1",
|
|
62
|
+
"@nrwl/storybook": "13.3.1",
|
|
67
63
|
"@schematics/angular": "~13.0.0",
|
|
68
64
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
69
65
|
"ignore": "^5.0.4",
|
|
@@ -75,6 +71,7 @@
|
|
|
75
71
|
"tsconfig-paths": "^3.9.0",
|
|
76
72
|
"tslib": "^2.3.0"
|
|
77
73
|
},
|
|
74
|
+
"module": "fesm2015/nrwl-angular.mjs",
|
|
78
75
|
"es2020": "fesm2020/nrwl-angular.mjs",
|
|
79
76
|
"esm2020": "esm2020/nrwl-angular.mjs",
|
|
80
77
|
"fesm2020": "fesm2020/nrwl-angular.mjs",
|
|
@@ -80,7 +80,6 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
|
|
|
80
80
|
try {
|
|
81
81
|
devkit_1.logger.info('Writing package metadata');
|
|
82
82
|
const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
|
|
83
|
-
const { compilationMode } = entryPoint.data.tsConfig.options;
|
|
84
83
|
yield writePackageJson(ngEntryPoint, ngPackage, {
|
|
85
84
|
module: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
86
85
|
es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
@@ -88,7 +87,7 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
|
|
|
88
87
|
typings: relativeUnixFromDestPath(destinationFiles.declarations),
|
|
89
88
|
// webpack v4+ specific flag to enable advanced optimizations and code splitting
|
|
90
89
|
sideEffects: (_a = ngEntryPoint.packageJson.sideEffects) !== null && _a !== void 0 ? _a : false,
|
|
91
|
-
}, !!options.watch
|
|
90
|
+
}, !!options.watch);
|
|
92
91
|
}
|
|
93
92
|
catch (error) {
|
|
94
93
|
throw error;
|
|
@@ -112,7 +111,7 @@ exports.nxWritePackageTransform = nxWritePackageTransform;
|
|
|
112
111
|
* @param entryPoint An entry point of an Angular package / library
|
|
113
112
|
* @param additionalProperties Additional properties, e.g. binary artefacts (bundle files), to merge into `package.json`
|
|
114
113
|
*/
|
|
115
|
-
function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode
|
|
114
|
+
function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode) {
|
|
116
115
|
var _a, _b, _c;
|
|
117
116
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
118
117
|
// set additional properties
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,yCAAsC;AACtC,oDAAiD;AACjD,8DAAsE;AAEtE,2DAMyC;AAGzC,gDAA2E;AAC3E,oDAAsD;AACtD,oDAA2D;AAC3D,6BAA6B;
|
|
1
|
+
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":"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"}
|
package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export interface Result {
|
|
|
25
25
|
export declare class StylesheetProcessor {
|
|
26
26
|
private readonly basePath;
|
|
27
27
|
private readonly cssUrl?;
|
|
28
|
-
private readonly
|
|
28
|
+
private readonly includePaths?;
|
|
29
29
|
private readonly cacheDirectory?;
|
|
30
30
|
private readonly watch?;
|
|
31
31
|
private readonly tailwindConfig?;
|
|
@@ -33,8 +33,9 @@ export declare class StylesheetProcessor {
|
|
|
33
33
|
private targets;
|
|
34
34
|
private postCssProcessor;
|
|
35
35
|
private esbuild;
|
|
36
|
+
private styleIncludePaths;
|
|
36
37
|
private tailwindSetup;
|
|
37
|
-
constructor(basePath: string, cssUrl?: CssUrl,
|
|
38
|
+
constructor(basePath: string, cssUrl?: CssUrl, includePaths?: string[], cacheDirectory?: string | false, watch?: boolean, tailwindConfig?: string);
|
|
38
39
|
process({ filePath, content, }: {
|
|
39
40
|
filePath: string;
|
|
40
41
|
content: string;
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.StylesheetProcessor = exports.InlineStyleLanguage = exports.CssUrl = void 0;
|
|
13
13
|
const tslib_1 = require("tslib");
|
|
14
14
|
const browserslist = require("browserslist");
|
|
15
|
-
const find_parent_dir_1 = require("find-parent-dir");
|
|
16
15
|
const fs_1 = require("fs");
|
|
17
16
|
const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
|
|
18
17
|
const cache_1 = require("ng-packagr/lib/utils/cache");
|
|
@@ -35,12 +34,12 @@ var InlineStyleLanguage;
|
|
|
35
34
|
InlineStyleLanguage["less"] = "less";
|
|
36
35
|
})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
|
|
37
36
|
class StylesheetProcessor {
|
|
38
|
-
constructor(basePath, cssUrl,
|
|
37
|
+
constructor(basePath, cssUrl, includePaths, cacheDirectory, watch, tailwindConfig) {
|
|
39
38
|
// By default, browserslist defaults are too inclusive
|
|
40
39
|
// https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
|
|
41
40
|
this.basePath = basePath;
|
|
42
41
|
this.cssUrl = cssUrl;
|
|
43
|
-
this.
|
|
42
|
+
this.includePaths = includePaths;
|
|
44
43
|
this.cacheDirectory = cacheDirectory;
|
|
45
44
|
this.watch = watch;
|
|
46
45
|
this.tailwindConfig = tailwindConfig;
|
|
@@ -55,6 +54,17 @@ class StylesheetProcessor {
|
|
|
55
54
|
'last 2 iOS major versions',
|
|
56
55
|
'Firefox ESR',
|
|
57
56
|
];
|
|
57
|
+
this.styleIncludePaths = [...this.includePaths];
|
|
58
|
+
let prevDir = null;
|
|
59
|
+
let currentDir = this.basePath;
|
|
60
|
+
while (currentDir !== prevDir) {
|
|
61
|
+
const p = (0, path_1.join)(currentDir, 'node_modules');
|
|
62
|
+
if ((0, fs_1.existsSync)(p)) {
|
|
63
|
+
this.styleIncludePaths.push(p);
|
|
64
|
+
}
|
|
65
|
+
prevDir = currentDir;
|
|
66
|
+
currentDir = (0, path_1.dirname)(prevDir);
|
|
67
|
+
}
|
|
58
68
|
this.browserslistData = browserslist(undefined, { path: this.basePath });
|
|
59
69
|
this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
|
|
60
70
|
this.tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.basePath, this.tailwindConfig);
|
|
@@ -245,24 +255,9 @@ function customSassImporter(url, prev) {
|
|
|
245
255
|
if (url[0] !== '~') {
|
|
246
256
|
return undefined;
|
|
247
257
|
}
|
|
248
|
-
const result = resolveImport(url.substring(1), prev);
|
|
249
|
-
if (!result) {
|
|
250
|
-
return undefined;
|
|
251
|
-
}
|
|
252
258
|
return {
|
|
253
|
-
file:
|
|
259
|
+
file: url.substring(1),
|
|
254
260
|
prev,
|
|
255
261
|
};
|
|
256
262
|
}
|
|
257
|
-
function resolveImport(target, basePath) {
|
|
258
|
-
const root = (0, find_parent_dir_1.sync)(basePath, 'node_modules');
|
|
259
|
-
if (!root) {
|
|
260
|
-
return undefined;
|
|
261
|
-
}
|
|
262
|
-
const filePath = (0, path_1.resolve)(root, 'node_modules', target);
|
|
263
|
-
if ((0, fs_1.existsSync)(filePath) || (0, fs_1.existsSync)((0, path_1.dirname)(filePath))) {
|
|
264
|
-
return filePath;
|
|
265
|
-
}
|
|
266
|
-
return resolveImport(target, (0, path_1.dirname)(root));
|
|
267
|
-
}
|
|
268
263
|
//# sourceMappingURL=stylesheet-processor.js.map
|
package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;AAEH,6CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export interface Result {
|
|
|
25
25
|
export declare class StylesheetProcessor {
|
|
26
26
|
private readonly basePath;
|
|
27
27
|
private readonly cssUrl?;
|
|
28
|
-
private readonly
|
|
28
|
+
private readonly includePaths?;
|
|
29
29
|
private readonly cacheDirectory?;
|
|
30
30
|
private readonly watch?;
|
|
31
31
|
private readonly tailwindConfig?;
|
|
@@ -33,8 +33,9 @@ export declare class StylesheetProcessor {
|
|
|
33
33
|
private targets;
|
|
34
34
|
private postCssProcessor;
|
|
35
35
|
private esbuild;
|
|
36
|
+
private styleIncludePaths;
|
|
36
37
|
private tailwindSetup;
|
|
37
|
-
constructor(basePath: string, cssUrl?: CssUrl,
|
|
38
|
+
constructor(basePath: string, cssUrl?: CssUrl, includePaths?: string[], cacheDirectory?: string | false, watch?: boolean, tailwindConfig?: string);
|
|
38
39
|
process({ filePath, content, }: {
|
|
39
40
|
filePath: string;
|
|
40
41
|
content: string;
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.StylesheetProcessor = exports.InlineStyleLanguage = exports.CssUrl = void 0;
|
|
13
13
|
const tslib_1 = require("tslib");
|
|
14
14
|
const browserslist = require("browserslist");
|
|
15
|
-
const find_parent_dir_1 = require("find-parent-dir");
|
|
16
15
|
const fs_1 = require("fs");
|
|
17
16
|
const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
|
|
18
17
|
const cache_1 = require("ng-packagr/lib/utils/cache");
|
|
@@ -35,12 +34,12 @@ var InlineStyleLanguage;
|
|
|
35
34
|
InlineStyleLanguage["less"] = "less";
|
|
36
35
|
})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
|
|
37
36
|
class StylesheetProcessor {
|
|
38
|
-
constructor(basePath, cssUrl,
|
|
37
|
+
constructor(basePath, cssUrl, includePaths, cacheDirectory, watch, tailwindConfig) {
|
|
39
38
|
// By default, browserslist defaults are too inclusive
|
|
40
39
|
// https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
|
|
41
40
|
this.basePath = basePath;
|
|
42
41
|
this.cssUrl = cssUrl;
|
|
43
|
-
this.
|
|
42
|
+
this.includePaths = includePaths;
|
|
44
43
|
this.cacheDirectory = cacheDirectory;
|
|
45
44
|
this.watch = watch;
|
|
46
45
|
this.tailwindConfig = tailwindConfig;
|
|
@@ -55,6 +54,17 @@ class StylesheetProcessor {
|
|
|
55
54
|
'last 2 iOS major versions',
|
|
56
55
|
'Firefox ESR',
|
|
57
56
|
];
|
|
57
|
+
this.styleIncludePaths = [...this.includePaths];
|
|
58
|
+
let prevDir = null;
|
|
59
|
+
let currentDir = this.basePath;
|
|
60
|
+
while (currentDir !== prevDir) {
|
|
61
|
+
const p = (0, path_1.join)(currentDir, 'node_modules');
|
|
62
|
+
if ((0, fs_1.existsSync)(p)) {
|
|
63
|
+
this.styleIncludePaths.push(p);
|
|
64
|
+
}
|
|
65
|
+
prevDir = currentDir;
|
|
66
|
+
currentDir = (0, path_1.dirname)(prevDir);
|
|
67
|
+
}
|
|
58
68
|
this.browserslistData = browserslist(undefined, { path: this.basePath });
|
|
59
69
|
this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
|
|
60
70
|
this.tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.basePath, this.tailwindConfig);
|
|
@@ -245,24 +255,9 @@ function customSassImporter(url, prev) {
|
|
|
245
255
|
if (url[0] !== '~') {
|
|
246
256
|
return undefined;
|
|
247
257
|
}
|
|
248
|
-
const result = resolveImport(url.substring(1), prev);
|
|
249
|
-
if (!result) {
|
|
250
|
-
return undefined;
|
|
251
|
-
}
|
|
252
258
|
return {
|
|
253
|
-
file:
|
|
259
|
+
file: url.substring(1),
|
|
254
260
|
prev,
|
|
255
261
|
};
|
|
256
262
|
}
|
|
257
|
-
function resolveImport(target, basePath) {
|
|
258
|
-
const root = (0, find_parent_dir_1.sync)(basePath, 'node_modules');
|
|
259
|
-
if (!root) {
|
|
260
|
-
return undefined;
|
|
261
|
-
}
|
|
262
|
-
const filePath = (0, path_1.resolve)(root, 'node_modules', target);
|
|
263
|
-
if ((0, fs_1.existsSync)(filePath) || (0, fs_1.existsSync)((0, path_1.dirname)(filePath))) {
|
|
264
|
-
return filePath;
|
|
265
|
-
}
|
|
266
|
-
return resolveImport(target, (0, path_1.dirname)(root));
|
|
267
|
-
}
|
|
268
263
|
//# sourceMappingURL=stylesheet-processor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;AAEH,6CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,9 @@ function normalizeOptions(host, options) {
|
|
|
11
11
|
? `${(0, devkit_2.names)(options.directory).fileName}/${(0, devkit_2.names)(options.name).fileName}`
|
|
12
12
|
: (0, devkit_2.names)(options.name).fileName;
|
|
13
13
|
let e2eProjectName = `${(0, devkit_2.names)(options.name).fileName}-e2e`;
|
|
14
|
-
const appProjectName = appDirectory
|
|
14
|
+
const appProjectName = appDirectory
|
|
15
|
+
.replace(new RegExp('/', 'g'), '-')
|
|
16
|
+
.replace(/-\d+/g, '');
|
|
15
17
|
if (options.e2eTestRunner !== 'cypress') {
|
|
16
18
|
e2eProjectName = `${appProjectName}-e2e`;
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AAIvD,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AAIvD,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY;SAChC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU,IACV;AACJ,CAAC;AAjDD,4CAiDC"}
|
|
File without changes
|
|
@@ -17,7 +17,9 @@ function normalizeOptions(host, schema) {
|
|
|
17
17
|
? `${(0, devkit_2.names)(options.directory).fileName}/${name}`
|
|
18
18
|
: name;
|
|
19
19
|
const { libsDir, npmScope, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
20
|
-
const projectName = projectDirectory
|
|
20
|
+
const projectName = projectDirectory
|
|
21
|
+
.replace(new RegExp('/', 'g'), '-')
|
|
22
|
+
.replace(/-\d+/g, '');
|
|
21
23
|
const fileName = options.simpleModuleName ? name : projectName;
|
|
22
24
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
23
25
|
const moduleName = `${(0, devkit_2.names)(fileName).className}Module`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc;QACd,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,IACjC,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc;QACd,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,IACjC,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB;SACjC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAEhE,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU,IACV;AACJ,CAAC;AA1DD,4CA0DC"}
|
|
@@ -6,7 +6,7 @@ function updateNgPackage(host, options) {
|
|
|
6
6
|
if (!(options.publishable || options.buildable)) {
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
|
-
const dest =
|
|
9
|
+
const dest = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory);
|
|
10
10
|
(0, devkit_1.updateJson)(host, `${options.projectRoot}/ng-package.json`, (json) => {
|
|
11
11
|
let $schema = json.$schema;
|
|
12
12
|
if (json.$schema && json.$schema.indexOf('node_modules') >= 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAC5B,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAClE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7D,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,EAAE,CAAC;SACL;QACD,uCACK,IAAI,KACP,IAAI;YACJ,OAAO,IACP;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,0CA0BC"}
|
|
@@ -95,7 +95,7 @@ function fixProjectWorkspaceConfig(host, options) {
|
|
|
95
95
|
fixedProject.targets.build = Object.assign({ executor: options.publishable
|
|
96
96
|
? '@nrwl/angular:package'
|
|
97
97
|
: '@nrwl/angular:ng-packagr-lite', outputs: [
|
|
98
|
-
|
|
98
|
+
(0, devkit_1.joinPathFragments)('dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory),
|
|
99
99
|
] }, rest);
|
|
100
100
|
}
|
|
101
101
|
delete fixedProject.targets.test;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ function updateRootConfig(host, options) {
|
|
|
11
11
|
throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
12
12
|
}
|
|
13
13
|
c.paths[options.importPath] = [
|
|
14
|
-
|
|
14
|
+
(0, devkit_1.joinPathFragments)((0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory, '/src/index.ts'),
|
|
15
15
|
];
|
|
16
16
|
return json;
|
|
17
17
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,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;AACL,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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createScam = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
+
const typescript_1 = require("typescript");
|
|
7
|
+
function createScam(tree, schema) {
|
|
8
|
+
var _a, _b, _c;
|
|
9
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
10
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
11
|
+
const componentNames = (0, devkit_1.names)(schema.name);
|
|
12
|
+
const typeNames = (0, devkit_1.names)((_b = schema.type) !== null && _b !== void 0 ? _b : 'component');
|
|
13
|
+
const componentFileName = `${componentNames.fileName}.${(_c = schema.type) !== null && _c !== void 0 ? _c : 'component'}`;
|
|
14
|
+
let componentDirectory = schema.flat
|
|
15
|
+
? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib')
|
|
16
|
+
: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib', componentNames.fileName);
|
|
17
|
+
if (schema.path) {
|
|
18
|
+
componentDirectory = schema.flat
|
|
19
|
+
? (0, devkit_1.normalizePath)(schema.path)
|
|
20
|
+
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
21
|
+
}
|
|
22
|
+
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
23
|
+
if (!tree.exists(componentFilePath)) {
|
|
24
|
+
throw new Error(`Couldn't find component at path ${componentFilePath} to add SCAM setup.`);
|
|
25
|
+
}
|
|
26
|
+
if (schema.inlineScam) {
|
|
27
|
+
const currentComponentContents = tree.read(componentFilePath, 'utf-8');
|
|
28
|
+
let source = (0, typescript_1.createSourceFile)(componentFilePath, currentComponentContents, typescript_1.ScriptTarget.Latest, true);
|
|
29
|
+
source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'NgModule', '@angular/core');
|
|
30
|
+
source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'CommonModule', '@angular/common');
|
|
31
|
+
let updatedComponentSource = source.getText();
|
|
32
|
+
updatedComponentSource = `${updatedComponentSource}${createAngularComponentModule(`${componentNames.className}${typeNames.className}`)}`;
|
|
33
|
+
tree.write(componentFilePath, updatedComponentSource);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
tree.write((0, devkit_1.joinPathFragments)(componentDirectory, `${componentNames.fileName}.module.ts`), createSeparateAngularComponentModuleFile(`${componentNames.className}${typeNames.className}`, componentFileName));
|
|
37
|
+
}
|
|
38
|
+
exports.createScam = createScam;
|
|
39
|
+
function createAngularComponentModule(name) {
|
|
40
|
+
return `
|
|
41
|
+
@NgModule({
|
|
42
|
+
imports: [CommonModule],
|
|
43
|
+
declarations: [${name}],
|
|
44
|
+
exports: [${name}],
|
|
45
|
+
})
|
|
46
|
+
export class ${name}Module {}`;
|
|
47
|
+
}
|
|
48
|
+
function createSeparateAngularComponentModuleFile(name, componentFileName) {
|
|
49
|
+
return `import { NgModule } from '@angular/core';
|
|
50
|
+
import { CommonModule } from '@angular/common';
|
|
51
|
+
import { ${name} } from './${componentFileName}.ts';
|
|
52
|
+
${createAngularComponentModule(name)}`;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=create-module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/create-module.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|