@nrwl/angular 13.3.0-rc.1 → 13.3.2
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 +2 -2
- package/package.json +6 -6
- package/src/generators/scam/lib/create-module.js +7 -2
- package/src/generators/scam/lib/create-module.js.map +1 -1
- package/src/generators/scam/scam.js +17 -0
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/stories/lib/component-info.js +15 -3
- package/src/generators/stories/lib/component-info.js.map +1 -1
- package/src/generators/stories/lib/module-info.js +9 -1
- package/src/generators/stories/lib/module-info.js.map +1 -1
- package/src/utils/versions.js +1 -1
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.
|
|
3
|
+
"version": "13.3.2",
|
|
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.
|
|
59
|
-
"@nrwl/devkit": "13.3.
|
|
60
|
-
"@nrwl/jest": "13.3.
|
|
61
|
-
"@nrwl/linter": "13.3.
|
|
62
|
-
"@nrwl/storybook": "13.3.
|
|
58
|
+
"@nrwl/cypress": "13.3.2",
|
|
59
|
+
"@nrwl/devkit": "13.3.2",
|
|
60
|
+
"@nrwl/jest": "13.3.2",
|
|
61
|
+
"@nrwl/linter": "13.3.2",
|
|
62
|
+
"@nrwl/storybook": "13.3.2",
|
|
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.`);
|
|
@@ -43,7 +48,7 @@ export class ${name}Module {}`;
|
|
|
43
48
|
function createSeparateAngularComponentModuleFile(name, componentFileName) {
|
|
44
49
|
return `import { NgModule } from '@angular/core';
|
|
45
50
|
import { CommonModule } from '@angular/common';
|
|
46
|
-
import { ${name} } from './${componentFileName}
|
|
51
|
+
import { ${name} } from './${componentFileName}';
|
|
47
52
|
${createAngularComponentModule(name)}`;
|
|
48
53
|
}
|
|
49
54
|
//# sourceMappingURL=create-module.js.map
|
|
@@ -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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getComponentsInfo = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
6
|
const path_1 = require("path");
|
|
6
7
|
const typescript_1 = require("typescript");
|
|
7
8
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
@@ -15,8 +16,7 @@ function getComponentsInfo(tree, moduleFilePaths, projectName) {
|
|
|
15
16
|
return undefined;
|
|
16
17
|
}
|
|
17
18
|
const imports = file.statements.filter((statement) => statement.kind === typescript_1.SyntaxKind.ImportDeclaration);
|
|
18
|
-
const
|
|
19
|
-
const componentsInfo = declaredComponents.map((componentName) => getComponentInfo(tree, imports, moduleFolderPath, componentName));
|
|
19
|
+
const componentsInfo = declaredComponents.map((componentName) => getComponentInfo(tree, file, imports, moduleFilePath, componentName));
|
|
20
20
|
return componentsInfo;
|
|
21
21
|
});
|
|
22
22
|
}
|
|
@@ -45,8 +45,20 @@ function getComponentImportPath(componentName, imports) {
|
|
|
45
45
|
.slice(1, -1);
|
|
46
46
|
return importPath;
|
|
47
47
|
}
|
|
48
|
-
function getComponentInfo(tree, imports,
|
|
48
|
+
function getComponentInfo(tree, sourceFile, imports, moduleFilePath, componentName) {
|
|
49
49
|
try {
|
|
50
|
+
const moduleFolderPath = (0, path_1.dirname)(moduleFilePath);
|
|
51
|
+
// try to get the component from the same file (inline scam)
|
|
52
|
+
const node = (0, tsquery_1.tsquery)(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${componentName}])`, { visitAllChildren: true })[0];
|
|
53
|
+
if (node) {
|
|
54
|
+
return {
|
|
55
|
+
componentFileName: (0, path_1.basename)(moduleFilePath, '.ts'),
|
|
56
|
+
moduleFolderPath,
|
|
57
|
+
name: componentName,
|
|
58
|
+
path: '.',
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
// try to get the component from the imports
|
|
50
62
|
const componentFilePathRelativeToModule = getComponentImportPath(componentName, imports);
|
|
51
63
|
const componentImportPath = getFullComponentFilePath(moduleFolderPath, componentFilePathRelativeToModule);
|
|
52
64
|
if (tree.exists(componentImportPath) && !tree.isFile(componentImportPath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":";;;AACA,yCAAyD;AACzD,+BAAyC;AAEzC,2CAAwC;AACxC,kEAAqE;AACrE,+CAA4D;AAC5D,qDAAiE;AASjE,SAAgB,iBAAiB,CAC/B,IAAU,EACV,eAAyB,EACzB,WAAmB;IAEnB,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,MAAM,kBAAkB,GAAG,IAAA,yCAA2B,EACpD,IAAI,EACJ,cAAc,EACd,WAAW,CACZ,CAAC;QACF,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CACpC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,uBAAU,CAAC,iBAAiB,CAC/D,CAAC;QAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getModuleFilePaths = exports.getModuleDeclaredComponents = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
7
|
+
const path_1 = require("path");
|
|
6
8
|
const typescript_2 = require("typescript");
|
|
7
9
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
10
|
function getModuleDeclaredComponents(file, moduleFilePath, projectName) {
|
|
@@ -21,13 +23,19 @@ exports.getModuleDeclaredComponents = getModuleDeclaredComponents;
|
|
|
21
23
|
function getModuleFilePaths(tree, projectPath) {
|
|
22
24
|
let moduleFilePaths = [];
|
|
23
25
|
(0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (filePath) => {
|
|
24
|
-
if (
|
|
26
|
+
if ((0, path_1.extname)(filePath) === '.ts' && hasNgModule(tree, filePath)) {
|
|
25
27
|
moduleFilePaths.push(filePath);
|
|
26
28
|
}
|
|
27
29
|
});
|
|
28
30
|
return moduleFilePaths;
|
|
29
31
|
}
|
|
30
32
|
exports.getModuleFilePaths = getModuleFilePaths;
|
|
33
|
+
function hasNgModule(tree, filePath) {
|
|
34
|
+
const fileContent = tree.read(filePath, 'utf-8');
|
|
35
|
+
const ast = tsquery_1.tsquery.ast(fileContent);
|
|
36
|
+
const ngModule = (0, tsquery_1.tsquery)(ast, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]', { visitAllChildren: true });
|
|
37
|
+
return ngModule.length > 0;
|
|
38
|
+
}
|
|
31
39
|
function getDeclaredComponentsInDeclarations(declarationsArray) {
|
|
32
40
|
return getDeclaredComponentNodes(declarationsArray)
|
|
33
41
|
.map((node) => node.getText())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAC1E,yEAAqE;
|
|
1
|
+
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAC1E,yEAAqE;AACrE,uDAAoD;AACpD,+BAA+B;AAO/B,2CAAwC;AACxC,kEAA0E;AAE1E,SAAgB,2BAA2B,CACzC,IAAgB,EAChB,cAAsB,EACtB,WAAmB;IAEnB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACrE,MAAM,8BAA8B,GAClC,yCAAyC,CACvC,iBAAiB,EACjB,cAAc,EACd,WAAW,CACZ,CAAC;IAEJ,IAAI,CAAC,8BAA8B,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,IAAI,EACJ,8BAA8B,EAC9B,cAAc,EACd,WAAW,CACZ,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,mCAAmC,CAAC,iBAAiB,CAAC,CAAC;AAChE,CAAC;AA7BD,kEA6BC;AAED,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAAmB;IAChE,IAAI,eAAe,GAAG,EAAc,CAAC;IAErC,IAAA,6BAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,QAAgB,EAAE,EAAE;QAC3D,IAAI,IAAA,cAAO,EAAC,QAAQ,CAAC,KAAK,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;YAC9D,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC;AAVD,gDAUC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,QAAgB;IAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAA,iBAAO,EACtB,GAAG,EACH,2EAA2E,EAC3E,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,mCAAmC,CAC1C,iBAAuB;IAEvB,OAAO,yBAAyB,CAAC,iBAAiB,CAAC;SAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;SAC7B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,yBAAyB,CAAC,iBAAuB;IACxD,MAAM,IAAI,GAAG,iBAAiB;SAC3B,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,CAAC;SACnD,WAAW,EAAE;SACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;QACD,sDAAsD;QACtD,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,aAAa,EAAE;YAC1C,MAAM,uBAAuB,GAAG,IAAI;iBACjC,WAAW,EAAE;iBACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,CAAC,CAAC;YAEvD,6DAA6D;YAC7D,MAAM,mBAAmB,GAAG,sBAAsB,CAChD,uBAAuB,CAAC,OAAO,EAAE,EACjC,uBAAuB,CAAC,aAAa,EAAE,CACxC,CAAC;YACF,IACE,mBAAmB;gBACnB,mBAAmB,CAAC,WAAW,CAAC,IAAI;oBAClC,uBAAU,CAAC,sBAAsB,EACnC;gBACA,MAAM,KAAK,GAAG,yBAAyB,CACrC,mBAAmB,CAAC,WAAW,CAChC,CAAC;gBACF,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE5B,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,OAAO,CAAC,GAAG;IAClB,IAAI,SAAS,GAAG,EAAE,CAAC;IAEnB,KAAK,MAAM,KAAK,IAAI,GAAG,EAAE;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;SACnC;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACvB;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAgB,EAChB,8BAAoC,EACpC,cAAsB,EACtB,WAAmB;IAEnB,IAAI,gBAAgB,GAAG,8BAA8B;SAClD,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,sBAAsB,CAAC,CAAC;IAEnE,IAAI,gBAAgB,EAAE;QACpB,OAAO,gBAAgB,CAAC;KACzB;IAED,sDAAsD;IACtD,gBAAgB,GAAG,uCAAuC,CACxD,IAAI,EACJ,8BAA8B,CAC/B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QACpB,OAAO,gBAAgB,CAAC;KACzB;IAED,+DAA+D;IAC/D,gBAAgB,GAAG,oCAAoC,CACrD,IAAI,EACJ,8BAA8B,CAC/B,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,eAAM,CAAC,IAAI,CACT,IAAA,qBAAY,EAAA,oDAAoD,cAAc,+JAA+J,WAAW,YAAY,CACrQ,CAAC;KACH;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,uCAAuC,CAC9C,IAAgB,EAChB,8BAAoC;IAEpC,IAAI,oBAAoB,GAAG,8BAA8B;SACtD,WAAW,EAAE;SACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,oBAAoB,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,mDAAmD;IACnD,IAAI,mBAAmB,GAAG,sBAAsB,CAC9C,oBAAoB,CAAC,OAAO,EAAE,EAC9B,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,gBAAgB,GAAG,mBAAmB;SACzC,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,sBAAsB,CAAC,CAAC;IAEnE,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACH,SAAS,oCAAoC,CAC3C,IAAgB,EAChB,8BAAoC;IAEpC,MAAM,wBAAwB,GAAG,8BAA8B;SAC5D,WAAW,EAAE;SACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1E,IAAI,CAAC,wBAAwB,EAAE;QAC7B,OAAO,SAAS,CAAC;KAClB;IAED,uDAAuD;IACvD,MAAM,CAAC,KAAK,EAAE,kBAAkB,CAAC,GAAG,wBAAwB;SACzD,WAAW,EAAE;SACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,CAAC,KAAK,IAAI,CAAC,kBAAkB,EAAE;QACjC,OAAO,SAAS,CAAC;KAClB;IAED,gDAAgD;IAChD,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;IAElE,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAO;SAC9C,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,mBAAmB,CAAC;SAC9D,IAAI,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAC5B,mBAAmB;SAChB,WAAW,EAAE;SACb,IAAI,CACH,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU;QACnC,IAAI,CAAC,OAAO,EAAE,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAClD,CACJ;SACA,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,sBAAsB,CAAC,CAAC;IAEnE,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,mBAAmB,CAC1B,SAAiB,EACjB,IAAgB;IAEhB,MAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,IAAI,EAAE,uBAAU,CAAC,gBAAgB,CAAC,CAAC,IAAI,CACxE,CAAC,gBAAgB,EAAE,EAAE,CACnB,gBAAgB;SACb,WAAW,EAAE;SACb,IAAI,CACH,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,SAAS,CACtE,CACc,CAAC;IAEtB,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,sBAAsB,CAC7B,YAAoB,EACpB,IAAgB;IAEhB,MAAM,mBAAmB,GAAG,IAAA,sBAAS,EACnC,IAAI,EACJ,uBAAU,CAAC,mBAAmB,CAC/B,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAC7B,mBAAmB;SAChB,WAAW,EAAE;SACb,IAAI,CACH,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,YAAY,CACzE,CACmB,CAAC;IAEzB,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,SAAS,yCAAyC,CAChD,iBAAuB,EACvB,cAAsB,EACtB,WAAmB;IAEnB,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/D,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,UAAU,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,MAAM,8BAA8B,GAAG,UAAU;SAC9C,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,kBAAkB;YAC3C,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,cAAc,CACnD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,8BAA8B,EAAE;QACnC,eAAM,CAAC,IAAI,CACT,IAAA,qBAAY,EAAA,qEAAqE,cAAc,oGAAoG,WAAW,YAAY,CAC3N,CAAC;KACH;IAED,OAAO,8BAA8B,CAAC;AACxC,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAgB,EAAE,cAAsB;IACpE,MAAM,kBAAkB,GAAG,IAAA,gCAAoB,EAC7C,IAAI,EACJ,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,6BAA6B,cAAc,GAAG,CAAC,CAAC;KACjE;IAED,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAC/B,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.
|
|
4
|
+
exports.nxVersion = '13.3.2';
|
|
5
5
|
exports.angularVersion = '^13.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.0.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|