@o3r/workspace 11.7.0-prerelease.42 → 11.7.0-prerelease.44
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 +8 -8
- package/schematics/library/rules/shared.d.ts.map +1 -1
- package/schematics/library/rules/shared.js +3 -1
- package/schematics/library/rules/shared.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +2 -1
- package/schematics/ng-add/project-setup.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.7.0-prerelease.
|
|
3
|
+
"version": "11.7.0-prerelease.44",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@angular/common": "^18.2.0",
|
|
30
30
|
"@angular/compiler-cli": "^18.2.0",
|
|
31
31
|
"@angular/core": "^18.2.0",
|
|
32
|
-
"@o3r/telemetry": "^11.7.0-prerelease.
|
|
32
|
+
"@o3r/telemetry": "^11.7.0-prerelease.44",
|
|
33
33
|
"@schematics/angular": "^18.2.0",
|
|
34
34
|
"type-fest": "^4.10.2",
|
|
35
35
|
"typescript": "^5.5.4"
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
49
|
+
"@o3r/schematics": "^11.7.0-prerelease.44",
|
|
50
50
|
"commander": "^12.0.0",
|
|
51
51
|
"globby": "^11.1.0",
|
|
52
52
|
"semver": "^7.5.2",
|
|
@@ -79,11 +79,11 @@
|
|
|
79
79
|
"@nx/jest": "~19.8.0",
|
|
80
80
|
"@nx/js": "~19.8.0",
|
|
81
81
|
"@nx/workspace": "~19.8.0",
|
|
82
|
-
"@o3r/build-helpers": "^11.7.0-prerelease.
|
|
83
|
-
"@o3r/core": "^11.7.0-prerelease.
|
|
84
|
-
"@o3r/eslint-plugin": "^11.7.0-prerelease.
|
|
85
|
-
"@o3r/schematics": "^11.7.0-prerelease.
|
|
86
|
-
"@o3r/test-helpers": "^11.7.0-prerelease.
|
|
82
|
+
"@o3r/build-helpers": "^11.7.0-prerelease.44",
|
|
83
|
+
"@o3r/core": "^11.7.0-prerelease.44",
|
|
84
|
+
"@o3r/eslint-plugin": "^11.7.0-prerelease.44",
|
|
85
|
+
"@o3r/schematics": "^11.7.0-prerelease.44",
|
|
86
|
+
"@o3r/test-helpers": "^11.7.0-prerelease.44",
|
|
87
87
|
"@schematics/angular": "~18.2.0",
|
|
88
88
|
"@stylistic/eslint-plugin": "~2.7.0",
|
|
89
89
|
"@types/jest": "~29.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACpF,OAAO,EAAE,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqDjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
|
|
@@ -15,10 +15,11 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
|
|
|
15
15
|
return (tree) => {
|
|
16
16
|
const packageJson = tree.readJson(path.posix.join(targetPath, 'package.json'));
|
|
17
17
|
const runner = (0, schematics_1.getPackageManagerRunner)((0, schematics_1.getWorkspaceConfig)(tree));
|
|
18
|
+
const executor = (0, schematics_1.getPackageManagerExecutor)((0, schematics_1.getWorkspaceConfig)(tree));
|
|
18
19
|
packageJson.description = options.description || packageJson.description;
|
|
19
20
|
packageJson.scripts ||= {};
|
|
20
21
|
packageJson.scripts.build = `${runner} ng build ${options.name}`;
|
|
21
|
-
packageJson.scripts['prepare:build:builders'] = `${
|
|
22
|
+
packageJson.scripts['prepare:build:builders'] = `${executor} cpy collection.json dist && ${executor} cpy 'schematics/**/*.json' dist/schematics`;
|
|
22
23
|
packageJson.scripts['build:builders'] = 'tsc -b tsconfig.builders.json --pretty';
|
|
23
24
|
packageJson.peerDependencies ||= {};
|
|
24
25
|
packageJson.peerDependencies['@o3r/core'] = otterVersion;
|
|
@@ -42,6 +43,7 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
|
|
|
42
43
|
'@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'],
|
|
43
44
|
'@schematics/angular': o3rCorePackageJson.peerDependencies['@schematics/angular'],
|
|
44
45
|
'cpy-cli': o3rCorePackageJson.generatorDependencies['cpy-cli'],
|
|
46
|
+
'@types/node': o3rCorePackageJson.devDependencies['@types/node'],
|
|
45
47
|
...options.useJest
|
|
46
48
|
? {
|
|
47
49
|
'@angular-builders/jest': o3rCorePackageJson.generatorDependencies['@angular-builders/jest'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IA6E/D,CAAC"}
|
|
@@ -69,7 +69,8 @@ const prepareProject = (options) => {
|
|
|
69
69
|
inManifest: [{
|
|
70
70
|
range: ownPackageJsonContent.devDependencies?.[dep] || ownPackageJsonContent.generatorDependencies?.[dep] || 'latest',
|
|
71
71
|
types: [dependencies_1.NodeDependencyType.Dev]
|
|
72
|
-
}]
|
|
72
|
+
}],
|
|
73
|
+
requireInstall: !options.skipPreCommitChecks && dep === 'husky'
|
|
73
74
|
};
|
|
74
75
|
});
|
|
75
76
|
if (installOtterLinter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|