@nrwl/angular 13.3.1-beta.1 → 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.json
CHANGED
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
"scam": {
|
|
114
114
|
"factory": "./src/generators/scam/scam.compat",
|
|
115
115
|
"schema": "./src/generators/scam/schema.json",
|
|
116
|
-
"description": "Generate a component with an accompanying Single Angular Module
|
|
116
|
+
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
117
117
|
},
|
|
118
118
|
|
|
119
119
|
"web-worker": {
|
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
"scam": {
|
|
208
208
|
"factory": "./src/generators/scam/scam",
|
|
209
209
|
"schema": "./src/generators/scam/schema.json",
|
|
210
|
-
"description": "Generate a component with an accompanying Single Angular Module
|
|
210
|
+
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
211
211
|
},
|
|
212
212
|
"stories": {
|
|
213
213
|
"factory": "./src/generators/stories/stories",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.3.1
|
|
3
|
+
"version": "13.3.1",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -55,11 +55,11 @@
|
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@angular-devkit/schematics": "~13.0.0",
|
|
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
|
|
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",
|
|
63
63
|
"@schematics/angular": "~13.0.0",
|
|
64
64
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
65
65
|
"ignore": "^5.0.4",
|
|
@@ -11,9 +11,14 @@ function createScam(tree, schema) {
|
|
|
11
11
|
const componentNames = (0, devkit_1.names)(schema.name);
|
|
12
12
|
const typeNames = (0, devkit_1.names)((_b = schema.type) !== null && _b !== void 0 ? _b : 'component');
|
|
13
13
|
const componentFileName = `${componentNames.fileName}.${(_c = schema.type) !== null && _c !== void 0 ? _c : 'component'}`;
|
|
14
|
-
|
|
14
|
+
let componentDirectory = schema.flat
|
|
15
15
|
? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib')
|
|
16
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
|
+
}
|
|
17
22
|
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
18
23
|
if (!tree.exists(componentFilePath)) {
|
|
19
24
|
throw new Error(`Couldn't find component at path ${componentFilePath} to add SCAM setup.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/create-module.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"create-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/create-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const create_module_1 = require("./lib/create-module");
|
|
8
|
+
const path_1 = require("path");
|
|
8
9
|
function scamGenerator(tree, schema) {
|
|
9
10
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
11
|
const { inlineScam } = schema, options = (0, tslib_1.__rest)(schema, ["inlineScam"]);
|
|
12
|
+
checkPathUnderProjectRoot(tree, options);
|
|
11
13
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
12
14
|
yield angularComponentSchematic(tree, Object.assign(Object.assign({}, options), { skipImport: true, export: false }));
|
|
13
15
|
(0, create_module_1.createScam)(tree, schema);
|
|
@@ -15,5 +17,20 @@ function scamGenerator(tree, schema) {
|
|
|
15
17
|
});
|
|
16
18
|
}
|
|
17
19
|
exports.scamGenerator = scamGenerator;
|
|
20
|
+
function checkPathUnderProjectRoot(tree, options) {
|
|
21
|
+
var _a;
|
|
22
|
+
if (!options.path) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
26
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
27
|
+
let pathToComponent = (0, devkit_1.normalizePath)(options.path);
|
|
28
|
+
pathToComponent = pathToComponent.startsWith('/')
|
|
29
|
+
? pathToComponent.slice(1)
|
|
30
|
+
: pathToComponent;
|
|
31
|
+
if (!pathToComponent.startsWith((0, path_1.normalize)(root))) {
|
|
32
|
+
throw new Error(`The path provided for the SCAM (${options.path}) does not exist under the project root (${root}).`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
18
35
|
exports.default = scamGenerator;
|
|
19
36
|
//# sourceMappingURL=scam.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AAEA,8DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AAEA,8DAAwE;AACxE,yCAKsB;AACtB,uDAAiD;AACjD,+BAAiC;AAEjC,SAAsB,aAAa,CAAC,IAAU,EAAE,MAAc;;QAC5D,MAAM,EAAE,UAAU,KAAiB,MAAM,EAAlB,OAAO,uBAAK,MAAM,EAAnC,cAA0B,CAAS,CAAC;QAE1C,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,IACb,CAAC;QAEH,IAAA,0BAAU,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlBD,sCAkBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACrE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,aAAa,CAAC"}
|
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.angularArchitectsModuleFederationPluginVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.3.1
|
|
4
|
+
exports.nxVersion = '13.3.1';
|
|
5
5
|
exports.angularVersion = '^13.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.0.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|