@rxap/plugin-angular 16.1.0-dev.10 → 16.1.0-dev.11
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/CHANGELOG.md +6 -0
- package/README.md +1 -1
- package/package.json +18 -18
- package/src/executors/check-ng-package/executor.js +26 -20
- package/src/executors/check-ng-package/executor.js.map +1 -1
- package/src/executors/tailwind/executor.js +27 -21
- package/src/executors/tailwind/executor.js.map +1 -1
- package/src/generators/fix-schematic/generator.js +64 -56
- package/src/generators/fix-schematic/generator.js.map +1 -1
- package/src/generators/fix-schematic/index.js +6 -4
- package/src/generators/fix-schematic/index.js.map +1 -1
- package/src/generators/init/generator.js +30 -23
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init/index.js +6 -4
- package/src/generators/init/index.js.map +1 -1
- package/src/generators/init-application/generator.js +82 -71
- package/src/generators/init-application/generator.js.map +1 -1
- package/src/generators/init-application/index.js +6 -4
- package/src/generators/init-application/index.js.map +1 -1
- package/src/generators/init-library/generator.js +60 -52
- package/src/generators/init-library/generator.js.map +1 -1
- package/src/generators/init-library/index.js +6 -4
- package/src/generators/init-library/index.js.map +1 -1
- package/src/generators/schematic/generator.js +77 -67
- package/src/generators/schematic/generator.js.map +1 -1
- package/src/generators/schematic/index.js +6 -4
- package/src/generators/schematic/index.js.map +1 -1
- package/src/index.js +9 -3
- package/src/index.js.map +1 -1
- package/src/lib/skip-project.js +10 -5
- package/src/lib/skip-project.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [16.1.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.10...@rxap/plugin-angular@16.1.0-dev.11) (2023-08-17)
|
|
7
|
+
|
|
8
|
+
### Reverts
|
|
9
|
+
|
|
10
|
+
- change from commonjs to es2022 ([747a381](https://gitlab.com/rxap/packages/commit/747a381a090f0a276cf363da61bb19ed0c9cb5b7))
|
|
11
|
+
|
|
6
12
|
# [16.1.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.9...@rxap/plugin-angular@16.1.0-dev.10) (2023-08-16)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-angular
|
|
|
19
19
|
```
|
|
20
20
|
**Install peer dependencies:**
|
|
21
21
|
```bash
|
|
22
|
-
yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.
|
|
22
|
+
yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.5 @rxap/plugin-localazy@^16.1.0-dev.4 @rxap/plugin-utilities@^16.1.0-dev.7 @rxap/schematics-ts-morph@^16.0.0-dev.11 @rxap/workspace-ts-morph@^0.1.0-dev.1 @rxap/workspace-utilities@^0.1.0-dev.4 nx@^16.5.0 ts-morph@^18.0.0
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rxap/plugin-angular",
|
|
3
|
-
"version": "16.1.0-dev.
|
|
4
|
-
"type": "
|
|
3
|
+
"version": "16.1.0-dev.11",
|
|
4
|
+
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public",
|
|
@@ -39,49 +39,49 @@
|
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"@nx/devkit": "^16.5.0",
|
|
42
|
-
"@rxap/generator-utilities": "^1.1.0-dev.
|
|
43
|
-
"@rxap/plugin-localazy": "^16.1.0-dev.
|
|
44
|
-
"@rxap/plugin-utilities": "^16.1.0-dev.
|
|
45
|
-
"@rxap/schematics-ts-morph": "^16.0.0-dev.
|
|
46
|
-
"@rxap/workspace-ts-morph": "^0.1.0-dev.
|
|
47
|
-
"@rxap/workspace-utilities": "^0.1.0-dev.
|
|
42
|
+
"@rxap/generator-utilities": "^1.1.0-dev.5",
|
|
43
|
+
"@rxap/plugin-localazy": "^16.1.0-dev.4",
|
|
44
|
+
"@rxap/plugin-utilities": "^16.1.0-dev.7",
|
|
45
|
+
"@rxap/schematics-ts-morph": "^16.0.0-dev.11",
|
|
46
|
+
"@rxap/workspace-ts-morph": "^0.1.0-dev.1",
|
|
47
|
+
"@rxap/workspace-utilities": "^0.1.0-dev.4",
|
|
48
48
|
"nx": "^16.5.0",
|
|
49
49
|
"ts-morph": "^18.0.0",
|
|
50
|
-
"@rxap/node-utilities": "1.1.0-dev.
|
|
51
|
-
"@rxap/schematics-utilities": "16.0.0-dev.
|
|
52
|
-
"@rxap/utilities": "16.0.0-dev.
|
|
50
|
+
"@rxap/node-utilities": "1.1.0-dev.3",
|
|
51
|
+
"@rxap/schematics-utilities": "16.0.0-dev.9",
|
|
52
|
+
"@rxap/utilities": "16.0.0-dev.11"
|
|
53
53
|
},
|
|
54
54
|
"nx-migrations": {
|
|
55
55
|
"packageGroup": [
|
|
56
56
|
{
|
|
57
57
|
"package": "@rxap/generator-utilities",
|
|
58
|
-
"version": "1.1.0-dev.
|
|
58
|
+
"version": "1.1.0-dev.5"
|
|
59
59
|
},
|
|
60
60
|
{
|
|
61
61
|
"package": "@rxap/plugin-localazy",
|
|
62
|
-
"version": "16.1.0-dev.
|
|
62
|
+
"version": "16.1.0-dev.4"
|
|
63
63
|
},
|
|
64
64
|
{
|
|
65
65
|
"package": "@rxap/plugin-utilities",
|
|
66
|
-
"version": "16.1.0-dev.
|
|
66
|
+
"version": "16.1.0-dev.7"
|
|
67
67
|
},
|
|
68
68
|
{
|
|
69
69
|
"package": "@rxap/schematics-ts-morph",
|
|
70
|
-
"version": "16.0.0-dev.
|
|
70
|
+
"version": "16.0.0-dev.11"
|
|
71
71
|
},
|
|
72
72
|
{
|
|
73
73
|
"package": "@rxap/workspace-ts-morph",
|
|
74
|
-
"version": "0.1.0-dev.
|
|
74
|
+
"version": "0.1.0-dev.1"
|
|
75
75
|
},
|
|
76
76
|
{
|
|
77
77
|
"package": "@rxap/workspace-utilities",
|
|
78
|
-
"version": "0.1.0-dev.
|
|
78
|
+
"version": "0.1.0-dev.4"
|
|
79
79
|
}
|
|
80
80
|
]
|
|
81
81
|
},
|
|
82
82
|
"executors": "./executors.json",
|
|
83
83
|
"schematics": "./generators.json",
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "bdda345932cb56c4034526de42761d15700fc56d",
|
|
85
85
|
"main": "./src/index.js",
|
|
86
86
|
"types": "./src/index.d.ts"
|
|
87
87
|
}
|
|
@@ -1,24 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
|
+
function runExecutor(options, context) {
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
console.log('Executor ran for CheckNgPackage', options);
|
|
8
|
+
const ngPackage = JSON.parse((0, plugin_utilities_1.readFileFromProjectRoot)(context, 'ng-package.json', true));
|
|
9
|
+
const { dependencies } = JSON.parse((0, plugin_utilities_1.readFileFromProjectRoot)(context, 'package.json', true));
|
|
10
|
+
if (ngPackage.allowedNonPeerDependencies) {
|
|
11
|
+
const wrongPackages = [];
|
|
12
|
+
for (const packageName of ngPackage.allowedNonPeerDependencies) {
|
|
13
|
+
if (!dependencies[packageName]) {
|
|
14
|
+
wrongPackages.push(packageName);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (wrongPackages.length) {
|
|
18
|
+
console.log(`\x1b[31mSome packages in the allowed non peer dependencies list are not in the package.json dependencies list:\x1b[0m\n - ${wrongPackages.join('\n - ')}`);
|
|
19
|
+
return {
|
|
20
|
+
success: false,
|
|
21
|
+
};
|
|
11
22
|
}
|
|
12
23
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
return {
|
|
21
|
-
success: true,
|
|
22
|
-
};
|
|
24
|
+
return {
|
|
25
|
+
success: true,
|
|
26
|
+
};
|
|
27
|
+
});
|
|
23
28
|
}
|
|
29
|
+
exports.default = runExecutor;
|
|
24
30
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/check-ng-package/executor.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/check-ng-package/executor.ts"],"names":[],"mappings":";;;AACA,6DAAiE;AAGjE,SAA8B,WAAW,CACvC,OAAqC,EACrC,OAAwB;;QAExB,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAExD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;QACxF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;QAE5F,IAAI,SAAS,CAAC,0BAA0B,EAAE;YACxC,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,0BAA0B,EAAE;gBAC9D,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;oBAC9B,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBACjC;aACF;YACD,IAAI,aAAa,CAAC,MAAM,EAAE;gBACxB,OAAO,CAAC,GAAG,CAAC,6HAA8H,aAAa,CAAC,IAAI,CAC1J,OAAO,CAAE,EAAE,CAAC,CAAC;gBACf,OAAO;oBACL,OAAO,EAAE,KAAK;iBACf,CAAC;aACH;SACF;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AA5BD,8BA4BC"}
|
|
@@ -1,23 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
command
|
|
20
|
-
|
|
21
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
|
+
const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
|
|
6
|
+
function runExecutor(options, context) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
console.log('Executor ran for Tailwind', options);
|
|
9
|
+
const projectRoot = (0, plugin_utilities_1.GetProjectRoot)(context);
|
|
10
|
+
const args = [
|
|
11
|
+
['config', options.config],
|
|
12
|
+
['input', options.input],
|
|
13
|
+
['output', options.output],
|
|
14
|
+
];
|
|
15
|
+
if (options.minify) {
|
|
16
|
+
args.push(['minify']);
|
|
17
|
+
}
|
|
18
|
+
const argsString = args.map(([key, value]) => value ? `--${key} ${value}` : `--${key}`).join(' ');
|
|
19
|
+
const command = `tailwindcss ${argsString}`;
|
|
20
|
+
console.log('command: ', command);
|
|
21
|
+
return (0, run_commands_impl_1.default)({
|
|
22
|
+
cwd: projectRoot,
|
|
23
|
+
command,
|
|
24
|
+
__unparsed__: [],
|
|
25
|
+
}, context);
|
|
26
|
+
});
|
|
22
27
|
}
|
|
28
|
+
exports.default = runExecutor;
|
|
23
29
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/tailwind/executor.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/tailwind/executor.ts"],"names":[],"mappings":";;;AACA,6DAAwD;AACxD,uFAAkE;AAGlE,SAA8B,WAAW,CAAC,OAA+B,EAAE,OAAwB;;QACjG,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG;YACX,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;YAC5B,CAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAE;YAC1B,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;SAC7B,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,CAAE,QAAQ,CAAE,CAAC,CAAC;SACzB;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,EAAE,KAAK,CAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,GAAI,IAAK,KAAM,EAAE,CAAC,CAAC,CAAC,KAAM,GAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1G,MAAM,OAAO,GAAG,eAAgB,UAAW,EAAE,CAAC;QAE9C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,IAAA,2BAAG,EAAC;YACT,GAAG,EAAE,WAAW;YAChB,OAAO;YACP,YAAY,EAAE,EAAE;SACjB,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;CAAA;AA1BD,8BA0BC"}
|
|
@@ -1,58 +1,66 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
console.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fixSchematicGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
function fixSchematicGenerator(tree, options) {
|
|
8
|
+
var _a, _b;
|
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
const projectRoot = (0, generator_utilities_1.GetProjectRoot)(tree, options.project);
|
|
11
|
+
const schematicsSourceRoot = (0, path_1.join)((0, generator_utilities_1.GetProjectSourceRoot)(tree, options.project), 'schematics');
|
|
12
|
+
if (!tree.exists(schematicsSourceRoot)) {
|
|
13
|
+
console.warn(`The schematics source root ${schematicsSourceRoot} does not exists!`);
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
const packageJson = JSON.parse(tree.read((0, path_1.join)(projectRoot, 'package.json')).toString('utf-8'));
|
|
17
|
+
if (!packageJson.schematics) {
|
|
18
|
+
console.warn(`The package.json file does not contains schematics property!`);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const collectionFile = (0, path_1.join)(projectRoot, packageJson.schematics);
|
|
22
|
+
if (!tree.exists(collectionFile)) {
|
|
23
|
+
console.warn(`The collection file ${collectionFile} does not exists!`);
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const collection = JSON.parse(tree.read(collectionFile).toString('utf-8'));
|
|
27
|
+
(_a = collection.schematics) !== null && _a !== void 0 ? _a : (collection.schematics = {});
|
|
28
|
+
const { schematics } = collection;
|
|
29
|
+
const detectedSchemaJsonFiles = [];
|
|
30
|
+
for (const { path, isFile } of (0, generator_utilities_1.VisitTree)(tree, schematicsSourceRoot)) {
|
|
31
|
+
if (isFile && path.endsWith('schema.json')) {
|
|
32
|
+
detectedSchemaJsonFiles.push('./' + (0, path_1.relative)(projectRoot, path));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const notDefinedSchematics = detectedSchemaJsonFiles
|
|
36
|
+
.filter(schemaJsonFile => !Object.values(schematics)
|
|
37
|
+
.some((schematic) => schematic.schema === schemaJsonFile));
|
|
38
|
+
console.log(`Not defined schematics: ${notDefinedSchematics.length}`);
|
|
39
|
+
if (notDefinedSchematics.length) {
|
|
40
|
+
console.log(` - ${notDefinedSchematics.join('\n - ')}`);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
console.log('All schematics are defined');
|
|
44
|
+
}
|
|
45
|
+
for (const schemaJsonFile of notDefinedSchematics) {
|
|
46
|
+
const basePath = (0, path_1.dirname)(schemaJsonFile);
|
|
47
|
+
const schematicName = basePath.split('/').pop();
|
|
48
|
+
if (schematics[schematicName]) {
|
|
49
|
+
console.warn(`The schematic ${schematicName} is already defined!`);
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
schematics[schematicName] = {
|
|
53
|
+
schema: schemaJsonFile,
|
|
54
|
+
factory: `${basePath}/index`,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
for (const [name, schematic] of Object.entries(schematics)) {
|
|
58
|
+
(_b = schematic['description']) !== null && _b !== void 0 ? _b : (schematic['description'] = `The ${name} schematic`);
|
|
59
|
+
}
|
|
60
|
+
console.log('Update collection file');
|
|
61
|
+
tree.write(collectionFile, JSON.stringify(collection, null, 2));
|
|
62
|
+
});
|
|
56
63
|
}
|
|
57
|
-
|
|
64
|
+
exports.fixSchematicGenerator = fixSchematicGenerator;
|
|
65
|
+
exports.default = fixSchematicGenerator;
|
|
58
66
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/generator.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const devkit_1 = require("@nx/devkit");
|
|
4
|
+
const generator_1 = require("./generator");
|
|
5
|
+
const schematic = (0, devkit_1.convertNxGenerator)(generator_1.default);
|
|
6
|
+
exports.default = schematic;
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/index.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAoC;AAEpC,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC;AAChD,kBAAe,SAAS,CAAC"}
|
|
@@ -1,31 +1,38 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.initGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
|
+
const skip_project_1 = require("../../lib/skip-project");
|
|
8
|
+
const generator_1 = require("../init-application/generator");
|
|
9
|
+
const generator_2 = require("../init-library/generator");
|
|
6
10
|
function skipProject(tree, options, project, projectName) {
|
|
7
|
-
if (SkipNonAngularProject(tree, options, project, projectName)) {
|
|
11
|
+
if ((0, skip_project_1.SkipNonAngularProject)(tree, options, project, projectName)) {
|
|
8
12
|
return true;
|
|
9
13
|
}
|
|
10
14
|
return false;
|
|
11
15
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
function initGenerator(tree, options) {
|
|
17
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
console.log('angular init generator:', options);
|
|
19
|
+
for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
|
|
20
|
+
if (skipProject(tree, options, project, projectName)) {
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
console.log(`init project: ${projectName}`);
|
|
24
|
+
if ((0, generator_utilities_1.HasComponents)(tree, project.root)) {
|
|
25
|
+
yield (0, generator_utilities_1.CoerceCypressComponentTesting)(tree, project, projectName);
|
|
26
|
+
}
|
|
27
|
+
if (project.projectType === 'library') {
|
|
28
|
+
yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
|
|
29
|
+
}
|
|
30
|
+
if (project.projectType === 'application') {
|
|
31
|
+
yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
|
|
32
|
+
}
|
|
17
33
|
}
|
|
18
|
-
|
|
19
|
-
if (HasComponents(tree, project.root)) {
|
|
20
|
-
await CoerceCypressComponentTesting(tree, project, projectName);
|
|
21
|
-
}
|
|
22
|
-
if (project.projectType === 'library') {
|
|
23
|
-
await initLibraryGenerator(tree, { ...options, projects: [projectName] });
|
|
24
|
-
}
|
|
25
|
-
if (project.projectType === 'application') {
|
|
26
|
-
await initApplicationGenerator(tree, { ...options, projects: [projectName] });
|
|
27
|
-
}
|
|
28
|
-
}
|
|
34
|
+
});
|
|
29
35
|
}
|
|
30
|
-
|
|
36
|
+
exports.initGenerator = initGenerator;
|
|
37
|
+
exports.default = initGenerator;
|
|
31
38
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,yDAA+D;AAC/D,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,oCAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;YAE9C,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;gBACrC,MAAM,IAAA,mDAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;aACjE;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;gBACrC,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aAC7E;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;gBACzC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aACjF;SAEF;IAEH,CAAC;CAAA;AAzBD,sCAyBC;AAED,kBAAe,aAAa,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const devkit_1 = require("@nx/devkit");
|
|
4
|
+
const generator_1 = require("./generator");
|
|
5
|
+
const schematic = (0, devkit_1.convertNxGenerator)(generator_1.default);
|
|
6
|
+
exports.default = schematic;
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/index.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAoC;AAEpC,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC;AAChD,kBAAe,SAAS,CAAC"}
|