@o3r/workspace 14.2.0-prerelease.1 → 14.2.0-prerelease.3
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/package.json +9 -9
- package/schematics/application/index.d.ts.map +1 -1
- package/schematics/application/index.js +12 -4
- package/schematics/application/index.js.map +1 -1
- package/schematics/common/index.d.ts +2 -0
- package/schematics/common/index.d.ts.map +1 -0
- package/schematics/common/index.js +5 -0
- package/schematics/common/index.js.map +1 -0
- package/schematics/common/ng-utils.d.ts +22 -0
- package/schematics/common/ng-utils.d.ts.map +1 -0
- package/schematics/common/ng-utils.js +80 -0
- package/schematics/common/ng-utils.js.map +1 -0
- package/schematics/{library → common}/templates/jest/jest.config.js.template +5 -2
- package/schematics/library/rules/rules-ng.d.ts.map +1 -1
- package/schematics/library/rules/rules-ng.js +4 -57
- package/schematics/library/rules/rules-ng.js.map +1 -1
- package/schematics/library/rules/rules-nx.js +1 -1
- package/schematics/library/rules/rules-nx.js.map +1 -1
- /package/schematics/{library → common}/templates/jest/testing/setup-jest.ts.template +0 -0
- /package/schematics/{library/templates/ng → common/templates}/jest/tsconfig.build.composite.json.template +0 -0
- /package/schematics/{library/templates/ng → common/templates}/jest/tsconfig.spec.json.template +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "14.2.0-prerelease.
|
|
3
|
+
"version": "14.2.0-prerelease.3",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"@angular/common": "^21.0.0",
|
|
42
42
|
"@angular/compiler-cli": "^21.0.0",
|
|
43
43
|
"@angular/core": "^21.0.0",
|
|
44
|
-
"@o3r/schematics": "~14.2.0-prerelease.
|
|
45
|
-
"@o3r/telemetry": "~14.2.0-prerelease.
|
|
44
|
+
"@o3r/schematics": "~14.2.0-prerelease.3",
|
|
45
|
+
"@o3r/telemetry": "~14.2.0-prerelease.3",
|
|
46
46
|
"@schematics/angular": "^21.0.0",
|
|
47
47
|
"type-fest": "^5.3.1",
|
|
48
48
|
"typescript": "^5.9.0"
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@o3r/schematics": "~14.2.0-prerelease.
|
|
65
|
+
"@o3r/schematics": "~14.2.0-prerelease.3",
|
|
66
66
|
"commander": "^14.0.0",
|
|
67
67
|
"globby": "^11.1.0",
|
|
68
68
|
"semver": "^7.5.2",
|
|
@@ -95,11 +95,11 @@
|
|
|
95
95
|
"@nx/jest": "~22.5.3",
|
|
96
96
|
"@nx/js": "~22.5.3",
|
|
97
97
|
"@nx/workspace": "~22.5.3",
|
|
98
|
-
"@o3r/build-helpers": "~14.2.0-prerelease.
|
|
99
|
-
"@o3r/core": "~14.2.0-prerelease.
|
|
100
|
-
"@o3r/eslint-plugin": "~14.2.0-prerelease.
|
|
101
|
-
"@o3r/telemetry": "~14.2.0-prerelease.
|
|
102
|
-
"@o3r/test-helpers": "~14.2.0-prerelease.
|
|
98
|
+
"@o3r/build-helpers": "~14.2.0-prerelease.3",
|
|
99
|
+
"@o3r/core": "~14.2.0-prerelease.3",
|
|
100
|
+
"@o3r/eslint-plugin": "~14.2.0-prerelease.3",
|
|
101
|
+
"@o3r/telemetry": "~14.2.0-prerelease.3",
|
|
102
|
+
"@o3r/test-helpers": "~14.2.0-prerelease.3",
|
|
103
103
|
"@schematics/angular": "~21.2.0",
|
|
104
104
|
"@stylistic/eslint-plugin": "~5.10.0",
|
|
105
105
|
"@types/jest": "~30.0.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAiJpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,wBAA8C,CAAC"}
|
|
@@ -7,6 +7,7 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
8
|
const schema_1 = require("@schematics/angular/application/schema");
|
|
9
9
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
|
+
const common_1 = require("../common");
|
|
10
11
|
const index_1 = require("../rule-factories/index");
|
|
11
12
|
/**
|
|
12
13
|
* Find the relative path to a configuration file at the monorepo root
|
|
@@ -30,7 +31,7 @@ function generateApplicationFn(options) {
|
|
|
30
31
|
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
|
|
31
32
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
32
33
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
33
|
-
const addProjectSpecificFiles = (targetPath, rootDependencies, tsconfigBasePath) => {
|
|
34
|
+
const addProjectSpecificFiles = (targetPath, rootDependencies, tsconfigBasePath, testingFramework) => {
|
|
34
35
|
return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
|
|
35
36
|
(0, schematics_1.template)({
|
|
36
37
|
...options,
|
|
@@ -38,7 +39,7 @@ function generateApplicationFn(options) {
|
|
|
38
39
|
enforceTildeRange: schematics_2.enforceTildeRange,
|
|
39
40
|
name: packageJsonName,
|
|
40
41
|
rootDependencies,
|
|
41
|
-
testingFramework
|
|
42
|
+
testingFramework
|
|
42
43
|
}),
|
|
43
44
|
(0, schematics_1.move)(targetPath),
|
|
44
45
|
(0, schematics_1.renameTemplateFiles)()
|
|
@@ -81,6 +82,7 @@ function generateApplicationFn(options) {
|
|
|
81
82
|
}
|
|
82
83
|
};
|
|
83
84
|
const tsconfigBasePath = findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath);
|
|
85
|
+
const testingFramework = rootDependencies.vitest ? 'vitest' : (rootDependencies.jest ? 'jest' : 'jasmine');
|
|
84
86
|
return (0, schematics_1.chain)([
|
|
85
87
|
(0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
|
|
86
88
|
...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
|
|
@@ -88,14 +90,20 @@ function generateApplicationFn(options) {
|
|
|
88
90
|
projectRoot,
|
|
89
91
|
style: schema_1.Style.Scss
|
|
90
92
|
}),
|
|
91
|
-
addProjectSpecificFiles(targetPath, rootDependencies, tsconfigBasePath),
|
|
93
|
+
addProjectSpecificFiles(targetPath, rootDependencies, tsconfigBasePath, testingFramework),
|
|
92
94
|
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
|
|
93
95
|
(0, schematics_2.setupDependencies)({
|
|
94
96
|
dependencies,
|
|
95
97
|
skipInstall: options.skipInstall,
|
|
96
98
|
ngAddToRun: Object.keys(dependencies),
|
|
97
99
|
projectName: cleanName
|
|
98
|
-
})
|
|
100
|
+
}),
|
|
101
|
+
...testingFramework === 'jest'
|
|
102
|
+
? [
|
|
103
|
+
(0, common_1.setUpAngularTestPackageJson)({ targetPath, name: cleanName }),
|
|
104
|
+
(0, common_1.setUpJest)({ targetPath, name: cleanName })
|
|
105
|
+
]
|
|
106
|
+
: []
|
|
99
107
|
])(tree, context);
|
|
100
108
|
};
|
|
101
109
|
return ngCliUpdate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAcoC;AACpC,gDAQyB;AAIzB,mEAEgD;AAChD,2EAEkD;AAIlD,mDAEiC;AAKjC;;;;;;GAMG;AACH,SAAS,0BAA0B,CAAC,IAAU,EAAE,KAAe,EAAE,UAAkB;IACjF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAAC,OAAoC;IACjE,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;IACpJ,MAAM,eAAe,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/common/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
+
/**
|
|
3
|
+
* Set jest files and script in the generated library.
|
|
4
|
+
* @param options
|
|
5
|
+
* @param options.targetPath
|
|
6
|
+
* @param options.name
|
|
7
|
+
*/
|
|
8
|
+
export declare function setUpAngularTestPackageJson(options: {
|
|
9
|
+
targetPath: string;
|
|
10
|
+
name: string;
|
|
11
|
+
}): Rule;
|
|
12
|
+
/**
|
|
13
|
+
* Set the jest configuration files, if the project has a dependency on `@o3r/testing`, use the ng add `@o3r/testing` script
|
|
14
|
+
* @param options
|
|
15
|
+
* @param options.targetPath
|
|
16
|
+
* @param options.name
|
|
17
|
+
*/
|
|
18
|
+
export declare function setUpJest(options: {
|
|
19
|
+
targetPath: string;
|
|
20
|
+
name: string;
|
|
21
|
+
}): Rule;
|
|
22
|
+
//# sourceMappingURL=ng-utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ng-utils.d.ts","sourceRoot":"","sources":["../../../schematics/common/ng-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAQL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAQpC;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAS/F;AAiDD;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAS7E"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setUpAngularTestPackageJson = setUpAngularTestPackageJson;
|
|
4
|
+
exports.setUpJest = setUpJest;
|
|
5
|
+
const path = require("node:path");
|
|
6
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
|
+
const schematics_2 = require("@o3r/schematics");
|
|
8
|
+
/**
|
|
9
|
+
* Set jest files and script in the generated library.
|
|
10
|
+
* @param options
|
|
11
|
+
* @param options.targetPath
|
|
12
|
+
* @param options.name
|
|
13
|
+
*/
|
|
14
|
+
function setUpAngularTestPackageJson(options) {
|
|
15
|
+
return (tree) => {
|
|
16
|
+
const packageJsonPath = path.join(options.targetPath, 'package.json');
|
|
17
|
+
const packageJsonContent = tree.readJson(packageJsonPath);
|
|
18
|
+
packageJsonContent.scripts ||= {};
|
|
19
|
+
packageJsonContent.scripts.test ||= `ng test ${options.name}`;
|
|
20
|
+
tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
|
|
21
|
+
return tree;
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Set jest files and script in the generated library.
|
|
26
|
+
* @param name
|
|
27
|
+
*/
|
|
28
|
+
function setUpJestForAngularJson(name) {
|
|
29
|
+
return (tree) => {
|
|
30
|
+
const angularFile = tree.readJson('/angular.json');
|
|
31
|
+
const project = angularFile.projects[name];
|
|
32
|
+
project.architect ||= {};
|
|
33
|
+
project.architect.test = {
|
|
34
|
+
builder: '@angular-builders/jest:run',
|
|
35
|
+
options: {
|
|
36
|
+
tsConfig: `tsconfig.spec.json`,
|
|
37
|
+
config: `jest.config.js`,
|
|
38
|
+
setupFilesAfterEnv: './testing/setup-jest.ts'
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
tree.overwrite('/angular.json', JSON.stringify(angularFile, null, 2));
|
|
42
|
+
return tree;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Set the jest configuration without relying on `@o3r/testing`
|
|
47
|
+
* @param options
|
|
48
|
+
* @param options.targetPath
|
|
49
|
+
* @param options.name
|
|
50
|
+
*/
|
|
51
|
+
function setUpJestWithoutO3rTesting(options) {
|
|
52
|
+
return (tree) => (0, schematics_1.chain)([
|
|
53
|
+
(0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../common/templates/jest'), [
|
|
54
|
+
(0, schematics_1.template)({
|
|
55
|
+
tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
56
|
+
tsconfigSpecPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
57
|
+
}),
|
|
58
|
+
(0, schematics_1.renameTemplateFiles)(),
|
|
59
|
+
(0, schematics_1.move)(options.targetPath)
|
|
60
|
+
]), schematics_1.MergeStrategy.Overwrite),
|
|
61
|
+
setUpJestForAngularJson(options.name)
|
|
62
|
+
]);
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Set the jest configuration files, if the project has a dependency on `@o3r/testing`, use the ng add `@o3r/testing` script
|
|
66
|
+
* @param options
|
|
67
|
+
* @param options.targetPath
|
|
68
|
+
* @param options.name
|
|
69
|
+
*/
|
|
70
|
+
function setUpJest(options) {
|
|
71
|
+
return (tree, context) => {
|
|
72
|
+
const isO3rTestingInstalled = tree.readText('/package.json').includes('@o3r/testing');
|
|
73
|
+
if (isO3rTestingInstalled) {
|
|
74
|
+
context.logger.debug('Package @o3r/testing detected.');
|
|
75
|
+
return (0, schematics_1.externalSchematic)('@o3r/testing', 'ng-add', { projectName: options.name, skipInstall: true, skipLinter: true });
|
|
76
|
+
}
|
|
77
|
+
return setUpJestWithoutO3rTesting(options);
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=ng-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ng-utils.js","sourceRoot":"","sources":["../../../schematics/common/ng-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
const { createCjsPreset } = require('jest-preset-angular/presets');
|
|
1
2
|
const { pathsToModuleNameMapper } = require('ts-jest');
|
|
2
3
|
const { compilerOptions } = require('<%= tsconfigBasePath %>');
|
|
3
4
|
|
|
@@ -7,8 +8,11 @@ globalThis.ngJest = {
|
|
|
7
8
|
|
|
8
9
|
/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
|
|
9
10
|
module.exports = {
|
|
11
|
+
...createCjsPreset({
|
|
12
|
+
tsconfig: 'tsconfig.spec.json',
|
|
13
|
+
stringifyContentPathRegex: '\\.html$',
|
|
14
|
+
}),
|
|
10
15
|
displayName: require('./package.json').name,
|
|
11
|
-
preset: 'jest-preset-angular',
|
|
12
16
|
setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
|
|
13
17
|
rootDir: __dirname,
|
|
14
18
|
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
|
|
@@ -19,7 +23,6 @@ module.exports = {
|
|
|
19
23
|
'default',
|
|
20
24
|
'github-actions'
|
|
21
25
|
],
|
|
22
|
-
globalSetup: 'jest-preset-angular/global-setup',
|
|
23
26
|
transform: {
|
|
24
27
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
25
28
|
'^.+\\.tsx?$': [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules-ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"rules-ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAepC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAMnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAkHxH"}
|
|
@@ -5,43 +5,9 @@ const node_fs_1 = require("node:fs");
|
|
|
5
5
|
const path = require("node:path");
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
|
+
const common_1 = require("../../common");
|
|
8
9
|
const index_1 = require("../../rule-factories/index");
|
|
9
10
|
const shared_1 = require("./shared");
|
|
10
|
-
/**
|
|
11
|
-
* Set jest files and script in the generated library.
|
|
12
|
-
* @param options
|
|
13
|
-
*/
|
|
14
|
-
function setUpAngularTestPackageJson(options) {
|
|
15
|
-
return (tree) => {
|
|
16
|
-
const packageJsonPath = path.join(options.targetPath, 'package.json');
|
|
17
|
-
const packageJsonContent = tree.readJson(packageJsonPath);
|
|
18
|
-
packageJsonContent.scripts ||= {};
|
|
19
|
-
packageJsonContent.scripts.test ||= `ng test ${options.name}`;
|
|
20
|
-
tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
|
|
21
|
-
return tree;
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
/**
|
|
25
|
-
* Set jest files and script in the generated library.
|
|
26
|
-
* @param options
|
|
27
|
-
*/
|
|
28
|
-
function setUpJestForAngularJson(options) {
|
|
29
|
-
return (tree) => {
|
|
30
|
-
const angularFile = tree.readJson('/angular.json');
|
|
31
|
-
const project = angularFile.projects[options.name];
|
|
32
|
-
project.architect ||= {};
|
|
33
|
-
project.architect.test = {
|
|
34
|
-
builder: '@angular-builders/jest:run',
|
|
35
|
-
options: {
|
|
36
|
-
tsConfig: `tsconfig.spec.json`,
|
|
37
|
-
configPath: `jest.config.js`,
|
|
38
|
-
setupFilesAfterEnv: './testing/setup-jest.ts'
|
|
39
|
-
}
|
|
40
|
-
};
|
|
41
|
-
tree.overwrite('/angular.json', JSON.stringify(angularFile, null, 2));
|
|
42
|
-
return tree;
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
11
|
/**
|
|
46
12
|
* generate the rules to adapt the library generated by ng cli
|
|
47
13
|
* @param options Schematic options
|
|
@@ -67,23 +33,6 @@ function ngGenerateModule(options) {
|
|
|
67
33
|
(0, schematics_1.renameTemplateFiles)(),
|
|
68
34
|
(0, schematics_1.move)(options.targetPath)
|
|
69
35
|
]);
|
|
70
|
-
const templateCommonJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/jest'), [
|
|
71
|
-
(0, schematics_1.template)({
|
|
72
|
-
...options,
|
|
73
|
-
tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
74
|
-
}),
|
|
75
|
-
(0, schematics_1.renameTemplateFiles)(),
|
|
76
|
-
(0, schematics_1.move)(options.targetPath)
|
|
77
|
-
]);
|
|
78
|
-
const templateNgJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/jest'), [
|
|
79
|
-
(0, schematics_1.template)({
|
|
80
|
-
...options,
|
|
81
|
-
tsconfigSpecPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
82
|
-
tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
83
|
-
}),
|
|
84
|
-
(0, schematics_1.renameTemplateFiles)(),
|
|
85
|
-
(0, schematics_1.move)(options.targetPath)
|
|
86
|
-
]);
|
|
87
36
|
const packageJsonContent = tree.readText('/package.json');
|
|
88
37
|
const hasJestInstalled = options.testingFramework === 'jest' || /"jest"/.test(packageJsonContent);
|
|
89
38
|
const hasVitestInstalled = options.testingFramework === 'vitest' || /"vitest"/.test(packageJsonContent);
|
|
@@ -91,13 +40,11 @@ function ngGenerateModule(options) {
|
|
|
91
40
|
(0, schematics_1.mergeWith)(templateNg, schematics_1.MergeStrategy.Overwrite),
|
|
92
41
|
...hasJestInstalled
|
|
93
42
|
? [
|
|
94
|
-
(0,
|
|
95
|
-
(0,
|
|
96
|
-
setUpJestForAngularJson(options),
|
|
97
|
-
setUpAngularTestPackageJson({ ...options })
|
|
43
|
+
(0, common_1.setUpAngularTestPackageJson)(options),
|
|
44
|
+
(0, common_1.setUpJest)(options)
|
|
98
45
|
]
|
|
99
46
|
: [
|
|
100
|
-
setUpAngularTestPackageJson(options)
|
|
47
|
+
(0, common_1.setUpAngularTestPackageJson)(options)
|
|
101
48
|
],
|
|
102
49
|
(0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rWorkspacePackageJson, { ...options, useJest: !!hasJestInstalled, useVitest: !!hasVitestInstalled }),
|
|
103
50
|
(0, shared_1.updateNgPackagrFactory)(options.targetPath),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules-ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"rules-ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-ng.ts"],"names":[],"mappings":";;AA2CA,4CAkHC;AA7JD,qCAEiB;AACjB,kCAAkC;AAClC,2DAWoC;AACpC,gDAEyB;AAKzB,yCAGsB;AACtB,sDAEoC;AAIpC,qCAGkB;AAElB;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAiF;IAChH,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,MAAM,gBAAgB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC/C,MAAM,2BAA2B,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC9F,MAAM,uBAAuB,GAAqE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,2BAA2B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnK,MAAM,YAAY,GAAG,uBAAuB,CAAC,YAAa,CAAC,iBAAiB,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,uBAAuB,CAAC,EAAE;YACrD,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,gBAAgB,EAAE,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;gBAC/G,iBAAiB,EAAE,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;aACxI,CAAC;YACF,IAAA,gCAAmB,GAAE;YACrB,IAAA,iBAAI,EAAC,OAAO,CAAC,UAAU,CAAC;SACzB,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,KAAK,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxG,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EAAC,UAAU,EAAE,0BAAa,CAAC,SAAS,CAAC;YAC9C,GAAG,gBAAgB;gBACjB,CAAC,CAAC;oBACA,IAAA,oCAA2B,EAAC,OAAO,CAAC;oBACpC,IAAA,kBAAS,EAAC,OAAO,CAAC;iBACnB;gBACD,CAAC,CAAC;oBACA,IAAA,oCAA2B,EAAC,OAAO,CAAC;iBACrC;YACH,IAAA,yCAAgC,EAAC,OAAO,CAAC,UAAU,EAAE,YAAa,EAAE,uBAAuB,EACzF,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC,kBAAkB,EAAE,CAC7E;YACD,IAAA,+BAAsB,EAAC,OAAO,CAAC,UAAU,CAAC;YAC1C,CAAC,CAAC,EAAE,EAAE;gBACJ,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;gBAC/E,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAgB,CAAC;gBAClE,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC;gBAC3C,WAAW,CAAC,OAAO,KAAK,EAAE,CAAC;gBAC3B,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;gBAC9B,CAAC,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtE,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,mBAAmB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,YAAY,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,CAAC;QACpG,IAAI,aAAa,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,CAAC,CAAC;QAEnF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;gBAC3C,eAAe,EAAE;oBACf,cAAc,EAAE,KAAK;iBACtB;gBACD,sBAAsB,EAAE;oBACtB,eAAe,EAAE,SAAS;iBAC3B;aACF,CAAC;YACF,aAAa,KAAK,qBAAqB,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAiB,CAAC;YAC/D,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC;YAClC,UAAU,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;YACxC,UAAU,CAAC,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC;YAC3C,UAAU,CAAC,eAAe,CAAC,KAAK,GAAG,MAAM,CAAC,WAAW,CACnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACzG,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG;gBAC1D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,YAAY,CAAC;aACzD,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAiB,CAAC;YAChE,UAAU,CAAC,eAAgB,CAAC,KAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC;YACjH,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC1C,OAAO,IAAA,kBAAK,EAAC;YACX,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,8BAAiB,EAAC,qBAAqB,EAAE,SAAS,EAAE;gBAC5D,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,kBAAkB;gBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACR,gBAAgB;YAChB,IAAA,6BAAqB,EAAC,OAAO,CAAC,UAAU,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;YAC1F,mBAAmB;SACpB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -87,7 +87,7 @@ function nxGenerateModule(options) {
|
|
|
87
87
|
(0, schematics_1.renameTemplateFiles)(),
|
|
88
88
|
(0, schematics_1.move)(targetPath)
|
|
89
89
|
]);
|
|
90
|
-
const templateJest = (0, schematics_1.apply)((0, schematics_1.url)('
|
|
90
|
+
const templateJest = (0, schematics_1.apply)((0, schematics_1.url)('../common/templates/jest'), [
|
|
91
91
|
(0, schematics_1.template)({
|
|
92
92
|
...options,
|
|
93
93
|
tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules-nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-nx.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rules-nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules-nx.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
/package/schematics/{library/templates/ng → common/templates}/jest/tsconfig.spec.json.template
RENAMED
|
File without changes
|