@nrwl/angular 14.1.0-beta.1 → 14.1.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/package.json +7 -7
- package/src/generators/application/lib/normalize-options.js +3 -3
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/normalize-options.js +5 -4
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/utils/project.d.ts +1 -0
- package/src/generators/utils/project.js +13 -4
- package/src/generators/utils/project.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.1",
|
|
4
4
|
"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, Karma, 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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,12 +65,12 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~13.3.0",
|
|
68
|
-
"@nrwl/cypress": "14.1.
|
|
69
|
-
"@nrwl/devkit": "14.1.
|
|
70
|
-
"@nrwl/jest": "14.1.
|
|
71
|
-
"@nrwl/linter": "14.1.
|
|
72
|
-
"@nrwl/storybook": "14.1.
|
|
73
|
-
"@nrwl/workspace": "14.1.
|
|
68
|
+
"@nrwl/cypress": "14.1.1",
|
|
69
|
+
"@nrwl/devkit": "14.1.1",
|
|
70
|
+
"@nrwl/jest": "14.1.1",
|
|
71
|
+
"@nrwl/linter": "14.1.1",
|
|
72
|
+
"@nrwl/storybook": "14.1.1",
|
|
73
|
+
"@nrwl/workspace": "14.1.1",
|
|
74
74
|
"@schematics/angular": "~13.3.0",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
76
|
"chalk": "4.1.0",
|
|
@@ -6,7 +6,7 @@ const devkit_2 = require("@nrwl/devkit");
|
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const project_1 = require("../../utils/project");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
var _a
|
|
9
|
+
var _a;
|
|
10
10
|
const { appsDir, npmScope, standaloneAsDefault } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
11
11
|
const appDirectory = (0, project_1.normalizeDirectory)(options.name, options.directory);
|
|
12
12
|
let e2eProjectName = `${(0, devkit_2.names)(options.name).fileName}-e2e`;
|
|
@@ -19,7 +19,7 @@ function normalizeOptions(host, options) {
|
|
|
19
19
|
const parsedTags = options.tags
|
|
20
20
|
? options.tags.split(',').map((s) => s.trim())
|
|
21
21
|
: [];
|
|
22
|
-
const
|
|
22
|
+
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
23
23
|
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
24
24
|
// Determine the roots where @schematics/angular will place the projects
|
|
25
25
|
// This might not be where the projects actually end up
|
|
@@ -35,7 +35,7 @@ function normalizeOptions(host, options) {
|
|
|
35
35
|
? `${newProjectRoot}/${e2eProjectName}`
|
|
36
36
|
: `${appProjectName}/e2e`;
|
|
37
37
|
// Set defaults and then overwrite with user options
|
|
38
|
-
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix
|
|
38
|
+
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix, name: appProjectName, appProjectRoot,
|
|
39
39
|
e2eProjectRoot,
|
|
40
40
|
e2eProjectName,
|
|
41
41
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AAEzD,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AAEzD,yCAAsC;AACtC,iDAI6B;AAE7B,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,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7E,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,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,cAAc,CAAC;IACnB,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE5B,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,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA7DD,4CA6DC"}
|
|
@@ -4,8 +4,9 @@ exports.normalizeOptions = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const devkit_2 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
|
+
const project_1 = require("../../utils/project");
|
|
7
8
|
function normalizeOptions(host, schema) {
|
|
8
|
-
var _a, _b, _c, _d, _e
|
|
9
|
+
var _a, _b, _c, _d, _e;
|
|
9
10
|
// Create a schema with populated default values
|
|
10
11
|
const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */,
|
|
11
12
|
// Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
|
|
@@ -27,9 +28,9 @@ function normalizeOptions(host, schema) {
|
|
|
27
28
|
? options.tags.split(',').map((s) => s.trim())
|
|
28
29
|
: [];
|
|
29
30
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
30
|
-
const
|
|
31
|
+
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
31
32
|
options.standaloneConfig = (_c = options.standaloneConfig) !== null && _c !== void 0 ? _c : standaloneAsDefault;
|
|
32
|
-
const importPath = options.importPath || `@${
|
|
33
|
+
const importPath = options.importPath || `@${npmScope}/${projectDirectory}`;
|
|
33
34
|
// Determine the roots where @schematics/angular will place the projects
|
|
34
35
|
// This might not be where the projects actually end up
|
|
35
36
|
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
@@ -40,7 +41,7 @@ function normalizeOptions(host, schema) {
|
|
|
40
41
|
const ngCliSchematicLibRoot = newProjectRoot
|
|
41
42
|
? `${newProjectRoot}/${projectName}`
|
|
42
43
|
: projectName;
|
|
43
|
-
return Object.assign(Object.assign({}, options), { linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, unitTestRunner: (_e = options.unitTestRunner) !== null && _e !== void 0 ? _e : "jest" /* Jest */, prefix
|
|
44
|
+
return Object.assign(Object.assign({}, options), { linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, unitTestRunner: (_e = options.unitTestRunner) !== null && _e !== void 0 ? _e : "jest" /* Jest */, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
44
45
|
projectDirectory,
|
|
45
46
|
modulePath,
|
|
46
47
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,yCAAqC;AACrC,yCAAsC;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export declare function normalizeDirectory(appName: string, directoryName: string): string;
|
|
2
2
|
export declare function normalizeProjectName(appName: string, directoryName: string): string;
|
|
3
|
+
export declare function normalizePrefix(prefix: string | undefined, npmScope: string | undefined): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeProjectName = exports.normalizeDirectory = void 0;
|
|
3
|
+
exports.normalizePrefix = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function normalizeDirectory(appName, directoryName) {
|
|
6
6
|
return directoryName
|
|
@@ -9,9 +9,18 @@ function normalizeDirectory(appName, directoryName) {
|
|
|
9
9
|
}
|
|
10
10
|
exports.normalizeDirectory = normalizeDirectory;
|
|
11
11
|
function normalizeProjectName(appName, directoryName) {
|
|
12
|
-
return normalizeDirectory(appName, directoryName)
|
|
13
|
-
.replace(new RegExp('/', 'g'), '-')
|
|
14
|
-
.replace(/-\d+/g, '');
|
|
12
|
+
return normalizeDirectory(appName, directoryName).replace(/\//g, '-');
|
|
15
13
|
}
|
|
16
14
|
exports.normalizeProjectName = normalizeProjectName;
|
|
15
|
+
function normalizePrefix(prefix, npmScope) {
|
|
16
|
+
if (prefix) {
|
|
17
|
+
return prefix;
|
|
18
|
+
}
|
|
19
|
+
// Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
|
|
20
|
+
// to it and let it fall through to the Angular schematic to handle it
|
|
21
|
+
// https://github.com/angular/angular-cli/blob/1c634cd327e5a850553b258aa2d5e6a6b2c75c65/packages/schematics/angular/component/index.ts#L130
|
|
22
|
+
const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
|
|
23
|
+
return npmScope && htmlSelectorRegex.test(npmScope) ? npmScope : undefined;
|
|
24
|
+
}
|
|
25
|
+
exports.normalizePrefix = normalizePrefix;
|
|
17
26
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,CAChC,OAAe,EACf,aAAqB;IAErB,OAAO,aAAa;QAClB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QAC/D,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;AAC9B,CAAC;AAPD,gDAOC;AAED,SAAgB,oBAAoB,CAClC,OAAe,EACf,aAAqB;IAErB,OAAO,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,MAA0B,EAC1B,QAA4B;IAE5B,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IAED,yFAAyF;IACzF,sEAAsE;IACtE,2IAA2I;IAC3I,MAAM,iBAAiB,GACrB,oDAAoD,CAAC;IACvD,OAAO,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAdD,0CAcC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '14.1.
|
|
4
|
+
exports.nxVersion = '14.1.1';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|