@nrwl/angular 15.9.2 → 15.9.4
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 +20 -0
- package/migrations.json +2 -2
- package/package.json +10 -10
- package/plugins/component-testing.d.ts +10 -2
- package/plugins/component-testing.js +98 -56
- package/plugins/component-testing.js.map +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +7 -0
- package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/schema.json +1 -1
- package/src/generators/component/lib/module.js +1 -1
- package/src/generators/component/lib/module.js.map +1 -1
- package/src/generators/directive/directive.js +14 -27
- package/src/generators/directive/directive.js.map +1 -1
- package/src/generators/directive/lib/index.d.ts +2 -0
- package/src/generators/directive/lib/index.js +6 -0
- package/src/generators/directive/lib/index.js.map +1 -0
- package/src/generators/directive/lib/normalize-options.d.ts +18 -0
- package/src/generators/directive/lib/normalize-options.js +26 -0
- package/src/generators/directive/lib/normalize-options.js.map +1 -0
- package/src/generators/directive/lib/validate-options.d.ts +3 -0
- package/src/generators/directive/lib/validate-options.js +21 -0
- package/src/generators/directive/lib/validate-options.js.map +1 -0
- package/src/generators/directive/schema.json +1 -1
- package/src/generators/host/host.js +2 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.json +1 -1
- package/src/generators/init/init.js +5 -0
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.json +1 -1
- package/src/generators/karma/angular-v14/files/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma/angular-v14/karma.d.ts +4 -0
- package/src/generators/karma/angular-v14/karma.js +58 -0
- package/src/generators/karma/angular-v14/karma.js.map +1 -0
- package/src/generators/karma/angular-v14/schema.d.ts +3 -0
- package/src/generators/karma/compat.d.ts +2 -0
- package/src/generators/karma/compat.js +6 -0
- package/src/generators/karma/compat.js.map +1 -0
- package/src/generators/karma/files/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma/karma.d.ts +4 -0
- package/src/generators/karma/karma.js +69 -0
- package/src/generators/karma/karma.js.map +1 -0
- package/src/generators/karma/schema.d.ts +3 -0
- package/src/generators/karma/schema.json +24 -0
- package/src/generators/karma-project/compat.d.ts +2 -0
- package/src/generators/karma-project/compat.js +6 -0
- package/src/generators/karma-project/compat.js.map +1 -0
- package/src/generators/karma-project/files/common/karma.conf.js__tmpl__ +16 -0
- package/src/generators/karma-project/files/common/tsconfig.spec.json +8 -0
- package/src/generators/karma-project/files/root-project/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +28 -0
- package/src/generators/karma-project/karma-project.d.ts +4 -0
- package/src/generators/karma-project/karma-project.js +26 -0
- package/src/generators/karma-project/karma-project.js.map +1 -0
- package/src/generators/karma-project/lib/check-test-target.d.ts +2 -0
- package/src/generators/karma-project/lib/check-test-target.js +12 -0
- package/src/generators/karma-project/lib/check-test-target.js.map +1 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.d.ts +2 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js +55 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -0
- package/src/generators/karma-project/lib/update-tsconfig.d.ts +2 -0
- package/src/generators/karma-project/lib/update-tsconfig.js +37 -0
- package/src/generators/karma-project/lib/update-tsconfig.js.map +1 -0
- package/src/generators/karma-project/lib/update-workspace-config.d.ts +2 -0
- package/src/generators/karma-project/lib/update-workspace-config.js +32 -0
- package/src/generators/karma-project/lib/update-workspace-config.js.map +1 -0
- package/src/generators/karma-project/lib/v14-test-file.d.ts +3 -0
- package/src/generators/karma-project/lib/v14-test-file.js +29 -0
- package/src/generators/karma-project/lib/v14-test-file.js.map +1 -0
- package/src/generators/karma-project/schema.d.ts +5 -0
- package/src/generators/karma-project/schema.json +31 -0
- package/src/generators/library/files/base/tsconfig.lib.json__tpl__ +1 -1
- package/src/generators/library/lib/create-files.js +1 -2
- package/src/generators/library/lib/create-files.js.map +1 -1
- package/src/generators/library/library.js +7 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +2 -1
- package/src/generators/remote/remote.js +2 -1
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +1 -1
- package/src/generators/setup-mf/lib/update-host-app-routes.js +6 -2
- package/src/generators/setup-mf/lib/update-host-app-routes.js.map +1 -1
- package/src/generators/utils/names.d.ts +5 -0
- package/src/generators/utils/names.js +12 -0
- package/src/generators/utils/names.js.map +1 -0
- package/src/migrations/update-15-7-0/install-required-packages.js +1 -1
- package/src/migrations/update-15-7-0/install-required-packages.js.map +1 -1
- package/src/utils/backward-compatible-versions.js +9 -0
- package/src/utils/backward-compatible-versions.js.map +1 -1
- package/src/utils/mf/utils.js +2 -2
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/test-runners.d.ts +1 -0
- package/src/utils/test-runners.js +1 -0
- package/src/utils/test-runners.js.map +1 -1
- package/src/utils/versions.d.ts +9 -0
- package/src/utils/versions.js +10 -1
- package/src/utils/versions.js.map +1 -1
- package/tailwind.js +3 -2
- package/tailwind.js.map +1 -1
package/generators.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export * from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslin
|
|
|
7
7
|
export * from './src/generators/directive/directive';
|
|
8
8
|
export * from './src/generators/host/host';
|
|
9
9
|
export * from './src/generators/init/init';
|
|
10
|
+
export * from './src/generators/karma-project/karma-project';
|
|
11
|
+
export * from './src/generators/karma/karma';
|
|
10
12
|
export * from './src/generators/library-secondary-entry-point/library-secondary-entry-point';
|
|
11
13
|
export * from './src/generators/library/library';
|
|
12
14
|
export * from './src/generators/move/move';
|
package/generators.js
CHANGED
|
@@ -10,6 +10,8 @@ tslib_1.__exportStar(require("./src/generators/convert-tslint-to-eslint/convert-
|
|
|
10
10
|
tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);
|
|
11
11
|
tslib_1.__exportStar(require("./src/generators/host/host"), exports);
|
|
12
12
|
tslib_1.__exportStar(require("./src/generators/init/init"), exports);
|
|
13
|
+
tslib_1.__exportStar(require("./src/generators/karma-project/karma-project"), exports);
|
|
14
|
+
tslib_1.__exportStar(require("./src/generators/karma/karma"), exports);
|
|
13
15
|
tslib_1.__exportStar(require("./src/generators/library-secondary-entry-point/library-secondary-entry-point"), exports);
|
|
14
16
|
tslib_1.__exportStar(require("./src/generators/library/library"), exports);
|
|
15
17
|
tslib_1.__exportStar(require("./src/generators/move/move"), 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,+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"}
|
|
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,uFAA6D;AAC7D,uEAA6C;AAC7C,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
|
@@ -50,6 +50,16 @@
|
|
|
50
50
|
"description": "Initializes the `@nrwl/angular` plugin.",
|
|
51
51
|
"hidden": true
|
|
52
52
|
},
|
|
53
|
+
"karma": {
|
|
54
|
+
"factory": "./src/generators/karma/compat",
|
|
55
|
+
"schema": "./src/generators/karma/schema.json",
|
|
56
|
+
"description": "Adds Karma configuration to a workspace."
|
|
57
|
+
},
|
|
58
|
+
"karma-project": {
|
|
59
|
+
"factory": "./src/generators/karma-project/compat",
|
|
60
|
+
"schema": "./src/generators/karma-project/schema.json",
|
|
61
|
+
"description": "Adds Karma configuration to a project."
|
|
62
|
+
},
|
|
53
63
|
"library": {
|
|
54
64
|
"factory": "./src/generators/library/library.compat#librarySchematic",
|
|
55
65
|
"schema": "./src/generators/library/schema.json",
|
|
@@ -207,6 +217,16 @@
|
|
|
207
217
|
"description": "Initializes the `@nrwl/angular` plugin.",
|
|
208
218
|
"hidden": true
|
|
209
219
|
},
|
|
220
|
+
"karma": {
|
|
221
|
+
"factory": "./src/generators/karma/karma",
|
|
222
|
+
"schema": "./src/generators/karma/schema.json",
|
|
223
|
+
"description": "Adds Karma configuration to a workspace."
|
|
224
|
+
},
|
|
225
|
+
"karma-project": {
|
|
226
|
+
"factory": "./src/generators/karma-project/karma-project",
|
|
227
|
+
"schema": "./src/generators/karma-project/schema.json",
|
|
228
|
+
"description": "Adds Karma configuration to a project."
|
|
229
|
+
},
|
|
210
230
|
"library": {
|
|
211
231
|
"factory": "./src/generators/library/library",
|
|
212
232
|
"schema": "./src/generators/library/schema.json",
|
package/migrations.json
CHANGED
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
"factory": "./src/migrations/update-15-2-0/update-workspace-config"
|
|
122
122
|
},
|
|
123
123
|
"update-platform-server-exports": {
|
|
124
|
-
"cli": "
|
|
124
|
+
"cli": "nx",
|
|
125
125
|
"version": "15.2.0-beta.0",
|
|
126
126
|
"requires": {
|
|
127
127
|
"@angular/core": ">=15.0.0"
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"factory": "./src/migrations/update-15-2-0/remove-platform-server-exports"
|
|
131
131
|
},
|
|
132
132
|
"update-karma-main-file": {
|
|
133
|
-
"cli": "
|
|
133
|
+
"cli": "nx",
|
|
134
134
|
"version": "15.2.0-beta.0",
|
|
135
135
|
"requires": {
|
|
136
136
|
"@angular/core": ">=15.0.0"
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.9.
|
|
3
|
+
"version": "15.9.4",
|
|
4
4
|
"private": false,
|
|
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, and
|
|
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 Karma. \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": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/nrwl/nx.git",
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.9.
|
|
67
|
-
"@nrwl/devkit": "15.9.
|
|
68
|
-
"@nrwl/jest": "15.9.
|
|
69
|
-
"@nrwl/js": "15.9.
|
|
70
|
-
"@nrwl/linter": "15.9.
|
|
71
|
-
"@nrwl/webpack": "15.9.
|
|
72
|
-
"@nrwl/workspace": "15.9.
|
|
66
|
+
"@nrwl/cypress": "15.9.4",
|
|
67
|
+
"@nrwl/devkit": "15.9.4",
|
|
68
|
+
"@nrwl/jest": "15.9.4",
|
|
69
|
+
"@nrwl/js": "15.9.4",
|
|
70
|
+
"@nrwl/linter": "15.9.4",
|
|
71
|
+
"@nrwl/webpack": "15.9.4",
|
|
72
|
+
"@nrwl/workspace": "15.9.4",
|
|
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": "06c3e5c9e15882b67d255fe6cf22da747f93747f"
|
|
112
112
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
|
|
2
|
-
import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/schema';
|
|
3
2
|
/**
|
|
4
3
|
* Angular nx preset for Cypress Component Testing
|
|
5
4
|
*
|
|
@@ -20,12 +19,21 @@ import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/schem
|
|
|
20
19
|
*/
|
|
21
20
|
export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
|
|
22
21
|
specPattern: string[];
|
|
22
|
+
indexHtmlFile: string;
|
|
23
23
|
devServer: {
|
|
24
24
|
options: {
|
|
25
25
|
projectConfig: {
|
|
26
26
|
root: string;
|
|
27
27
|
sourceRoot: string;
|
|
28
|
-
buildOptions:
|
|
28
|
+
buildOptions: import("@angular-devkit/build-angular").BrowserBuilderOptions & {
|
|
29
|
+
customWebpackConfig?: {
|
|
30
|
+
path: string;
|
|
31
|
+
};
|
|
32
|
+
indexFileTransformer?: string;
|
|
33
|
+
buildLibsFromSource?: boolean;
|
|
34
|
+
} & {
|
|
35
|
+
workspaceRoot: string;
|
|
36
|
+
};
|
|
29
37
|
};
|
|
30
38
|
};
|
|
31
39
|
framework: "angular";
|
|
@@ -6,6 +6,7 @@ const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
+
const semver_1 = require("semver");
|
|
9
10
|
/**
|
|
10
11
|
* Angular nx preset for Cypress Component Testing
|
|
11
12
|
*
|
|
@@ -47,16 +48,21 @@ ${e.stack ? e.stack : e}`);
|
|
|
47
48
|
Project Name? ${buildTarget.project}
|
|
48
49
|
Has project config? ${!!((_d = (_c = graph.nodes) === null || _c === void 0 ? void 0 : _c[buildTarget.project]) === null || _d === void 0 ? void 0 : _d.data)}`);
|
|
49
50
|
}
|
|
50
|
-
const fromWorkspaceRoot = (0, path_1.relative)(
|
|
51
|
+
const fromWorkspaceRoot = (0, path_1.relative)(ctContext.root, pathToConfig);
|
|
51
52
|
const normalizedFromWorkspaceRootPath = (0, fs_1.lstatSync)(pathToConfig).isFile()
|
|
52
53
|
? (0, path_1.dirname)(fromWorkspaceRoot)
|
|
53
54
|
: fromWorkspaceRoot;
|
|
54
|
-
const offset = (
|
|
55
|
+
const offset = isOffsetNeeded(ctContext, ctProjectConfig)
|
|
56
|
+
? (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath)
|
|
57
|
+
: undefined;
|
|
55
58
|
const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, (_e = graph.nodes[buildTarget.project]) === null || _e === void 0 ? void 0 : _e.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
|
|
56
59
|
const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
|
|
57
60
|
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), {
|
|
58
61
|
// NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
|
|
59
|
-
specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'],
|
|
62
|
+
specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'],
|
|
63
|
+
// cypress defaults to a relative path from the workspaceRoot instead of projectRoot
|
|
64
|
+
// set as absolute path in case this changes internally to cypress, this path isn't OS dependent
|
|
65
|
+
indexHtmlFile: (0, devkit_1.joinPathFragments)(ctContext.root, ctProjectConfig.root, 'cypress', 'support', 'component-index.html'), devServer: Object.assign(Object.assign({}, {
|
|
60
66
|
framework: 'angular',
|
|
61
67
|
bundler: 'webpack',
|
|
62
68
|
}), { options: {
|
|
@@ -93,60 +99,67 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
|
|
|
93
99
|
configuration: buildContext.configurationName,
|
|
94
100
|
}, buildContext);
|
|
95
101
|
const buildOptions = withSchemaDefaults(options);
|
|
96
|
-
// polyfill entries might be local files or files that are resolved from node_modules
|
|
97
|
-
// like zone.js.
|
|
98
|
-
// prevents error from webpack saying can't find <offset>/zone.js.
|
|
99
|
-
const handlePolyfillPath = (polyfill) => {
|
|
100
|
-
const maybeFullPath = (0, path_1.join)(devkit_1.workspaceRoot, polyfill.split('/').join(path_1.sep));
|
|
101
|
-
if ((0, fs_1.existsSync)(maybeFullPath)) {
|
|
102
|
-
return (0, devkit_1.joinPathFragments)(offset, polyfill);
|
|
103
|
-
}
|
|
104
|
-
return polyfill;
|
|
105
|
-
};
|
|
106
|
-
// paths need to be unix paths for angular devkit
|
|
107
|
-
buildOptions.polyfills =
|
|
108
|
-
Array.isArray(buildOptions.polyfills) && buildOptions.polyfills.length > 0
|
|
109
|
-
? buildOptions.polyfills.map((p) => handlePolyfillPath(p))
|
|
110
|
-
: handlePolyfillPath(buildOptions.polyfills);
|
|
111
|
-
buildOptions.main = (0, devkit_1.joinPathFragments)(offset, buildOptions.main);
|
|
112
|
-
buildOptions.index =
|
|
113
|
-
typeof buildOptions.index === 'string'
|
|
114
|
-
? (0, devkit_1.joinPathFragments)(offset, buildOptions.index)
|
|
115
|
-
: Object.assign(Object.assign({}, buildOptions.index), { input: (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input) });
|
|
116
102
|
// cypress creates a tsconfig if one isn't preset
|
|
117
103
|
// that contains all the support required for angular and component tests
|
|
118
104
|
delete buildOptions.tsConfig;
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
105
|
+
if (offset) {
|
|
106
|
+
// polyfill entries might be local files or files that are resolved from node_modules
|
|
107
|
+
// like zone.js.
|
|
108
|
+
// prevents error from webpack saying can't find <offset>/zone.js.
|
|
109
|
+
const handlePolyfillPath = (polyfill) => {
|
|
110
|
+
const maybeFullPath = (0, path_1.join)(ctContext.root, polyfill.split('/').join(path_1.sep));
|
|
111
|
+
if ((0, fs_1.existsSync)(maybeFullPath)) {
|
|
112
|
+
return (0, devkit_1.joinPathFragments)(offset, polyfill);
|
|
113
|
+
}
|
|
114
|
+
return polyfill;
|
|
115
|
+
};
|
|
116
|
+
// paths need to be unix paths for angular devkit
|
|
117
|
+
if (buildOptions.polyfills) {
|
|
118
|
+
buildOptions.polyfills =
|
|
119
|
+
Array.isArray(buildOptions.polyfills) &&
|
|
120
|
+
buildOptions.polyfills.length > 0
|
|
121
|
+
? buildOptions.polyfills.map((p) => handlePolyfillPath(p))
|
|
122
|
+
: handlePolyfillPath(buildOptions.polyfills);
|
|
123
|
+
}
|
|
124
|
+
buildOptions.main = (0, devkit_1.joinPathFragments)(offset, buildOptions.main);
|
|
125
|
+
buildOptions.index =
|
|
126
|
+
typeof buildOptions.index === 'string'
|
|
127
|
+
? (0, devkit_1.joinPathFragments)(offset, buildOptions.index)
|
|
128
|
+
: Object.assign(Object.assign({}, buildOptions.index), { input: (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input) });
|
|
129
|
+
buildOptions.fileReplacements = buildOptions.fileReplacements.map((fr) => {
|
|
130
|
+
fr.replace = (0, devkit_1.joinPathFragments)(offset, fr.replace);
|
|
131
|
+
fr.with = (0, devkit_1.joinPathFragments)(offset, fr.with);
|
|
132
|
+
return fr;
|
|
133
|
+
});
|
|
134
|
+
}
|
|
124
135
|
// if the ct project isn't being used in the build project
|
|
125
136
|
// then we don't want to have the assets/scripts/styles be included to
|
|
126
137
|
// prevent inclusion of unintended stuff like tailwind
|
|
127
138
|
if (buildContext.projectName === ctContext.projectName ||
|
|
128
139
|
(0, ct_helpers_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
buildOptions.stylePreprocessorOptions
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
140
|
+
if (offset) {
|
|
141
|
+
buildOptions.assets = buildOptions.assets.map((asset) => {
|
|
142
|
+
return typeof asset === 'string'
|
|
143
|
+
? (0, devkit_1.joinPathFragments)(offset, asset)
|
|
144
|
+
: Object.assign(Object.assign({}, asset), { input: (0, devkit_1.joinPathFragments)(offset, asset.input) });
|
|
145
|
+
});
|
|
146
|
+
buildOptions.styles = buildOptions.styles.map((style) => {
|
|
147
|
+
return typeof style === 'string'
|
|
148
|
+
? (0, devkit_1.joinPathFragments)(offset, style)
|
|
149
|
+
: Object.assign(Object.assign({}, style), { input: (0, devkit_1.joinPathFragments)(offset, style.input) });
|
|
150
|
+
});
|
|
151
|
+
buildOptions.scripts = buildOptions.scripts.map((script) => {
|
|
152
|
+
return typeof script === 'string'
|
|
153
|
+
? (0, devkit_1.joinPathFragments)(offset, script)
|
|
154
|
+
: Object.assign(Object.assign({}, script), { input: (0, devkit_1.joinPathFragments)(offset, script.input) });
|
|
155
|
+
});
|
|
156
|
+
if (((_a = buildOptions.stylePreprocessorOptions) === null || _a === void 0 ? void 0 : _a.includePaths.length) > 0) {
|
|
157
|
+
buildOptions.stylePreprocessorOptions = {
|
|
158
|
+
includePaths: buildOptions.stylePreprocessorOptions.includePaths.map((path) => {
|
|
159
|
+
return (0, devkit_1.joinPathFragments)(offset, path);
|
|
160
|
+
}),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
150
163
|
}
|
|
151
164
|
}
|
|
152
165
|
else {
|
|
@@ -164,9 +177,13 @@ Note: this may fail, setting the correct 'sourceRoot' for ${buildContext.project
|
|
|
164
177
|
config.sourceRoot = (0, devkit_1.joinPathFragments)(config.root, 'src');
|
|
165
178
|
}
|
|
166
179
|
return {
|
|
167
|
-
root: (0, devkit_1.joinPathFragments)(offset, config.root),
|
|
168
|
-
sourceRoot:
|
|
169
|
-
|
|
180
|
+
root: offset ? (0, devkit_1.joinPathFragments)(offset, config.root) : config.root,
|
|
181
|
+
sourceRoot: offset
|
|
182
|
+
? (0, devkit_1.joinPathFragments)(offset, config.sourceRoot)
|
|
183
|
+
: config.sourceRoot,
|
|
184
|
+
buildOptions: Object.assign(Object.assign({}, buildOptions), {
|
|
185
|
+
// this property is only valid for cy v12.9.0+
|
|
186
|
+
workspaceRoot: offset ? undefined : ctContext.root }),
|
|
170
187
|
};
|
|
171
188
|
}
|
|
172
189
|
function withSchemaDefaults(options) {
|
|
@@ -209,11 +226,10 @@ function getTempStylesForTailwind(ctExecutorContext) {
|
|
|
209
226
|
const ctProjectConfig = (_a = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName]) === null || _a === void 0 ? void 0 : _a.data;
|
|
210
227
|
// angular only supports `tailwind.config.{js,cjs}`
|
|
211
228
|
const ctProjectTailwindConfig = (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tailwind.config');
|
|
212
|
-
const
|
|
213
|
-
|
|
229
|
+
const exts = ['js', 'cjs'];
|
|
230
|
+
const isTailWindInCtProject = exts.some((ext) => (0, fs_1.existsSync)(`${ctProjectTailwindConfig}.${ext}`));
|
|
214
231
|
const rootTailwindPath = (0, path_1.join)(ctExecutorContext.root, 'tailwind.config');
|
|
215
|
-
const isTailWindInRoot = (0, fs_1.existsSync)(rootTailwindPath
|
|
216
|
-
(0, fs_1.existsSync)(rootTailwindPath + '.cjs');
|
|
232
|
+
const isTailWindInRoot = exts.some((ext) => (0, fs_1.existsSync)(`${rootTailwindPath}.${ext}`));
|
|
217
233
|
if (isTailWindInRoot || isTailWindInCtProject) {
|
|
218
234
|
const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
|
|
219
235
|
try {
|
|
@@ -232,4 +248,30 @@ function getTempStylesForTailwind(ctExecutorContext) {
|
|
|
232
248
|
}
|
|
233
249
|
}
|
|
234
250
|
}
|
|
251
|
+
function isOffsetNeeded(ctExecutorContext, ctProjectConfig) {
|
|
252
|
+
try {
|
|
253
|
+
const { version = null } = require('cypress/package.json');
|
|
254
|
+
const supportsWorkspaceRoot = !!version && (0, semver_1.gte)(version, '12.9.0');
|
|
255
|
+
// if using cypress <v12.9.0 then we require the offset
|
|
256
|
+
if (!supportsWorkspaceRoot) {
|
|
257
|
+
return true;
|
|
258
|
+
}
|
|
259
|
+
if (ctProjectConfig.projectType === 'library' &&
|
|
260
|
+
// angular will only see this config if the library root is the build project config root
|
|
261
|
+
// otherwise it will be set to the buildTarget root which is the app root where this config doesn't exist
|
|
262
|
+
// causing tailwind styles from the libs project root to not work
|
|
263
|
+
['js', 'cjs'].some((ext) => (0, fs_1.existsSync)((0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, `tailwind.config.${ext}`)))) {
|
|
264
|
+
return true;
|
|
265
|
+
}
|
|
266
|
+
return false;
|
|
267
|
+
}
|
|
268
|
+
catch (e) {
|
|
269
|
+
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
270
|
+
devkit_1.logger.error(e);
|
|
271
|
+
}
|
|
272
|
+
// unable to determine if we don't require an offset
|
|
273
|
+
// safest to assume we do
|
|
274
|
+
return true;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
235
277
|
//# sourceMappingURL=component-testing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":";;;AAAA,yEAG8C;AAC9C,mEAK4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.addUnitTestRunner = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const jest_1 = require("@nrwl/jest");
|
|
6
6
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
7
|
+
const karma_project_1 = require("../../karma-project/karma-project");
|
|
7
8
|
function addUnitTestRunner(host, options) {
|
|
8
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
10
|
if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
|
|
@@ -16,6 +17,12 @@ function addUnitTestRunner(host, options) {
|
|
|
16
17
|
skipFormat: true,
|
|
17
18
|
});
|
|
18
19
|
}
|
|
20
|
+
else if (options.unitTestRunner === test_runners_1.UnitTestRunner.Karma) {
|
|
21
|
+
yield (0, karma_project_1.default)(host, {
|
|
22
|
+
project: options.name,
|
|
23
|
+
skipFormat: true,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
19
26
|
});
|
|
20
27
|
}
|
|
21
28
|
exports.addUnitTestRunner = addUnitTestRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;
|
|
1
|
+
{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAC7D,qEAAsE;AAEtE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,KAAK,EAAE;YAC1D,MAAM,IAAA,uBAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAhBD,8CAgBC"}
|
|
@@ -55,7 +55,7 @@ function findModule(tree, generateDir, projectRoot) {
|
|
|
55
55
|
return filteredMatches[0];
|
|
56
56
|
}
|
|
57
57
|
else if (filteredMatches.length > 1) {
|
|
58
|
-
|
|
58
|
+
throw new Error("Found more than one candidate module to add the component to. Please specify which module the component should be added to by using the '--module' option.");
|
|
59
59
|
}
|
|
60
60
|
dir = (0, path_1.dirname)(dir);
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,49 +3,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.directiveGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("../utils/path");
|
|
7
6
|
const utils_1 = require("../utils");
|
|
8
|
-
|
|
7
|
+
const lib_1 = require("./lib");
|
|
9
8
|
function directiveGenerator(tree, schema) {
|
|
10
|
-
var _a, _b, _c;
|
|
11
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
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
|
|
10
|
+
(0, lib_1.validateOptions)(tree, schema);
|
|
11
|
+
const options = (0, lib_1.normalizeOptions)(tree, schema);
|
|
12
|
+
const directiveNames = (0, devkit_1.names)(options.name);
|
|
13
|
+
const pathToGenerateFiles = options.flat
|
|
22
14
|
? './files/__directiveFileName__'
|
|
23
15
|
: './files';
|
|
24
|
-
|
|
25
|
-
selector,
|
|
16
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, pathToGenerateFiles), options.path, {
|
|
17
|
+
selector: options.selector,
|
|
26
18
|
directiveClassName: directiveNames.className,
|
|
27
19
|
directiveFileName: directiveNames.fileName,
|
|
28
|
-
standalone:
|
|
20
|
+
standalone: options.standalone,
|
|
29
21
|
tpl: '',
|
|
30
22
|
});
|
|
31
|
-
if (
|
|
32
|
-
const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!
|
|
23
|
+
if (options.skipTests) {
|
|
24
|
+
const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.path, `${!options.flat ? `${directiveNames.fileName}/` : ``}${directiveNames.fileName}.directive.spec.ts`);
|
|
33
25
|
tree.delete(pathToSpecFile);
|
|
34
26
|
}
|
|
35
|
-
if (!
|
|
36
|
-
const modulePath = (0, utils_1.findModule)(tree, path,
|
|
37
|
-
(0, utils_1.addToNgModule)(tree, path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations',
|
|
27
|
+
if (!options.skipImport && !options.standalone) {
|
|
28
|
+
const modulePath = (0, utils_1.findModule)(tree, options.path, options.module);
|
|
29
|
+
(0, utils_1.addToNgModule)(tree, options.path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', options.flat, options.export);
|
|
38
30
|
}
|
|
39
|
-
if (!
|
|
31
|
+
if (!options.skipFormat) {
|
|
40
32
|
yield (0, devkit_1.formatFiles)(tree);
|
|
41
33
|
}
|
|
42
34
|
});
|
|
43
35
|
}
|
|
44
36
|
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
37
|
exports.default = directiveGenerator;
|
|
51
38
|
//# sourceMappingURL=directive.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/directive/directive.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/directive/directive.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,oCAAqD;AACrD,+BAA0D;AAG1D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAc;;QACjE,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI;YACtC,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,SAAS,CAAC;QACd,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,mBAAmB,CAAC,EACjD,OAAO,CAAC,IAAI,EACZ;YACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,kBAAkB,EAAE,cAAc,CAAC,SAAS;YAC5C,iBAAiB,EAAE,cAAc,CAAC,QAAQ;YAC1C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG,EAAE,EAAE;SACR,CACF,CAAC;QAEF,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GACnD,cAAc,CAAC,QACjB,oBAAoB,CACrB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC9C,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAClE,IAAA,qBAAa,EACX,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,cAAc,CAAC,QAAQ,EACvB,GAAG,cAAc,CAAC,SAAS,WAAW,EACtC,GAAG,cAAc,CAAC,QAAQ,YAAY,EACtC,cAAc,EACd,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,CACf,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAnDD,gDAmDC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./normalize-options"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./validate-options"), exports);
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/directive/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,6DAAmC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Schema } from '../schema';
|
|
3
|
+
export declare function normalizeOptions(tree: Tree, options: Schema): {
|
|
4
|
+
name: string;
|
|
5
|
+
path: string;
|
|
6
|
+
projectRoot: string;
|
|
7
|
+
projectSourceRoot: string;
|
|
8
|
+
selector: string;
|
|
9
|
+
project: string;
|
|
10
|
+
prefix?: string;
|
|
11
|
+
skipTests?: boolean;
|
|
12
|
+
skipImport?: boolean;
|
|
13
|
+
standalone?: boolean;
|
|
14
|
+
flat?: boolean;
|
|
15
|
+
module?: string;
|
|
16
|
+
export?: boolean;
|
|
17
|
+
skipFormat?: boolean;
|
|
18
|
+
};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const names_1 = require("../../utils/names");
|
|
6
|
+
function normalizeOptions(tree, options) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
const { prefix, projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
9
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
10
|
+
const { name, path: namePath } = (0, names_1.parseName)(options.name);
|
|
11
|
+
const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib', namePath);
|
|
12
|
+
const selector = (_b = options.selector) !== null && _b !== void 0 ? _b : buildSelector(tree, name, options.prefix, prefix);
|
|
13
|
+
return Object.assign(Object.assign({}, options), { name,
|
|
14
|
+
path, projectRoot: root, projectSourceRoot,
|
|
15
|
+
selector });
|
|
16
|
+
}
|
|
17
|
+
exports.normalizeOptions = normalizeOptions;
|
|
18
|
+
function buildSelector(tree, name, prefix, projectPrefix) {
|
|
19
|
+
let selector = name;
|
|
20
|
+
prefix !== null && prefix !== void 0 ? prefix : (prefix = projectPrefix !== null && projectPrefix !== void 0 ? projectPrefix : (0, devkit_1.readNxJson)(tree).npmScope);
|
|
21
|
+
if (prefix) {
|
|
22
|
+
selector = `${prefix}-${selector}`;
|
|
23
|
+
}
|
|
24
|
+
return (0, devkit_1.names)(selector).propertyName;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=normalize-options.js.map
|