@o3r/workspace 12.1.0-prerelease.85 → 12.1.0-prerelease.86
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/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +14 -14
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/ng-add/schema.d.ts +4 -0
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/schematics/ng-add/schema.json +8 -0
- package/schematics/rule-factories/index.d.ts +0 -1
- package/schematics/rule-factories/index.d.ts.map +1 -1
- package/schematics/rule-factories/index.js +0 -1
- package/schematics/rule-factories/index.js.map +1 -1
- package/schematics/rule-factories/linter.d.ts +0 -14
- package/schematics/rule-factories/linter.d.ts.map +0 -1
- package/schematics/rule-factories/linter.js +0 -34
- package/schematics/rule-factories/linter.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "12.1.0-prerelease.
|
|
3
|
+
"version": "12.1.0-prerelease.86",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@angular/common": "^19.0.0",
|
|
43
43
|
"@angular/compiler-cli": "^19.0.0",
|
|
44
44
|
"@angular/core": "^19.0.0",
|
|
45
|
-
"@o3r/telemetry": "^12.1.0-prerelease.
|
|
45
|
+
"@o3r/telemetry": "^12.1.0-prerelease.86",
|
|
46
46
|
"@schematics/angular": "^19.0.0",
|
|
47
47
|
"ts-node": "~10.9.2",
|
|
48
48
|
"type-fest": "^4.10.2",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
}
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@o3r/schematics": "^12.1.0-prerelease.
|
|
63
|
+
"@o3r/schematics": "^12.1.0-prerelease.86",
|
|
64
64
|
"commander": "^13.0.0",
|
|
65
65
|
"globby": "^11.1.0",
|
|
66
66
|
"semver": "^7.5.2",
|
|
@@ -93,12 +93,12 @@
|
|
|
93
93
|
"@nx/jest": "~20.4.0",
|
|
94
94
|
"@nx/js": "~20.4.0",
|
|
95
95
|
"@nx/workspace": "~20.4.0",
|
|
96
|
-
"@o3r/build-helpers": "^12.1.0-prerelease.
|
|
97
|
-
"@o3r/core": "^12.1.0-prerelease.
|
|
98
|
-
"@o3r/eslint-plugin": "^12.1.0-prerelease.
|
|
99
|
-
"@o3r/schematics": "^12.1.0-prerelease.
|
|
100
|
-
"@o3r/telemetry": "^12.1.0-prerelease.
|
|
101
|
-
"@o3r/test-helpers": "^12.1.0-prerelease.
|
|
96
|
+
"@o3r/build-helpers": "^12.1.0-prerelease.86",
|
|
97
|
+
"@o3r/core": "^12.1.0-prerelease.86",
|
|
98
|
+
"@o3r/eslint-plugin": "^12.1.0-prerelease.86",
|
|
99
|
+
"@o3r/schematics": "^12.1.0-prerelease.86",
|
|
100
|
+
"@o3r/telemetry": "^12.1.0-prerelease.86",
|
|
101
|
+
"@o3r/test-helpers": "^12.1.0-prerelease.86",
|
|
102
102
|
"@schematics/angular": "~19.2.0",
|
|
103
103
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
104
104
|
"@types/jest": "~29.5.2",
|
|
@@ -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;
|
|
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;AA+BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,KAAG,IAgF/D,CAAC"}
|
|
@@ -6,7 +6,6 @@ const path = require("node:path");
|
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
8
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
9
|
-
const linter_1 = require("../rule-factories/linter");
|
|
10
9
|
const commit_hooks_1 = require("./helpers/commit-hooks");
|
|
11
10
|
const gitignore_update_1 = require("./helpers/gitignore-update");
|
|
12
11
|
const npm_workspace_1 = require("./helpers/npm-workspace");
|
|
@@ -29,10 +28,18 @@ const updateEditorConfig = (tree) => {
|
|
|
29
28
|
* @param options installation options to pass to the all the other packages' installation
|
|
30
29
|
*/
|
|
31
30
|
const prepareProject = (options) => {
|
|
31
|
+
let hasEslint = false;
|
|
32
|
+
try {
|
|
33
|
+
const eslintPackage = 'eslint';
|
|
34
|
+
require.resolve(eslintPackage);
|
|
35
|
+
hasEslint = true;
|
|
36
|
+
}
|
|
37
|
+
catch { }
|
|
32
38
|
const vsCodeExtensions = [
|
|
33
39
|
'AmadeusITGroup.otter-devtools',
|
|
34
40
|
'EditorConfig.EditorConfig',
|
|
35
|
-
'angular.ng-template'
|
|
41
|
+
'angular.ng-template',
|
|
42
|
+
...hasEslint ? ['dbaeumer.vscode-eslint'] : []
|
|
36
43
|
];
|
|
37
44
|
const otterDependencies = [
|
|
38
45
|
'@ama-sdk/core',
|
|
@@ -45,15 +52,11 @@ const prepareProject = (options) => {
|
|
|
45
52
|
const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
|
|
46
53
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
|
|
47
54
|
const ownPackageJsonContent = JSON.parse(fs.readFileSync(ownPackageJsonPath, { encoding: 'utf8' }));
|
|
48
|
-
return
|
|
55
|
+
return (tree, context) => {
|
|
49
56
|
if (!ownPackageJsonContent) {
|
|
50
57
|
context.logger.error('Could not find @o3r/workspace package. Are you sure it is installed?');
|
|
51
58
|
}
|
|
52
|
-
const
|
|
53
|
-
const internalPackagesToInstallWithNgAdd = Array.from(new Set([
|
|
54
|
-
...(installOtterLinter ? [`@o3r/eslint-config${(0, linter_1.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
|
|
55
|
-
...depsInfo.o3rPeerDeps
|
|
56
|
-
]));
|
|
59
|
+
const internalPackagesToInstallWithNgAdd = depsInfo.o3rPeerDeps;
|
|
57
60
|
const dependencies = [...internalPackagesToInstallWithNgAdd, ...otterDependencies].reduce((acc, dep) => {
|
|
58
61
|
acc[dep] = {
|
|
59
62
|
inManifest: [{
|
|
@@ -73,15 +76,12 @@ const prepareProject = (options) => {
|
|
|
73
76
|
requireInstall: !options.skipPreCommitChecks && dep === 'husky'
|
|
74
77
|
};
|
|
75
78
|
});
|
|
76
|
-
if (installOtterLinter) {
|
|
77
|
-
vsCodeExtensions.push('dbaeumer.vscode-eslint');
|
|
78
|
-
}
|
|
79
79
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
80
80
|
return () => (0, schematics_1.chain)([
|
|
81
|
-
(0, renovate_1.generateRenovateConfig)(__dirname),
|
|
81
|
+
options.skipRenovate ? (0, schematics_1.noop)() : (0, renovate_1.generateRenovateConfig)(__dirname),
|
|
82
82
|
...(options.skipPreCommitChecks ? [] : [(0, commit_hooks_1.generateCommitLintConfig)()]),
|
|
83
83
|
updateEditorConfig,
|
|
84
|
-
(0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
|
|
84
|
+
options.skipVscodeTools ? (0, schematics_1.noop)() : (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
|
|
85
85
|
(0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
|
|
86
86
|
npm_workspace_1.filterPackageJsonScripts,
|
|
87
87
|
(0, schematics_2.setupDependencies)({
|
|
@@ -99,7 +99,7 @@ const prepareProject = (options) => {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
}),
|
|
102
|
-
!options.skipLinter &&
|
|
102
|
+
!options.skipLinter && hasEslint ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
|
|
103
103
|
(0, npm_workspace_1.addWorkspacesToProject)(),
|
|
104
104
|
(0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager)
|
|
105
105
|
])(tree, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,gDAOyB;AACzB,2EAEkD;AAIlD,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,9 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
|
19
19
|
exactO3rVersion?: boolean;
|
|
20
20
|
/** Monorepo manager to use */
|
|
21
21
|
monorepoManager: MonorepoManager;
|
|
22
|
+
/** Skip adding VSCode tools */
|
|
23
|
+
skipVscodeTools?: boolean;
|
|
24
|
+
/** Skip adding Renovate config */
|
|
25
|
+
skipRenovate?: boolean;
|
|
22
26
|
}
|
|
23
27
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,uFAAuF;IACvF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,uFAAuF;IACvF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;IAEjC,+BAA+B;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,kCAAkC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
|
|
@@ -62,6 +62,14 @@
|
|
|
62
62
|
"lerna",
|
|
63
63
|
"none"
|
|
64
64
|
]
|
|
65
|
+
},
|
|
66
|
+
"skipVscodeTools": {
|
|
67
|
+
"type": "boolean",
|
|
68
|
+
"description": "Skip adding VSCode tools"
|
|
69
|
+
},
|
|
70
|
+
"skipRenovate": {
|
|
71
|
+
"type": "boolean",
|
|
72
|
+
"description": "Skip adding Renovate config"
|
|
65
73
|
}
|
|
66
74
|
},
|
|
67
75
|
"additionalProperties": true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import type { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
|
-
/**
|
|
3
|
-
* If the ESLint FlatConfig is used in the repository
|
|
4
|
-
* @param tree
|
|
5
|
-
*/
|
|
6
|
-
export declare const isUsingFlatConfig: (tree: Tree) => boolean;
|
|
7
|
-
/**
|
|
8
|
-
* Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
|
|
9
|
-
* Otherwise displays a message to inform the user that otter linter rules can be added later.
|
|
10
|
-
* @param context Schematics context
|
|
11
|
-
* @param tree
|
|
12
|
-
*/
|
|
13
|
-
export declare const shouldOtterLinterBeInstalled: (context: SchematicContext, tree: Tree) => Promise<boolean>;
|
|
14
|
-
//# sourceMappingURL=linter.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,IAAI,YAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,GAAU,SAAS,gBAAgB,EAAE,MAAM,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.shouldOtterLinterBeInstalled = exports.isUsingFlatConfig = void 0;
|
|
4
|
-
const prompt_1 = require("@angular/cli/src/utilities/prompt");
|
|
5
|
-
/**
|
|
6
|
-
* If the ESLint FlatConfig is used in the repository
|
|
7
|
-
* @param tree
|
|
8
|
-
*/
|
|
9
|
-
const isUsingFlatConfig = (tree) => tree.root.subfiles.some((file) => /eslint\.config\.[mc]?[jt]s$/.test(file));
|
|
10
|
-
exports.isUsingFlatConfig = isUsingFlatConfig;
|
|
11
|
-
/**
|
|
12
|
-
* Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
|
|
13
|
-
* Otherwise displays a message to inform the user that otter linter rules can be added later.
|
|
14
|
-
* @param context Schematics context
|
|
15
|
-
* @param tree
|
|
16
|
-
*/
|
|
17
|
-
const shouldOtterLinterBeInstalled = async (context, tree) => {
|
|
18
|
-
const linterPackageName = 'eslint';
|
|
19
|
-
let useOtterLinter = false;
|
|
20
|
-
try {
|
|
21
|
-
require.resolve(`${linterPackageName}/package.json`);
|
|
22
|
-
if (context.interactive) {
|
|
23
|
-
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add Otter config rules for ESLint?
|
|
24
|
-
Otherwise, you can add them later via this command: ng add @o3r/eslint-config${(0, exports.isUsingFlatConfig)(tree) ? '' : '-otter'}`, true);
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
catch {
|
|
28
|
-
context.logger.info(`ESLint package not installed. Skipping otter linter phase!
|
|
29
|
-
You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config`);
|
|
30
|
-
}
|
|
31
|
-
return useOtterLinter;
|
|
32
|
-
};
|
|
33
|
-
exports.shouldOtterLinterBeInstalled = shouldOtterLinterBeInstalled;
|
|
34
|
-
//# sourceMappingURL=linter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":";;;AAAA,8DAE2C;AAM3C;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAAhH,QAAA,iBAAiB,qBAA+F;AAE7H;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAE,IAAU,EAAoB,EAAE;IAC5G,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;+EACkC,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;uGAC+E,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}
|