@o3r/workspace 12.0.0-next.2 → 12.0.0-next.21

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.
Files changed (8) hide show
  1. package/package.json +55 -55
  2. package/schematics/application/index.d.ts.map +1 -1
  3. package/schematics/application/index.js +18 -2
  4. package/schematics/application/index.js.map +1 -1
  5. package/schematics/application/templates/tsconfig.json.template +8 -0
  6. package/schematics/ng-add/project-setup.d.ts.map +1 -1
  7. package/schematics/ng-add/project-setup.js +13 -0
  8. 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": "12.0.0-next.2",
3
+ "version": "12.0.0-next.21",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -15,7 +15,6 @@
15
15
  "build": "yarn nx build workspace",
16
16
  "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
17
17
  "build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
18
- "test": "yarn nx test workspace",
19
18
  "prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist",
20
19
  "prepare:publish": "prepare-publish ./dist",
21
20
  "postbuild": "patch-package-json-main"
@@ -23,15 +22,16 @@
23
22
  "main": "./src/public_api.js",
24
23
  "types": "./src/public_api.d.ts",
25
24
  "peerDependencies": {
26
- "@angular-devkit/architect": "^0.1802.0",
27
- "@angular-devkit/core": "^18.2.0",
28
- "@angular-devkit/schematics": "^18.2.0",
29
- "@angular/cli": "^18.2.0",
30
- "@angular/common": "^18.2.0",
31
- "@angular/compiler-cli": "^18.2.0",
32
- "@angular/core": "^18.2.0",
33
- "@o3r/telemetry": "^12.0.0-next.2",
34
- "@schematics/angular": "^18.2.0",
25
+ "@angular-devkit/architect": "^0.1900.0",
26
+ "@angular-devkit/core": "^19.0.0",
27
+ "@angular-devkit/schematics": "^19.0.0",
28
+ "@angular/cli": "^19.0.0",
29
+ "@angular/common": "^19.0.0",
30
+ "@angular/compiler-cli": "^19.0.0",
31
+ "@angular/core": "^19.0.0",
32
+ "@o3r/telemetry": "^12.0.0-next.21",
33
+ "@schematics/angular": "^19.0.0",
34
+ "ts-node": "~10.9.2",
35
35
  "type-fest": "^4.10.2",
36
36
  "typescript": "^5.5.4"
37
37
  },
@@ -47,54 +47,54 @@
47
47
  }
48
48
  },
49
49
  "dependencies": {
50
- "@o3r/schematics": "^12.0.0-next.2",
50
+ "@o3r/schematics": "^12.0.0-next.21",
51
51
  "commander": "^12.0.0",
52
52
  "globby": "^11.1.0",
53
53
  "semver": "^7.5.2",
54
54
  "tslib": "^2.6.2",
55
- "uuid": "^10.0.0",
55
+ "uuid": "^11.0.5",
56
56
  "winston": "^3.8.2"
57
57
  },
58
58
  "devDependencies": {
59
- "@angular-devkit/architect": "~0.1802.0",
60
- "@angular-devkit/build-angular": "~18.2.0",
61
- "@angular-devkit/core": "~18.2.0",
62
- "@angular-devkit/schematics": "~18.2.0",
63
- "@angular/animations": "~18.2.0",
64
- "@angular/cli": "~18.2.0",
65
- "@angular/common": "~18.2.0",
66
- "@angular/compiler": "~18.2.0",
67
- "@angular/compiler-cli": "~18.2.0",
68
- "@angular/core": "~18.2.0",
69
- "@angular/platform-browser": "~18.2.0",
70
- "@angular/platform-browser-dynamic": "~18.2.0",
71
- "@angular/router": "~18.2.0",
59
+ "@angular-devkit/architect": "~0.1900.0",
60
+ "@angular-devkit/build-angular": "~19.0.0",
61
+ "@angular-devkit/core": "~19.0.0",
62
+ "@angular-devkit/schematics": "~19.0.0",
63
+ "@angular/animations": "~19.0.0",
64
+ "@angular/cli": "~19.0.0",
65
+ "@angular/common": "~19.0.0",
66
+ "@angular/compiler": "~19.0.0",
67
+ "@angular/compiler-cli": "~19.0.0",
68
+ "@angular/core": "~19.0.0",
69
+ "@angular/platform-browser": "~19.0.0",
70
+ "@angular/platform-browser-dynamic": "~19.0.0",
71
+ "@angular/router": "~19.0.0",
72
72
  "@babel/core": "~7.26.0",
73
73
  "@babel/preset-typescript": "~7.26.0",
74
74
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
75
- "@ngrx/entity": "~18.0.0",
76
- "@ngrx/store": "~18.0.0",
77
- "@nx/angular": "~19.8.0",
78
- "@nx/eslint": "~19.8.0",
79
- "@nx/eslint-plugin": "~19.8.0",
80
- "@nx/jest": "~19.8.0",
81
- "@nx/js": "~19.8.0",
82
- "@nx/workspace": "~19.8.0",
83
- "@o3r/build-helpers": "^12.0.0-next.2",
84
- "@o3r/core": "^12.0.0-next.2",
85
- "@o3r/eslint-plugin": "^12.0.0-next.2",
86
- "@o3r/schematics": "^12.0.0-next.2",
87
- "@o3r/test-helpers": "^12.0.0-next.2",
88
- "@schematics/angular": "~18.2.0",
89
- "@stylistic/eslint-plugin": "~2.7.0",
75
+ "@ngrx/entity": "~19.0.0",
76
+ "@ngrx/store": "~19.0.0",
77
+ "@nx/angular": "~20.2.0",
78
+ "@nx/eslint": "~20.2.0",
79
+ "@nx/eslint-plugin": "~20.2.0",
80
+ "@nx/jest": "~20.2.0",
81
+ "@nx/js": "~20.2.0",
82
+ "@nx/workspace": "~20.2.0",
83
+ "@o3r/build-helpers": "^12.0.0-next.21",
84
+ "@o3r/core": "^12.0.0-next.21",
85
+ "@o3r/eslint-plugin": "^12.0.0-next.21",
86
+ "@o3r/schematics": "^12.0.0-next.21",
87
+ "@o3r/test-helpers": "^12.0.0-next.21",
88
+ "@schematics/angular": "~19.0.0",
89
+ "@stylistic/eslint-plugin": "~3.0.0",
90
90
  "@types/jest": "~29.5.2",
91
91
  "@types/minimist": "^1.2.2",
92
92
  "@types/node": "^20.0.0",
93
93
  "@types/pid-from-port": "^1.1.0",
94
94
  "@types/semver": "^7.3.13",
95
- "@types/uuid": "^9.0.0",
96
- "@typescript-eslint/parser": "~8.18.0",
97
- "angular-eslint": "~18.4.0",
95
+ "@types/uuid": "^10.0.0",
96
+ "@typescript-eslint/parser": "~8.21.0",
97
+ "angular-eslint": "~19.0.0",
98
98
  "cpy-cli": "^5.0.0",
99
99
  "eslint": "~9.17.0",
100
100
  "eslint-import-resolver-node": "^0.3.9",
@@ -110,24 +110,24 @@
110
110
  "jest": "~29.7.0",
111
111
  "jest-environment-jsdom": "~29.7.0",
112
112
  "jest-junit": "~16.0.0",
113
- "jest-preset-angular": "~14.2.0",
113
+ "jest-preset-angular": "~14.5.0",
114
114
  "jsonc-eslint-parser": "~2.4.0",
115
115
  "minimist": "^1.2.6",
116
- "nx": "~19.8.0",
116
+ "nx": "~20.2.0",
117
117
  "pid-from-port": "^1.1.3",
118
118
  "rxjs": "^7.8.1",
119
- "ts-jest": "~29.2.0",
119
+ "ts-jest": "~29.2.5",
120
120
  "ts-node": "~10.9.2",
121
- "type-fest": "^4.10.2",
122
- "typescript": "~5.5.4",
123
- "typescript-eslint": "~8.18.0",
124
- "zone.js": "~0.14.2"
121
+ "type-fest": "^4.30.1",
122
+ "typescript": "~5.6.2",
123
+ "typescript-eslint": "~8.21.0",
124
+ "zone.js": "~0.15.0"
125
125
  },
126
126
  "generatorDependencies": {
127
- "@angular/material": "~18.2.0",
128
- "@ngrx/router-store": "~18.0.0",
129
- "@ngrx/effects": "~18.0.0",
130
- "@ngrx/store-devtools": "~18.0.0",
127
+ "@angular/material": "~19.0.0",
128
+ "@ngrx/router-store": "~19.0.0",
129
+ "@ngrx/effects": "~19.0.0",
130
+ "@ngrx/store-devtools": "~19.0.0",
131
131
  "lerna": "^8.1.7"
132
132
  },
133
133
  "engines": {
package/schematics/application/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAyFlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA4GlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
package/schematics/application/index.js CHANGED
@@ -8,6 +8,20 @@ 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
10
  const index_1 = require("../rule-factories/index");
11
+ /**
12
+ * Find the relative path to a configuration file at the monorepo root
13
+ * Note: This function is a duplicate of {@link import('@o3r/schematics').findConfigFileRelativePath} required due to TS Import issue
14
+ * @param tree
15
+ * @param files List of files to look for, the first of the list will be used
16
+ * @param originPath Path from where to calculate the relative path
17
+ */
18
+ function findConfigFileRelativePath(tree, files, originPath) {
19
+ const foundFile = files.find((file) => tree.exists(`/${file}`));
20
+ if (foundFile === undefined) {
21
+ return '';
22
+ }
23
+ return path.posix.relative(originPath, `/${foundFile}`);
24
+ }
11
25
  /**
12
26
  * Add an Otter application to a monorepo
13
27
  * @param options Schematic options
@@ -16,10 +30,11 @@ function generateApplicationFn(options) {
16
30
  const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
17
31
  const packageJsonName = schematics_1.strings.dasherize(options.name);
18
32
  const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
19
- const addProjectSpecificFiles = (targetPath, rootDependencies) => {
33
+ const addProjectSpecificFiles = (targetPath, rootDependencies, tsconfigBasePath) => {
20
34
  return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
21
35
  (0, schematics_1.template)({
22
36
  ...options,
37
+ tsconfigBasePath,
23
38
  enforceTildeRange: schematics_2.enforceTildeRange,
24
39
  name: packageJsonName,
25
40
  rootDependencies
@@ -64,6 +79,7 @@ function generateApplicationFn(options) {
64
79
  ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
65
80
  }
66
81
  };
82
+ const tsconfigBasePath = findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath);
67
83
  return (0, schematics_1.chain)([
68
84
  (0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
69
85
  ...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
@@ -71,7 +87,7 @@ function generateApplicationFn(options) {
71
87
  projectRoot,
72
88
  style: schema_1.Style.Scss
73
89
  }),
74
- addProjectSpecificFiles(targetPath, rootDependencies),
90
+ addProjectSpecificFiles(targetPath, rootDependencies, tsconfigBasePath),
75
91
  (0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
76
92
  (0, schematics_2.setupDependencies)({
77
93
  dependencies,
package/schematics/application/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
package/schematics/application/templates/tsconfig.json.template ADDED
@@ -0,0 +1,8 @@
1
+ /* For IDE usage only */
2
+ {
3
+ "extends": "<%= tsconfigBasePath %>",
4
+ "references": [
5
+ {"path": "./tsconfig.app.json"},
6
+ {"path": "./tsconfig.spec.json"}
7
+ ]
8
+ }
package/schematics/ng-add/project-setup.d.ts.map CHANGED
@@ -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;AAgCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAElB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAyD/D,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;AAgCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IA0D/D,CAAC"}
package/schematics/ng-add/project-setup.js CHANGED
@@ -10,6 +10,18 @@ const gitignore_update_1 = require("./helpers/gitignore-update");
10
10
  const linter_1 = require("./helpers/linter");
11
11
  const npm_workspace_1 = require("./helpers/npm-workspace");
12
12
  const renovate_1 = require("./helpers/renovate");
13
+ const updateEditorConfig = (tree) => {
14
+ const editorconfigPath = '.editorconfig';
15
+ const editorconfig = tree.exists(editorconfigPath) ? tree.readText(editorconfigPath) : '';
16
+ if (editorconfig.includes('end_of_line')) {
17
+ return tree;
18
+ }
19
+ const newEditorconfig = /\[[*]\]/.test(editorconfig)
20
+ ? editorconfig.replace(/(\[[*]\])/, '$1\nend_of_line = lf')
21
+ : editorconfig.concat('[*]\nend_of_line = lf');
22
+ tree.overwrite(editorconfigPath, newEditorconfig);
23
+ return tree;
24
+ };
13
25
  /**
14
26
  * Enable all the otter features requested by the user
15
27
  * Install all the related dependencies and import the features inside the application
@@ -54,6 +66,7 @@ const prepareProject = (options) => {
54
66
  const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
55
67
  return () => (0, schematics_1.chain)([
56
68
  (0, renovate_1.generateRenovateConfig)(__dirname),
69
+ updateEditorConfig,
57
70
  (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
58
71
  (0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
59
72
  npm_workspace_1.filterPackageJsonScripts,
package/schematics/ng-add/project-setup.js.map CHANGED
@@ -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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"}