@rxap/plugin-angular 16.1.0-dev.45 → 16.1.0-dev.47
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 +15 -0
- package/README.md +1 -1
- package/package.json +10 -10
- package/src/generators/init/generator.js +10 -6
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init-library/generator.js +36 -0
- package/src/generators/init-library/generator.js.map +1 -1
- package/src/lib/skip-project.js +3 -3
- package/src/lib/skip-project.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,21 @@
|
|
|
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.47](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.46...@rxap/plugin-angular@16.1.0-dev.47) (2023-10-02)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- only add specific eslint to project in the rxap repo ([8f59c18](https://gitlab.com/rxap/packages/commit/8f59c1882fdc5eb37a098fdd526acb3fec644444))
|
|
11
|
+
- set correct default publishable library package json version ([32c032d](https://gitlab.com/rxap/packages/commit/32c032dd47552dc53f5adbc39af0ef2a074beea6))
|
|
12
|
+
|
|
13
|
+
# [16.1.0-dev.46](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.45...@rxap/plugin-angular@16.1.0-dev.46) (2023-10-02)
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
- add cypress configuration after library and application init ([d7fc370](https://gitlab.com/rxap/packages/commit/d7fc370493c66e070ba4bf3bf8a0bf27d18e7094))
|
|
18
|
+
- introduce Is\*Project functions ([0f4a53a](https://gitlab.com/rxap/packages/commit/0f4a53a2a68c7f854d819c005a30957d8b1cb3c6))
|
|
19
|
+
- remove the default angular project files ([90ec712](https://gitlab.com/rxap/packages/commit/90ec712a656379696540db3d7b59a3257db76917))
|
|
20
|
+
|
|
6
21
|
# [16.1.0-dev.45](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.44...@rxap/plugin-angular@16.1.0-dev.45) (2023-10-02)
|
|
7
22
|
|
|
8
23
|
### 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.16 @rxap/plugin-localazy@^16.1.0-dev.12 @rxap/plugin-utilities@^16.1.0-dev.18 @rxap/ts-morph@^0.1.0-dev.13 @rxap/utilities@^16.0.0-dev.19 @rxap/workspace-ts-morph@^0.1.0-dev.9 @rxap/workspace-utilities@^0.1.0-dev.19 nx@^16.5.0 ts-morph@^18.0.0 tslib@2.6.2
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.47",
|
|
3
3
|
"name": "@rxap/plugin-angular",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -11,13 +11,13 @@
|
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@nx/devkit": "^16.5.0",
|
|
14
|
-
"@rxap/generator-utilities": "^1.1.0-dev.
|
|
15
|
-
"@rxap/plugin-localazy": "^16.1.0-dev.
|
|
16
|
-
"@rxap/plugin-utilities": "^16.1.0-dev.
|
|
14
|
+
"@rxap/generator-utilities": "^1.1.0-dev.16",
|
|
15
|
+
"@rxap/plugin-localazy": "^16.1.0-dev.12",
|
|
16
|
+
"@rxap/plugin-utilities": "^16.1.0-dev.18",
|
|
17
17
|
"@rxap/ts-morph": "^0.1.0-dev.13",
|
|
18
18
|
"@rxap/utilities": "^16.0.0-dev.19",
|
|
19
19
|
"@rxap/workspace-ts-morph": "^0.1.0-dev.9",
|
|
20
|
-
"@rxap/workspace-utilities": "^0.1.0-dev.
|
|
20
|
+
"@rxap/workspace-utilities": "^0.1.0-dev.19",
|
|
21
21
|
"nx": "^16.5.0",
|
|
22
22
|
"ts-morph": "^18.0.0",
|
|
23
23
|
"tslib": "2.6.2",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"packageGroup": [
|
|
48
48
|
{
|
|
49
49
|
"package": "@rxap/generator-utilities",
|
|
50
|
-
"version": "1.1.0-dev.
|
|
50
|
+
"version": "1.1.0-dev.16"
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
53
|
"package": "@rxap/node-utilities",
|
|
@@ -55,11 +55,11 @@
|
|
|
55
55
|
},
|
|
56
56
|
{
|
|
57
57
|
"package": "@rxap/plugin-localazy",
|
|
58
|
-
"version": "16.1.0-dev.
|
|
58
|
+
"version": "16.1.0-dev.12"
|
|
59
59
|
},
|
|
60
60
|
{
|
|
61
61
|
"package": "@rxap/plugin-utilities",
|
|
62
|
-
"version": "16.1.0-dev.
|
|
62
|
+
"version": "16.1.0-dev.18"
|
|
63
63
|
},
|
|
64
64
|
{
|
|
65
65
|
"package": "@rxap/schematics-ts-morph",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
},
|
|
80
80
|
{
|
|
81
81
|
"package": "@rxap/workspace-utilities",
|
|
82
|
-
"version": "0.1.0-dev.
|
|
82
|
+
"version": "0.1.0-dev.19"
|
|
83
83
|
}
|
|
84
84
|
]
|
|
85
85
|
},
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
},
|
|
95
95
|
"schematics": "./generators.json",
|
|
96
96
|
"type": "commonjs",
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "2a35463ea23db61495357c2484e3558c93700890",
|
|
98
98
|
"main": "./src/index.js",
|
|
99
99
|
"types": "./src/index.d.ts"
|
|
100
100
|
}
|
|
@@ -4,6 +4,7 @@ exports.initGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
7
8
|
const skip_project_1 = require("../../lib/skip-project");
|
|
8
9
|
const generator_1 = require("../init-application/generator");
|
|
9
10
|
const generator_2 = require("../init-library/generator");
|
|
@@ -20,18 +21,21 @@ function initGenerator(tree, options) {
|
|
|
20
21
|
if (skipProject(tree, options, project, projectName)) {
|
|
21
22
|
continue;
|
|
22
23
|
}
|
|
24
|
+
if ((0, workspace_utilities_1.IsLibraryProject)(project)) {
|
|
25
|
+
yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
|
|
26
|
+
}
|
|
27
|
+
if ((0, workspace_utilities_1.IsApplicationProject)(project)) {
|
|
28
|
+
yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
|
|
29
|
+
}
|
|
23
30
|
if (!options.skipProjects) {
|
|
24
31
|
console.log(`init project: ${projectName}`);
|
|
32
|
+
// execute the add cypress if the project has components after the library/application init
|
|
33
|
+
// as the library init will remove the default components so that cypress is only added
|
|
34
|
+
// if the project has really any components
|
|
25
35
|
if ((0, generator_utilities_1.HasComponents)(tree, project.root)) {
|
|
26
36
|
yield (0, generator_utilities_1.CoerceCypressComponentTesting)(tree, project, projectName);
|
|
27
37
|
}
|
|
28
38
|
}
|
|
29
|
-
if (project.projectType === 'library') {
|
|
30
|
-
yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
|
|
31
|
-
}
|
|
32
|
-
if (project.projectType === 'application') {
|
|
33
|
-
yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
|
|
34
|
-
}
|
|
35
39
|
}
|
|
36
40
|
});
|
|
37
41
|
}
|
|
@@ -1 +1 @@
|
|
|
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,IAAI,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,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,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;gBAC7B,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,0CAAoB,EAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAE5B,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBAEzB,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,2FAA2F;gBAC3F,uFAAuF;gBACvF,2CAA2C;gBAC3C,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;oBACrC,MAAM,IAAA,mDAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;iBACjE;aAEF;SAEF;IAEH,CAAC;CAAA;AA5CD,sCA4CC;AAED,kBAAe,aAAa,CAAC"}
|
|
@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
6
6
|
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
+
const semver_1 = require("semver");
|
|
9
10
|
const skip_project_1 = require("../../lib/skip-project");
|
|
10
11
|
function hasIndexScss(tree, project) {
|
|
11
12
|
return tree.exists((0, path_1.join)(project.sourceRoot, '_index.scss'));
|
|
@@ -76,6 +77,9 @@ function skipProject(tree, options, project, projectName) {
|
|
|
76
77
|
return false;
|
|
77
78
|
}
|
|
78
79
|
function extendAngularSpecificEslint(tree, project) {
|
|
80
|
+
if (!(0, workspace_utilities_1.IsRxapRepository)(tree)) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
79
83
|
const projectRoot = project.root;
|
|
80
84
|
const relativeToAngularRoot = (0, path_1.relative)(projectRoot, 'packages/angular');
|
|
81
85
|
const extendsPath = relativeToAngularRoot + '/.eslintrc.json';
|
|
@@ -174,16 +178,48 @@ function checkIfSecondaryEntrypointIncludeInTheTsConfig(tree, project) {
|
|
|
174
178
|
tree.write(specTsConfigPath, JSON.stringify(specTsConfig, null, 2) + '\n');
|
|
175
179
|
}
|
|
176
180
|
}
|
|
181
|
+
function cleanup(tree, project, projectName) {
|
|
182
|
+
const projectSourceRoot = project.sourceRoot;
|
|
183
|
+
if (tree.exists((0, path_1.join)(projectSourceRoot, 'lib', projectName))) {
|
|
184
|
+
(0, workspace_utilities_1.DeleteRecursive)(tree, (0, path_1.join)(projectSourceRoot, 'lib', projectName));
|
|
185
|
+
tree.write((0, path_1.join)(projectSourceRoot, 'index.ts'), 'export {};');
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
function getAngularMajorVersion(rootPackageJson) {
|
|
189
|
+
var _a;
|
|
190
|
+
let targetVersion = (_a = rootPackageJson.dependencies['@angular/core']) !== null && _a !== void 0 ? _a : rootPackageJson.devDependencies['@angular/cli'];
|
|
191
|
+
if (!targetVersion) {
|
|
192
|
+
console.error(`The package @angular/core and @angular/cli are not installed in the root package.json`);
|
|
193
|
+
return null;
|
|
194
|
+
}
|
|
195
|
+
targetVersion = targetVersion.replace(/^[~^]/, '');
|
|
196
|
+
const version = (0, semver_1.parse)(targetVersion);
|
|
197
|
+
return `${version.major}.0.0`;
|
|
198
|
+
}
|
|
199
|
+
function updatePackageJson(tree, project, rootPackageJson) {
|
|
200
|
+
var _a;
|
|
201
|
+
if ((0, generator_utilities_1.IsPublishable)(tree, project) && tree.exists((0, path_1.join)(project.root, 'package.json'))) {
|
|
202
|
+
const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
|
|
203
|
+
const version = (_a = getAngularMajorVersion(rootPackageJson)) !== null && _a !== void 0 ? _a : packageJson.version;
|
|
204
|
+
if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
|
|
205
|
+
packageJson.version = version;
|
|
206
|
+
}
|
|
207
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(project.root, 'package.json'), packageJson);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
177
210
|
function initLibraryGenerator(tree, options) {
|
|
178
211
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
179
212
|
console.log('angular library init generator:', options);
|
|
180
213
|
setGeneralTargetDefaults(tree);
|
|
214
|
+
const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
181
215
|
if (!options.skipProjects) {
|
|
182
216
|
for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
|
|
183
217
|
if (skipProject(tree, options, project, projectName)) {
|
|
184
218
|
continue;
|
|
185
219
|
}
|
|
186
220
|
console.log(`init project: ${projectName}`);
|
|
221
|
+
cleanup(tree, project, projectName);
|
|
222
|
+
updatePackageJson(tree, project, rootPackageJson);
|
|
187
223
|
checkIfSecondaryEntrypointIncludeInTheTsConfig(tree, project);
|
|
188
224
|
if ((0, generator_utilities_1.IsBuildable)(project)) {
|
|
189
225
|
updateProjectNgPackageConfiguration(tree, project);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/generator.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,mEASmC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
|
package/src/lib/skip-project.js
CHANGED
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SkipNonAngularProject = void 0;
|
|
4
4
|
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
5
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
6
|
function SkipNonAngularProject(tree, options, project, projectName) {
|
|
6
|
-
var _a, _b, _c, _d;
|
|
7
7
|
if ((0, generator_utilities_1.SkipProject)(tree, options, project, projectName)) {
|
|
8
8
|
return true;
|
|
9
9
|
}
|
|
10
|
-
if (!(
|
|
10
|
+
if (!(0, workspace_utilities_1.IsAngularProject)(project)) {
|
|
11
11
|
return true;
|
|
12
12
|
}
|
|
13
|
-
if ((
|
|
13
|
+
if ((0, workspace_utilities_1.IsPluginProject)(project) || (0, workspace_utilities_1.IsSchematicProject)(project)) {
|
|
14
14
|
return true;
|
|
15
15
|
}
|
|
16
16
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-project.js","sourceRoot":"","sources":["../../../../../../packages/plugin/angular/src/lib/skip-project.ts"],"names":[],"mappings":";;;AAAA,mEAAwD;
|
|
1
|
+
{"version":3,"file":"skip-project.js","sourceRoot":"","sources":["../../../../../../packages/plugin/angular/src/lib/skip-project.ts"],"names":[],"mappings":";;;AAAA,mEAAwD;AACxD,mEAImC;AAEnC,SAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW;IACvE,IAAI,IAAA,iCAAW,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QACpD,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,IAAI,IAAA,wCAAkB,EAAC,OAAO,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAXD,sDAWC"}
|