@rxap/plugin-angular 16.2.0-dev.17 → 16.2.0-dev.18
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
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.2.0-dev.18](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.2.0-dev.17...@rxap/plugin-angular@16.2.0-dev.18) (2024-04-16)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- use regex to check for existing imports ([f87a5a0](https://gitlab.com/rxap/packages/commit/f87a5a074cabb78f4bc4ded42cac3aae07d2e63e))
|
|
11
|
+
|
|
6
12
|
# [16.2.0-dev.17](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.2.0-dev.16...@rxap/plugin-angular@16.2.0-dev.17) (2024-04-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/angular@^16.10.0 @nx/devkit@^16.10.0 @
|
|
22
|
+
yarn add @nx/angular@^16.10.0 @nx/devkit@^16.10.0 @rxap/plugin-application@^16.2.0-dev.10 @rxap/plugin-gitlab-ci@^16.2.0-dev.7 @rxap/plugin-library@^16.1.0-dev.12 @rxap/plugin-localazy@^16.1.1-dev.3 @rxap/plugin-utilities@^16.2.0-dev.1 @rxap/ts-morph@^1.1.0-dev.30 @rxap/utilities@^16.1.0-dev.9 @rxap/workspace-ts-morph@^16.1.0-dev.0 @rxap/workspace-utilities@^16.1.0-dev.15 nx@^16.10.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.2.0-dev.
|
|
2
|
+
"version": "16.2.0-dev.18",
|
|
3
3
|
"name": "@rxap/plugin-angular",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -18,16 +18,15 @@
|
|
|
18
18
|
"peerDependencies": {
|
|
19
19
|
"@nx/angular": "^16.10.0",
|
|
20
20
|
"@nx/devkit": "^16.10.0",
|
|
21
|
-
"@nx/linter": "^16.10.0",
|
|
22
21
|
"@rxap/plugin-application": "^16.2.0-dev.10",
|
|
23
22
|
"@rxap/plugin-gitlab-ci": "^16.2.0-dev.7",
|
|
24
23
|
"@rxap/plugin-library": "^16.1.0-dev.12",
|
|
25
24
|
"@rxap/plugin-localazy": "^16.1.1-dev.3",
|
|
26
25
|
"@rxap/plugin-utilities": "^16.2.0-dev.1",
|
|
27
|
-
"@rxap/ts-morph": "^1.1.0-dev.
|
|
26
|
+
"@rxap/ts-morph": "^1.1.0-dev.30",
|
|
28
27
|
"@rxap/utilities": "^16.1.0-dev.9",
|
|
29
28
|
"@rxap/workspace-ts-morph": "^16.1.0-dev.0",
|
|
30
|
-
"@rxap/workspace-utilities": "^16.1.0-dev.
|
|
29
|
+
"@rxap/workspace-utilities": "^16.1.0-dev.15",
|
|
31
30
|
"nx": "^16.10.0",
|
|
32
31
|
"ts-morph": "^18.0.0",
|
|
33
32
|
"tslib": "2.6.2",
|
|
@@ -94,7 +93,7 @@
|
|
|
94
93
|
},
|
|
95
94
|
{
|
|
96
95
|
"package": "@rxap/ts-morph",
|
|
97
|
-
"version": "1.1.0-dev.
|
|
96
|
+
"version": "1.1.0-dev.30"
|
|
98
97
|
},
|
|
99
98
|
{
|
|
100
99
|
"package": "@rxap/utilities",
|
|
@@ -106,7 +105,7 @@
|
|
|
106
105
|
},
|
|
107
106
|
{
|
|
108
107
|
"package": "@rxap/workspace-utilities",
|
|
109
|
-
"version": "16.1.0-dev.
|
|
108
|
+
"version": "16.1.0-dev.15"
|
|
110
109
|
}
|
|
111
110
|
]
|
|
112
111
|
},
|
|
@@ -121,6 +120,6 @@
|
|
|
121
120
|
},
|
|
122
121
|
"schematics": "./generators.json",
|
|
123
122
|
"type": "commonjs",
|
|
124
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "7cdae9347c3bf23ac69475176c1817014ca1a0c0",
|
|
125
124
|
"main": "./src/index.js"
|
|
126
125
|
}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CoerceProject = exports.CoerceProjects = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const generators_1 = require("@nx/angular/generators");
|
|
6
|
-
const linter_1 = require("@nx/linter/src/generators/utils/linter");
|
|
7
6
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
7
|
function CoerceProjects(tree, options) {
|
|
9
8
|
var _a;
|
|
@@ -34,18 +33,18 @@ function CoerceProject(tree, projectName, options) {
|
|
|
34
33
|
if (options.moduleFederation) {
|
|
35
34
|
if (options.moduleFederation === 'host') {
|
|
36
35
|
const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:host');
|
|
37
|
-
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter:
|
|
36
|
+
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: 'eslint', strict: true, standaloneConfig: true }, defaultOptions), { directory }), formOptions), { name: projectName, dynamic: true, projectNameAndRootFormat: 'as-provided' });
|
|
38
37
|
yield (0, generators_1.host)(tree, schema);
|
|
39
38
|
}
|
|
40
39
|
else {
|
|
41
40
|
const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:remote');
|
|
42
|
-
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter:
|
|
41
|
+
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: 'eslint', strict: true, standaloneConfig: true }, defaultOptions), { directory }), formOptions), { host: options.host, name: projectName, projectNameAndRootFormat: 'as-provided' });
|
|
43
42
|
yield (0, generators_1.remote)(tree, schema);
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
else {
|
|
47
46
|
const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:application');
|
|
48
|
-
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', routing: true, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter:
|
|
47
|
+
const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', routing: true, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: 'eslint', strict: true, standaloneConfig: true, minimal: true }, defaultOptions), { directory }), formOptions), { name: projectName, projectNameAndRootFormat: 'as-provided' });
|
|
49
48
|
yield (0, generators_1.applicationGenerator)(tree, schema);
|
|
50
49
|
}
|
|
51
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/coerce-project.ts"],"names":[],"mappings":";;;;AAAA,uDAMgC;AAKhC,
|
|
1
|
+
{"version":3,"file":"coerce-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/coerce-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,14 @@ import 'jest-preset-angular/setup-jest';
|
|
|
17
17
|
`);
|
|
18
18
|
}
|
|
19
19
|
let content = tree.read(testSetupPath, 'utf-8');
|
|
20
|
-
if (!content.
|
|
20
|
+
if (!content.match(/import\s+\{.+}\s+from\s+'util';/)) {
|
|
21
21
|
content += `
|
|
22
22
|
import { TextDecoder, TextEncoder } from 'util';
|
|
23
23
|
global.TextEncoder ??= TextEncoder as any;
|
|
24
24
|
global.TextDecoder ??= TextDecoder as any;
|
|
25
25
|
`;
|
|
26
26
|
}
|
|
27
|
-
if (!content.
|
|
27
|
+
if (!content.match(/import\s+'@angular\/localize\/init';/)) {
|
|
28
28
|
content += `
|
|
29
29
|
import '@angular/localize/init';
|
|
30
30
|
jest.spyOn(global as any, '$localize').mockImplementation((...args: any[]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-test-setup.js","sourceRoot":"","sources":["../../../../../../packages/plugin/angular/src/lib/coerce-test-setup.ts"],"names":[],"mappings":";;;AACA,mEAAiE;AAEjE,SAAgB,eAAe,CAAC,IAAU,EAAE,WAAmB;IAC7D,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,GAAG,iBAAiB,gBAAgB,CAAC;IAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;;;;;;;;CAQ7B,CAAC,CAAC;KACA;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAE,CAAC;IACjD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"coerce-test-setup.js","sourceRoot":"","sources":["../../../../../../packages/plugin/angular/src/lib/coerce-test-setup.ts"],"names":[],"mappings":";;;AACA,mEAAiE;AAEjE,SAAgB,eAAe,CAAC,IAAU,EAAE,WAAmB;IAC7D,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,GAAG,iBAAiB,gBAAgB,CAAC;IAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;;;;;;;;CAQ7B,CAAC,CAAC;KACA;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAE,CAAC;IACjD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,EAAE;QACrD,OAAO,IAAI;;;;CAId,CAAC;KACC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,EAAE;QAC1D,OAAO,IAAI;;;;;;;CAOd,CAAC;KACC;IAED,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAErC,CAAC;AArCD,0CAqCC"}
|