@o3r/workspace 10.0.0-prerelease.102 → 10.0.0-prerelease.108
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 +7 -7
- package/schematics/application/index.d.ts.map +1 -1
- package/schematics/application/index.js +20 -4
- package/schematics/application/index.js.map +1 -1
- package/schematics/library/index.d.ts.map +1 -1
- package/schematics/library/index.js +21 -6
- package/schematics/library/index.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +17 -14
- 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": "10.0.0-prerelease.
|
|
3
|
+
"version": "10.0.0-prerelease.108",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^10.0.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^10.0.0-prerelease.108",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
"@nx/eslint-plugin": "~18.0.2",
|
|
70
70
|
"@nx/jest": "~18.0.2",
|
|
71
71
|
"@nx/js": "~18.0.2",
|
|
72
|
-
"@o3r/build-helpers": "^10.0.0-prerelease.
|
|
73
|
-
"@o3r/core": "^10.0.0-prerelease.
|
|
74
|
-
"@o3r/eslint-plugin": "^10.0.0-prerelease.
|
|
75
|
-
"@o3r/schematics": "^10.0.0-prerelease.
|
|
76
|
-
"@o3r/test-helpers": "^10.0.0-prerelease.
|
|
72
|
+
"@o3r/build-helpers": "^10.0.0-prerelease.108",
|
|
73
|
+
"@o3r/core": "^10.0.0-prerelease.108",
|
|
74
|
+
"@o3r/eslint-plugin": "^10.0.0-prerelease.108",
|
|
75
|
+
"@o3r/schematics": "^10.0.0-prerelease.108",
|
|
76
|
+
"@o3r/test-helpers": "^10.0.0-prerelease.108",
|
|
77
77
|
"@schematics/angular": "~17.2.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwF,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAG3K,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwF,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAG3K,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAkG5D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
|
|
@@ -4,14 +4,16 @@ exports.generateApplication = void 0;
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const schematics_2 = require("@o3r/schematics");
|
|
6
6
|
const path = require("node:path");
|
|
7
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
7
|
const schema_1 = require("@schematics/angular/application/schema");
|
|
9
8
|
const index_1 = require("../rule-factories/index");
|
|
9
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
|
+
const fs = require("node:fs");
|
|
10
11
|
/**
|
|
11
12
|
* Add an Otter application to a monorepo
|
|
12
13
|
* @param options Schematic options
|
|
13
14
|
*/
|
|
14
15
|
function generateApplicationFn(options) {
|
|
16
|
+
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
|
|
15
17
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
16
18
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
17
19
|
const addProjectSpecificFiles = (targetPath, rootDependencies) => {
|
|
@@ -50,6 +52,17 @@ function generateApplicationFn(options) {
|
|
|
50
52
|
return Object.keys(schemaOptions);
|
|
51
53
|
};
|
|
52
54
|
const angularOptions = getOptions(angularAppSchema);
|
|
55
|
+
const dependencies = {
|
|
56
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
57
|
+
'@o3r/core': {
|
|
58
|
+
inManifest: [
|
|
59
|
+
{
|
|
60
|
+
range: `~${ownPackageJsonContent.version}`,
|
|
61
|
+
types: [dependencies_1.NodeDependencyType.Default]
|
|
62
|
+
}
|
|
63
|
+
]
|
|
64
|
+
}
|
|
65
|
+
};
|
|
53
66
|
return (0, schematics_1.chain)([
|
|
54
67
|
(0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
|
|
55
68
|
...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
|
|
@@ -59,9 +72,12 @@ function generateApplicationFn(options) {
|
|
|
59
72
|
}),
|
|
60
73
|
addProjectSpecificFiles(targetPath, rootDependencies),
|
|
61
74
|
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json'),
|
|
62
|
-
(
|
|
63
|
-
|
|
64
|
-
|
|
75
|
+
(0, schematics_2.setupDependencies)({
|
|
76
|
+
dependencies,
|
|
77
|
+
skipInstall: options.skipInstall,
|
|
78
|
+
ngAddToRun: Object.keys(dependencies),
|
|
79
|
+
projectName: options.name
|
|
80
|
+
})
|
|
65
81
|
])(tree, context);
|
|
66
82
|
};
|
|
67
83
|
return ngCliUpdate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;AAAA,2DAA2K;AAC3K,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAAW,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAAW,MAAM,4BAA4B,CAAC;AAY3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAwDlD;;;GAGG;AACH,eAAO,MAAM,cAAc,2CAA0D,CAAC"}
|
|
@@ -4,15 +4,17 @@ exports.generateModule = void 0;
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const path = require("node:path");
|
|
6
6
|
const schematics_2 = require("@o3r/schematics");
|
|
7
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
7
|
const rules_nx_1 = require("./rules/rules.nx");
|
|
9
8
|
const rules_ng_1 = require("./rules/rules.ng");
|
|
9
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
|
+
const fs = require("node:fs");
|
|
10
11
|
/**
|
|
11
12
|
* Add an Otter compatible module to a monorepo
|
|
12
13
|
* @param options Schematic options
|
|
13
14
|
*/
|
|
14
15
|
function generateModuleFn(options) {
|
|
15
16
|
return (tree, context) => {
|
|
17
|
+
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
|
|
16
18
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
17
19
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
18
20
|
const isNx = (0, schematics_2.isNxContext)(tree);
|
|
@@ -24,15 +26,28 @@ function generateModuleFn(options) {
|
|
|
24
26
|
/** Path to the folder where generate the new module */
|
|
25
27
|
const targetPath = path.posix.resolve('/', options.path || defaultRoot, cleanName);
|
|
26
28
|
const extendedOptions = { ...options, targetPath, name: cleanName, packageJsonName: packageJsonName };
|
|
29
|
+
const dependencies = {
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
31
|
+
'@o3r/core': {
|
|
32
|
+
inManifest: [
|
|
33
|
+
{
|
|
34
|
+
range: `~${ownPackageJsonContent.version}`,
|
|
35
|
+
types: [dependencies_1.NodeDependencyType.Default]
|
|
36
|
+
}
|
|
37
|
+
]
|
|
38
|
+
}
|
|
39
|
+
};
|
|
27
40
|
return (0, schematics_1.chain)([
|
|
28
41
|
isNx ? (0, rules_nx_1.nxGenerateModule)(extendedOptions) : (0, rules_ng_1.ngGenerateModule)(extendedOptions),
|
|
42
|
+
(0, schematics_2.setupDependencies)({
|
|
43
|
+
dependencies,
|
|
44
|
+
skipInstall: options.skipInstall,
|
|
45
|
+
ngAddToRun: Object.keys(dependencies),
|
|
46
|
+
projectName: options.name
|
|
47
|
+
}),
|
|
29
48
|
(t, c) => (0, schematics_1.externalSchematic)('@o3r/core', 'ng-add', { ...options, projectName: extendedOptions.name })(t, c),
|
|
30
49
|
(t, c) => (0, schematics_1.externalSchematic)('@o3r/core', 'ng-add-create', { name: extendedOptions.name, projectName: extendedOptions.name, path: targetPath })(t, c),
|
|
31
|
-
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
|
|
32
|
-
options.skipInstall ? (0, schematics_1.noop)() : (t, c) => {
|
|
33
|
-
c.addTask(new tasks_1.NodePackageInstallTask());
|
|
34
|
-
return t;
|
|
35
|
-
}
|
|
50
|
+
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
|
|
36
51
|
])(tree, context);
|
|
37
52
|
};
|
|
38
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":";;;AAAA,2DAA2F;AAC3F,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.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":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAsD/D,CAAC"}
|
|
@@ -21,6 +21,9 @@ const prepareProject = (options) => {
|
|
|
21
21
|
'EditorConfig.EditorConfig',
|
|
22
22
|
'angular.ng-template'
|
|
23
23
|
];
|
|
24
|
+
const dependenciesToInstall = [
|
|
25
|
+
'@ama-sdk/schematics'
|
|
26
|
+
];
|
|
24
27
|
const ownSchematicsFolder = path.resolve(__dirname, '..');
|
|
25
28
|
const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
|
|
26
29
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
|
|
@@ -29,12 +32,20 @@ const prepareProject = (options) => {
|
|
|
29
32
|
if (!ownPackageJsonContent) {
|
|
30
33
|
context.logger.error('Could not find @o3r/workspace package. Are you sure it is installed?');
|
|
31
34
|
}
|
|
32
|
-
const o3rCoreVersion = ownPackageJsonContent.version;
|
|
33
35
|
const installOtterLinter = await (0, linter_1.shouldOtterLinterBeInstalled)(context);
|
|
34
36
|
const internalPackagesToInstallWithNgAdd = Array.from(new Set([
|
|
35
37
|
...(installOtterLinter ? ['@o3r/eslint-config-otter'] : []),
|
|
36
38
|
...depsInfo.o3rPeerDeps
|
|
37
39
|
]));
|
|
40
|
+
const dependencies = [...internalPackagesToInstallWithNgAdd, ...dependenciesToInstall].reduce((acc, dep) => {
|
|
41
|
+
acc[dep] = {
|
|
42
|
+
inManifest: [{
|
|
43
|
+
range: `~${depsInfo.packageVersion}`,
|
|
44
|
+
types: [dependencies_1.NodeDependencyType.Default]
|
|
45
|
+
}]
|
|
46
|
+
};
|
|
47
|
+
return acc;
|
|
48
|
+
}, {});
|
|
38
49
|
if (installOtterLinter) {
|
|
39
50
|
vsCodeExtensions.push('dbaeumer.vscode-eslint');
|
|
40
51
|
}
|
|
@@ -44,21 +55,13 @@ const prepareProject = (options) => {
|
|
|
44
55
|
(0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
|
|
45
56
|
(0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
|
|
46
57
|
npm_workspace_1.filterPackageJsonScripts,
|
|
47
|
-
(0, schematics_2.
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
dependencyType: dependencies_1.NodeDependencyType.Peer
|
|
52
|
-
}),
|
|
53
|
-
(0, schematics_2.ngAddPackages)(['@ama-sdk/schematics'], {
|
|
54
|
-
skipConfirmation: true,
|
|
55
|
-
version: o3rCoreVersion,
|
|
56
|
-
parentPackageInfo: '@o3r/workspace - setup',
|
|
57
|
-
dependencyType: dependencies_1.NodeDependencyType.Dev
|
|
58
|
+
(0, schematics_2.setupDependencies)({
|
|
59
|
+
dependencies,
|
|
60
|
+
skipInstall: options.skipInstall,
|
|
61
|
+
ngAddToRun: internalPackagesToInstallWithNgAdd
|
|
58
62
|
}),
|
|
59
63
|
!options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
|
|
60
|
-
(0, npm_workspace_1.addWorkspacesToProject)()
|
|
61
|
-
options.skipInstall ? (0, schematics_1.noop)() : schematics_2.install
|
|
64
|
+
(0, npm_workspace_1.addWorkspacesToProject)()
|
|
62
65
|
])(tree, context);
|
|
63
66
|
};
|
|
64
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAC/D,gDAMyB;AAEzB,2EAA8E;AAC9E,8BAA8B;AAC9B,kCAAkC;AAClC,2DAA2F;AAC3F,iDAA4D;AAE5D,6CAAgE;AAChE,iEAA6D;AAE7D;;;;GAIG;AACI,MAAM,cAAc,GAAG,CAAC,OAA8B,EAAQ,EAAE;IACrE,MAAM,gBAAgB,GAAG;QACvB,+BAA+B;QAC/B,2BAA2B;QAC3B,qBAAqB;KACtB,CAAC;IACF,MAAM,qBAAqB,GAAG;QAC5B,qBAAqB;KACtB,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,kBAAkB,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAErG,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,qBAAqB,EAAE;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sEAAsE,CAAC,CAAC;SAC9F;QACD,MAAM,kBAAkB,GAAG,MAAM,IAAA,qCAA4B,EAAC,OAAO,CAAC,CAAC;QACvE,MAAM,kCAAkC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;YAC5D,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,QAAQ,CAAC,WAAW;SACxB,CAAC,CAAC,CAAC;QAEJ,MAAM,YAAY,GAAG,CAAC,GAAG,kCAAkC,EAAE,GAAG,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzG,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,IAAI,QAAQ,CAAC,cAAc,EAAE;wBACpC,KAAK,EAAE,CAAC,iCAAkB,CAAC,OAAO,CAAC;qBACpC,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAE1C,IAAI,kBAAkB,EAAE;YACtB,gBAAgB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;SACjD;QAED,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAEjD,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,IAAA,iCAAsB,EAAC,mBAAmB,CAAC;YAC3C,IAAA,qCAAwB,EAAC,gBAAgB,CAAC;YAC1C,IAAA,kCAAe,EAAC,eAAe,CAAC;YAChC,wCAAwB;YACxB,IAAA,8BAAiB,EAAC;gBAChB,YAAY;gBACZ,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,kCAAkC;aAC/C,CAAC;YACF,CAAC,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACrE,IAAA,sCAAsB,GAAE;SACzB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,cAAc,kBAsDzB"}
|