@nrwl/angular 15.9.0-beta.0 → 15.9.0-beta.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 +2 -0
- package/generators.js +2 -0
- package/generators.js.map +1 -1
- package/generators.json +12 -0
- package/package.json +9 -9
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +12 -15
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +26 -5
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.js +26 -5
- package/src/generators/application/lib/nrwl-home-tpl.js.map +1 -1
- package/src/generators/component/component.js +3 -19
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/normalize-options.js +3 -24
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/component/schema.d.ts +1 -2
- package/src/generators/component/schema.json +3 -0
- package/src/generators/component-cypress-spec/schema.json +3 -0
- package/src/generators/component-test/schema.json +3 -0
- package/src/generators/cypress-component-configuration/schema.json +3 -0
- package/src/generators/directive/directive.d.ts +4 -0
- package/src/generators/directive/directive.js +51 -0
- package/src/generators/directive/directive.js.map +1 -0
- package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.spec.ts__tpl__ +8 -0
- package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.ts__tpl__ +11 -0
- package/src/generators/directive/schema.d.ts +14 -0
- package/src/generators/directive/schema.json +92 -0
- package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.spec.ts__tpl__ +8 -0
- package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.ts__tpl__ +13 -0
- package/src/generators/pipe/pipe.d.ts +4 -0
- package/src/generators/pipe/pipe.js +45 -0
- package/src/generators/pipe/pipe.js.map +1 -0
- package/src/generators/pipe/schema.d.ts +12 -0
- package/src/generators/pipe/schema.json +73 -0
- package/src/generators/scam/lib/normalize-options.js +4 -6
- package/src/generators/scam/lib/normalize-options.js.map +1 -1
- package/src/generators/scam/scam.js +1 -3
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/scam/schema.d.ts +1 -2
- package/src/generators/scam/schema.json +3 -0
- package/src/generators/scam-directive/lib/normalize-options.js +4 -6
- package/src/generators/scam-directive/lib/normalize-options.js.map +1 -1
- package/src/generators/scam-directive/scam-directive.js +1 -3
- package/src/generators/scam-directive/scam-directive.js.map +1 -1
- package/src/generators/scam-directive/schema.d.ts +1 -2
- package/src/generators/scam-directive/schema.json +3 -0
- package/src/generators/scam-pipe/lib/normalize-options.js +4 -6
- package/src/generators/scam-pipe/lib/normalize-options.js.map +1 -1
- package/src/generators/scam-pipe/scam-pipe.js +1 -3
- package/src/generators/scam-pipe/scam-pipe.js.map +1 -1
- package/src/generators/scam-pipe/schema.d.ts +1 -2
- package/src/generators/scam-pipe/schema.json +3 -0
- package/src/generators/storybook-configuration/schema.json +2 -1
- package/src/generators/utils/file-info.d.ts +1 -1
- package/src/generators/utils/file-info.js +3 -4
- package/src/generators/utils/file-info.js.map +1 -1
- package/src/generators/utils/find-module.d.ts +4 -0
- package/src/generators/utils/find-module.js +59 -0
- package/src/generators/utils/find-module.js.map +1 -0
- package/src/generators/utils/index.d.ts +1 -0
- package/src/generators/utils/index.js +1 -0
- package/src/generators/utils/index.js.map +1 -1
- package/src/generators/utils/insert-ngmodule-import.d.ts +1 -2
- package/src/generators/utils/insert-ngmodule-import.js +42 -21
- package/src/generators/utils/insert-ngmodule-import.js.map +1 -1
- package/src/generators/utils/path.d.ts +2 -0
- package/src/generators/utils/path.js +16 -1
- package/src/generators/utils/path.js.map +1 -1
- package/src/generators/utils/testing.js +5 -0
- package/src/generators/utils/testing.js.map +1 -1
- package/src/generators/web-worker/schema.json +3 -0
- package/src/utils/mf/utils.js +8 -0
- package/src/utils/mf/utils.js.map +1 -1
package/generators.d.ts
CHANGED
|
@@ -4,12 +4,14 @@ export * from './src/generators/component-cypress-spec/component-cypress-spec';
|
|
|
4
4
|
export * from './src/generators/component-story/component-story';
|
|
5
5
|
export * from './src/generators/component/component';
|
|
6
6
|
export * from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
|
|
7
|
+
export * from './src/generators/directive/directive';
|
|
7
8
|
export * from './src/generators/host/host';
|
|
8
9
|
export * from './src/generators/init/init';
|
|
9
10
|
export * from './src/generators/library-secondary-entry-point/library-secondary-entry-point';
|
|
10
11
|
export * from './src/generators/library/library';
|
|
11
12
|
export * from './src/generators/move/move';
|
|
12
13
|
export * from './src/generators/ngrx/ngrx';
|
|
14
|
+
export * from './src/generators/pipe/pipe';
|
|
13
15
|
export * from './src/generators/remote/remote';
|
|
14
16
|
export * from './src/generators/scam-directive/scam-directive';
|
|
15
17
|
export * from './src/generators/scam-pipe/scam-pipe';
|
package/generators.js
CHANGED
|
@@ -7,12 +7,14 @@ tslib_1.__exportStar(require("./src/generators/component-cypress-spec/component-
|
|
|
7
7
|
tslib_1.__exportStar(require("./src/generators/component-story/component-story"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./src/generators/component/component"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint"), exports);
|
|
10
|
+
tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);
|
|
10
11
|
tslib_1.__exportStar(require("./src/generators/host/host"), exports);
|
|
11
12
|
tslib_1.__exportStar(require("./src/generators/init/init"), exports);
|
|
12
13
|
tslib_1.__exportStar(require("./src/generators/library-secondary-entry-point/library-secondary-entry-point"), exports);
|
|
13
14
|
tslib_1.__exportStar(require("./src/generators/library/library"), exports);
|
|
14
15
|
tslib_1.__exportStar(require("./src/generators/move/move"), exports);
|
|
15
16
|
tslib_1.__exportStar(require("./src/generators/ngrx/ngrx"), exports);
|
|
17
|
+
tslib_1.__exportStar(require("./src/generators/pipe/pipe"), exports);
|
|
16
18
|
tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
|
|
17
19
|
tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);
|
|
18
20
|
tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,qEAA2C;AAC3C,qEAA2C;AAC3C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,+EAAqD;AACrD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,+EAAqD;AACrD,qEAA2C;AAC3C,qEAA2C;AAC3C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,+EAAqD;AACrD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}
|
package/generators.json
CHANGED
|
@@ -195,6 +195,12 @@
|
|
|
195
195
|
"schema": "./src/generators/convert-tslint-to-eslint/schema.json",
|
|
196
196
|
"description": "Converts a project from TSLint to ESLint."
|
|
197
197
|
},
|
|
198
|
+
"directive": {
|
|
199
|
+
"factory": "./src/generators/directive/directive",
|
|
200
|
+
"schema": "./src/generators/directive/schema.json",
|
|
201
|
+
"aliases": ["d"],
|
|
202
|
+
"description": "Generate an Angular directive."
|
|
203
|
+
},
|
|
198
204
|
"init": {
|
|
199
205
|
"factory": "./src/generators/init/init",
|
|
200
206
|
"schema": "./src/generators/init/schema.json",
|
|
@@ -248,6 +254,12 @@
|
|
|
248
254
|
"schema": "./src/generators/ngrx/schema.json",
|
|
249
255
|
"description": "Adds NgRx support to an application or library."
|
|
250
256
|
},
|
|
257
|
+
"pipe": {
|
|
258
|
+
"factory": "./src/generators/pipe/pipe",
|
|
259
|
+
"schema": "./src/generators/pipe/schema.json",
|
|
260
|
+
"description": "Generate an Angular Pipe",
|
|
261
|
+
"aliases": ["p"]
|
|
262
|
+
},
|
|
251
263
|
"scam-to-standalone": {
|
|
252
264
|
"factory": "./src/generators/scam-to-standalone/scam-to-standalone",
|
|
253
265
|
"schema": "./src/generators/scam-to-standalone/schema.json",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.9.0-beta.
|
|
3
|
+
"version": "15.9.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.9.0-beta.
|
|
67
|
-
"@nrwl/devkit": "15.9.0-beta.
|
|
68
|
-
"@nrwl/jest": "15.9.0-beta.
|
|
69
|
-
"@nrwl/js": "15.9.0-beta.
|
|
70
|
-
"@nrwl/linter": "15.9.0-beta.
|
|
71
|
-
"@nrwl/webpack": "15.9.0-beta.
|
|
72
|
-
"@nrwl/workspace": "15.9.0-beta.
|
|
66
|
+
"@nrwl/cypress": "15.9.0-beta.1",
|
|
67
|
+
"@nrwl/devkit": "15.9.0-beta.1",
|
|
68
|
+
"@nrwl/jest": "15.9.0-beta.1",
|
|
69
|
+
"@nrwl/js": "15.9.0-beta.1",
|
|
70
|
+
"@nrwl/linter": "15.9.0-beta.1",
|
|
71
|
+
"@nrwl/webpack": "15.9.0-beta.1",
|
|
72
|
+
"@nrwl/workspace": "15.9.0-beta.1",
|
|
73
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
74
74
|
"chalk": "^4.1.0",
|
|
75
75
|
"chokidar": "^3.5.1",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
109
109
|
"typings": "index.d.ts",
|
|
110
110
|
"sideEffects": false,
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "0ef06e4af7c17cf84717a2941f82f3e41e5c2c89"
|
|
112
112
|
}
|
|
@@ -14,38 +14,35 @@ const rxjs_1 = require("rxjs");
|
|
|
14
14
|
const operators_2 = require("rxjs/operators");
|
|
15
15
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
16
16
|
function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
17
|
-
var _a, _b, _c
|
|
17
|
+
var _a, _b, _c;
|
|
18
18
|
process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
|
|
19
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
20
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
|
|
21
21
|
const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
|
|
22
22
|
const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
|
|
23
|
-
const
|
|
23
|
+
const buildTargetOptions = Object.assign(Object.assign({}, buildTarget.options), (parsedBrowserTarget.configuration
|
|
24
24
|
? buildTarget.configurations[parsedBrowserTarget.configuration]
|
|
25
25
|
: buildTarget.defaultConfiguration
|
|
26
26
|
? buildTarget.configurations[buildTarget.defaultConfiguration]
|
|
27
|
-
:
|
|
28
|
-
const buildLibsFromSource = (
|
|
29
|
-
const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
|
|
27
|
+
: {}));
|
|
28
|
+
const buildLibsFromSource = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetOptions.buildLibsFromSource) !== null && _b !== void 0 ? _b : true;
|
|
30
29
|
let pathToWebpackConfig;
|
|
31
|
-
if (customWebpackConfig
|
|
32
|
-
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
|
|
30
|
+
if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path) {
|
|
31
|
+
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.customWebpackConfig.path);
|
|
33
32
|
if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
34
33
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
|
-
const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
|
|
38
36
|
let pathToIndexFileTransformer;
|
|
39
|
-
if (indexFileTransformer) {
|
|
40
|
-
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
|
|
37
|
+
if (buildTargetOptions.indexFileTransformer) {
|
|
38
|
+
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
|
|
41
39
|
if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
|
|
42
40
|
throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
let dependencies;
|
|
46
44
|
if (!buildLibsFromSource) {
|
|
47
|
-
const
|
|
48
|
-
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, {
|
|
45
|
+
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.buildTargetTsConfigPath, context, {
|
|
49
46
|
target: parsedBrowserTarget.target,
|
|
50
47
|
});
|
|
51
48
|
dependencies = foundDependencies;
|
|
@@ -65,7 +62,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
65
62
|
// otherwise the build will fail if customWebpack function/file is referencing
|
|
66
63
|
// local libs. This synchronize the behavior with webpack-browser and
|
|
67
64
|
// webpack-server implementation.
|
|
68
|
-
|
|
65
|
+
buildTargetOptions.tsConfig = tsConfigPath;
|
|
69
66
|
}
|
|
70
67
|
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
68
|
if (!buildLibsFromSource) {
|
|
@@ -83,10 +80,10 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
83
80
|
if (!pathToWebpackConfig) {
|
|
84
81
|
return baseWebpackConfig;
|
|
85
82
|
}
|
|
86
|
-
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig,
|
|
83
|
+
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
|
|
87
84
|
}) }, (pathToIndexFileTransformer
|
|
88
85
|
? {
|
|
89
|
-
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer,
|
|
86
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
|
|
90
87
|
}
|
|
91
88
|
: {})))));
|
|
92
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAG8B;AAC9B,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;AAC3C,wDAA8D;AAE9D,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAA2D;;IAE3D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,gCAAmB,GAAE,CAAC;IAErD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,IAAA,+BAAsB,GAAE,CACzB,CAAC;IACF,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -248,6 +248,7 @@ exports.nrwlHomeTemplate = {
|
|
|
248
248
|
}
|
|
249
249
|
.button-pill {
|
|
250
250
|
padding: 1.5rem 2rem;
|
|
251
|
+
margin-bottom: 2rem;
|
|
251
252
|
transition-duration: 300ms;
|
|
252
253
|
transition-property: background-color, border-color, color, fill, stroke,
|
|
253
254
|
opacity, box-shadow, transform, filter, backdrop-filter,
|
|
@@ -283,10 +284,10 @@ exports.nrwlHomeTemplate = {
|
|
|
283
284
|
.button-pill:hover {
|
|
284
285
|
color: rgba(255, 255, 255, 1) !important;
|
|
285
286
|
}
|
|
286
|
-
|
|
287
|
+
.nx-console:hover {
|
|
287
288
|
background-color: rgba(0, 122, 204, 1);
|
|
288
289
|
}
|
|
289
|
-
|
|
290
|
+
.nx-console svg {
|
|
290
291
|
color: rgba(0, 122, 204, 1);
|
|
291
292
|
}
|
|
292
293
|
|
|
@@ -639,7 +640,7 @@ exports.nrwlHomeTemplate = {
|
|
|
639
640
|
</a>
|
|
640
641
|
</div>
|
|
641
642
|
<div id="other-links">
|
|
642
|
-
<a
|
|
643
|
+
<a class="button-pill rounded shadow nx-console" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
|
|
643
644
|
<svg
|
|
644
645
|
fill="currentColor"
|
|
645
646
|
role="img"
|
|
@@ -652,8 +653,28 @@ exports.nrwlHomeTemplate = {
|
|
|
652
653
|
/>
|
|
653
654
|
</svg>
|
|
654
655
|
<span>
|
|
655
|
-
Install Nx Console
|
|
656
|
-
<span>
|
|
656
|
+
Install Nx Console for VSCode
|
|
657
|
+
<span>The official VSCode plugin for Nx.</span>
|
|
658
|
+
</span>
|
|
659
|
+
</a>
|
|
660
|
+
<a
|
|
661
|
+
class="button-pill rounded shadow nx-console"
|
|
662
|
+
href="https://plugins.jetbrains.com/plugin/21060-nx-console"
|
|
663
|
+
target="_blank"
|
|
664
|
+
rel="noreferrer"
|
|
665
|
+
>
|
|
666
|
+
<svg
|
|
667
|
+
fill="currentColor"
|
|
668
|
+
role="img"
|
|
669
|
+
viewBox="0 0 24 24"
|
|
670
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
671
|
+
>
|
|
672
|
+
<title>IntelliJ</title>
|
|
673
|
+
<path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z"></path>
|
|
674
|
+
</svg>
|
|
675
|
+
<span>
|
|
676
|
+
Install Nx Console for JetBrains
|
|
677
|
+
<span>Available for WebStorm, Intellij IDEA Ultimate and more!</span>
|
|
657
678
|
</span>
|
|
658
679
|
</a>
|
|
659
680
|
<div id="nx-cloud" class="rounded shadow">
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA8aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiYxB;CACF,CAAC"}
|
|
@@ -248,6 +248,7 @@ exports.nrwlHomeTemplate = {
|
|
|
248
248
|
}
|
|
249
249
|
.button-pill {
|
|
250
250
|
padding: 1.5rem 2rem;
|
|
251
|
+
margin-bottom: 2rem;
|
|
251
252
|
transition-duration: 300ms;
|
|
252
253
|
transition-property: background-color, border-color, color, fill, stroke,
|
|
253
254
|
opacity, box-shadow, transform, filter, backdrop-filter,
|
|
@@ -283,10 +284,10 @@ exports.nrwlHomeTemplate = {
|
|
|
283
284
|
.button-pill:hover {
|
|
284
285
|
color: rgba(255, 255, 255, 1) !important;
|
|
285
286
|
}
|
|
286
|
-
|
|
287
|
+
.nx-console:hover {
|
|
287
288
|
background-color: rgba(0, 122, 204, 1);
|
|
288
289
|
}
|
|
289
|
-
|
|
290
|
+
.nx-console svg {
|
|
290
291
|
color: rgba(0, 122, 204, 1);
|
|
291
292
|
}
|
|
292
293
|
|
|
@@ -639,7 +640,7 @@ exports.nrwlHomeTemplate = {
|
|
|
639
640
|
</a>
|
|
640
641
|
</div>
|
|
641
642
|
<div id="other-links">
|
|
642
|
-
<a
|
|
643
|
+
<a class="button-pill rounded shadow nx-console" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
|
|
643
644
|
<svg
|
|
644
645
|
fill="currentColor"
|
|
645
646
|
role="img"
|
|
@@ -652,8 +653,28 @@ exports.nrwlHomeTemplate = {
|
|
|
652
653
|
/>
|
|
653
654
|
</svg>
|
|
654
655
|
<span>
|
|
655
|
-
Install Nx Console
|
|
656
|
-
<span>
|
|
656
|
+
Install Nx Console for VSCode
|
|
657
|
+
<span>The official VSCode plugin for Nx.</span>
|
|
658
|
+
</span>
|
|
659
|
+
</a>
|
|
660
|
+
<a
|
|
661
|
+
class="button-pill rounded shadow nx-console"
|
|
662
|
+
href="https://plugins.jetbrains.com/plugin/21060-nx-console"
|
|
663
|
+
target="_blank"
|
|
664
|
+
rel="noreferrer"
|
|
665
|
+
>
|
|
666
|
+
<svg
|
|
667
|
+
fill="currentColor"
|
|
668
|
+
role="img"
|
|
669
|
+
viewBox="0 0 24 24"
|
|
670
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
671
|
+
>
|
|
672
|
+
<title>IntelliJ</title>
|
|
673
|
+
<path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z"></path>
|
|
674
|
+
</svg>
|
|
675
|
+
<span>
|
|
676
|
+
Install Nx Console for JetBrains
|
|
677
|
+
<span>Available for WebStorm, Intellij IDEA Ultimate and more!</span>
|
|
657
678
|
</span>
|
|
658
679
|
</a>
|
|
659
680
|
<div id="nx-cloud" class="rounded shadow">
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA8aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiYxB;CACF,CAAC"}
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.componentGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const semver_1 = require("semver");
|
|
6
7
|
const path_1 = require("../utils/path");
|
|
8
|
+
const version_utils_1 = require("../utils/version-utils");
|
|
7
9
|
const component_1 = require("./lib/component");
|
|
8
10
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
9
|
-
const version_utils_1 = require("../utils/version-utils");
|
|
10
|
-
const semver_1 = require("semver");
|
|
11
11
|
function componentGenerator(tree, rawOptions) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
13
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
@@ -18,7 +18,7 @@ function componentGenerator(tree, rawOptions) {
|
|
|
18
18
|
}
|
|
19
19
|
const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
20
20
|
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
21
|
-
checkPathUnderProjectRoot(tree, options);
|
|
21
|
+
(0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
|
|
22
22
|
const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
|
|
23
23
|
const angularComponentSchematic = wrapAngularDevkitSchematic('@schematics/angular', 'component');
|
|
24
24
|
yield angularComponentSchematic(tree, schematicOptions);
|
|
@@ -27,21 +27,5 @@ function componentGenerator(tree, rawOptions) {
|
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
exports.componentGenerator = componentGenerator;
|
|
30
|
-
function checkPathUnderProjectRoot(tree, schema) {
|
|
31
|
-
var _a;
|
|
32
|
-
if (!schema.path) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
|
|
36
|
-
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
37
|
-
let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
|
|
38
|
-
pathToComponent = pathToComponent.startsWith('/')
|
|
39
|
-
? pathToComponent.slice(1)
|
|
40
|
-
: pathToComponent;
|
|
41
|
-
if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
|
|
42
|
-
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
|
|
43
|
-
`Please make sure to provide a path that exists under the project root.`);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
30
|
exports.default = componentGenerator;
|
|
47
31
|
//# sourceMappingURL=component.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAAyD;AACzD,mCAA4B;AAC5B,wCAA0D;AAC1D,0DAAwE;AACxE,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IACE,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjD,UAAU,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/D,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -3,34 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
7
|
-
function findProjectFromOptions(options) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
|
-
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
-
// path can be undefined when running on the root of the workspace, we default to the root
|
|
12
|
-
// to handle standalone layouts
|
|
13
|
-
return (0, find_project_for_path_1.findProjectForPath)(options.path || '', projectRootMappings);
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
6
|
function normalizeOptions(tree, options) {
|
|
17
|
-
var _a
|
|
7
|
+
var _a;
|
|
18
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
const
|
|
20
|
-
if (!project) {
|
|
21
|
-
// path is hidden, so if not provided we don't suggest setting it
|
|
22
|
-
if (!options.path) {
|
|
23
|
-
throw new Error('No "project" was specified and "defaultProject" is not set in the workspace configuration. Please provide the "project" option and try again.');
|
|
24
|
-
}
|
|
25
|
-
// path was provided, so it's wrong and we should mention it
|
|
26
|
-
throw new Error('The provided "path" is wrong and no "project" was specified and "defaultProject" is not set in the workspace configuration. ' +
|
|
27
|
-
'Please provide a correct "path" or provide the "project" option instead and try again.');
|
|
28
|
-
}
|
|
29
|
-
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
9
|
+
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
30
10
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
31
|
-
const path = (
|
|
11
|
+
const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
32
12
|
return Object.assign(Object.assign({}, options), { path,
|
|
33
|
-
project,
|
|
34
13
|
projectSourceRoot });
|
|
35
14
|
});
|
|
36
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAA2E;AAG3E,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,iBAAiB,IACjB;;CACH;AArBD,4CAqBC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export interface Schema {
|
|
2
2
|
name: string;
|
|
3
|
+
project: string;
|
|
3
4
|
path?: string;
|
|
4
|
-
project?: string;
|
|
5
5
|
displayBlock?: boolean;
|
|
6
6
|
inlineStyle?: boolean;
|
|
7
7
|
inlineTemplate?: boolean;
|
|
@@ -21,6 +21,5 @@ export interface Schema {
|
|
|
21
21
|
|
|
22
22
|
export interface NormalizedSchema extends Schema {
|
|
23
23
|
path: string;
|
|
24
|
-
project: string;
|
|
25
24
|
projectSourceRoot: string;
|
|
26
25
|
}
|
|
@@ -8,6 +8,9 @@
|
|
|
8
8
|
"project": {
|
|
9
9
|
"type": "string",
|
|
10
10
|
"description": "The name of the project where the component is located.",
|
|
11
|
+
"$default": {
|
|
12
|
+
"$source": "projectName"
|
|
13
|
+
},
|
|
11
14
|
"x-dropdown": "projects",
|
|
12
15
|
"x-prompt": "What project is the component located in?",
|
|
13
16
|
"x-priority": "important"
|
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
"project": {
|
|
10
10
|
"type": "string",
|
|
11
11
|
"description": "The name of the project to add cypress component testing configuration to",
|
|
12
|
+
"$default": {
|
|
13
|
+
"$source": "projectName"
|
|
14
|
+
},
|
|
12
15
|
"x-dropdown": "projects",
|
|
13
16
|
"x-prompt": "What project should we add Cypress component testing to?",
|
|
14
17
|
"x-priority": "important"
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.directiveGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const path_1 = require("../utils/path");
|
|
7
|
+
const utils_1 = require("../utils");
|
|
8
|
+
let tsModule;
|
|
9
|
+
function directiveGenerator(tree, schema) {
|
|
10
|
+
var _a, _b, _c;
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
13
|
+
if (!projects.has(schema.project)) {
|
|
14
|
+
throw new Error(`Project "${schema.project}" does not exist!`);
|
|
15
|
+
}
|
|
16
|
+
(0, path_1.checkPathUnderProjectRoot)(tree, schema.project, schema.path);
|
|
17
|
+
const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
18
|
+
const path = (_a = schema.path) !== null && _a !== void 0 ? _a : `${project.sourceRoot}`;
|
|
19
|
+
const directiveNames = (0, devkit_1.names)(schema.name);
|
|
20
|
+
const selector = (_b = schema.selector) !== null && _b !== void 0 ? _b : buildSelector(tree, schema.name, (_c = schema.prefix) !== null && _c !== void 0 ? _c : project.prefix);
|
|
21
|
+
const pathToGenerateFiles = schema.flat
|
|
22
|
+
? './files/__directiveFileName__'
|
|
23
|
+
: './files';
|
|
24
|
+
yield (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, pathToGenerateFiles), path, {
|
|
25
|
+
selector,
|
|
26
|
+
directiveClassName: directiveNames.className,
|
|
27
|
+
directiveFileName: directiveNames.fileName,
|
|
28
|
+
standalone: schema.standalone,
|
|
29
|
+
tpl: '',
|
|
30
|
+
});
|
|
31
|
+
if (schema.skipTests) {
|
|
32
|
+
const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!schema.flat ? `${directiveNames.fileName}/` : ``}${directiveNames.fileName}.directive.spec.ts`);
|
|
33
|
+
tree.delete(pathToSpecFile);
|
|
34
|
+
}
|
|
35
|
+
if (!schema.skipImport && !schema.standalone) {
|
|
36
|
+
const modulePath = (0, utils_1.findModule)(tree, path, schema.module);
|
|
37
|
+
(0, utils_1.addToNgModule)(tree, path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', schema.flat, schema.export);
|
|
38
|
+
}
|
|
39
|
+
if (!schema.skipFormat) {
|
|
40
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
exports.directiveGenerator = directiveGenerator;
|
|
45
|
+
function buildSelector(tree, name, prefix) {
|
|
46
|
+
let selector = (0, devkit_1.names)(name).fileName;
|
|
47
|
+
const selectorPrefix = (0, devkit_1.names)(prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readNxJson)(tree).npmScope).fileName;
|
|
48
|
+
return (0, devkit_1.names)(`${selectorPrefix}-${selector}`).propertyName;
|
|
49
|
+
}
|
|
50
|
+
exports.default = directiveGenerator;
|
|
51
|
+
//# sourceMappingURL=directive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/directive/directive.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { <%= directiveClassName %>Directive } from './<%= directiveFileName %>.directive';
|
|
2
|
+
|
|
3
|
+
describe('<%= directiveClassName %>Directive', () => {
|
|
4
|
+
it('should create an instance', () => {
|
|
5
|
+
const directive = new <%= directiveClassName %>Directive();
|
|
6
|
+
expect(directive).toBeTruthy();
|
|
7
|
+
});
|
|
8
|
+
});
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface Schema {
|
|
2
|
+
name: string;
|
|
3
|
+
project: string;
|
|
4
|
+
path?: string;
|
|
5
|
+
prefix?: string;
|
|
6
|
+
skipTests?: boolean;
|
|
7
|
+
skipImport?: boolean;
|
|
8
|
+
selector?: string;
|
|
9
|
+
standalone?: boolean;
|
|
10
|
+
flat?: boolean;
|
|
11
|
+
module?: string;
|
|
12
|
+
export?: boolean;
|
|
13
|
+
skipFormat?: boolean;
|
|
14
|
+
}
|