@o3r/extractors 13.0.0-next.0 → 13.0.0-next.10

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 (4) hide show
  1. package/package.json +42 -45
  2. package/src/core/wrapper.d.ts.map +1 -1
  3. package/src/core/wrapper.js +1 -5
  4. package/src/core/wrapper.js.map +1 -1
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@o3r/extractors",
3
3
  "main": "./src/public_api.js",
4
4
  "types": "./src/public_api.d.ts",
5
- "version": "13.0.0-next.0",
5
+ "version": "13.0.0-next.10",
6
6
  "publishConfig": {
7
7
  "access": "public"
8
8
  },
@@ -21,13 +21,13 @@
21
21
  "prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist && yarn cpy 'schemas/*.json' 'dist/schemas'"
22
22
  },
23
23
  "peerDependencies": {
24
- "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
25
- "@angular-devkit/core": "^19.0.0",
26
- "@angular-devkit/schematics": "^19.0.0",
27
- "@o3r/core": "^13.0.0-next.0",
28
- "@o3r/schematics": "^13.0.0-next.0",
29
- "@o3r/telemetry": "^13.0.0-next.0",
30
- "@schematics/angular": "^19.0.0",
24
+ "@angular-devkit/architect": ">=0.2000.0 <0.2100.0-0",
25
+ "@angular-devkit/core": "^20.0.0",
26
+ "@angular-devkit/schematics": "^20.0.0",
27
+ "@o3r/core": "^13.0.0-next.10",
28
+ "@o3r/schematics": "^13.0.0-next.10",
29
+ "@o3r/telemetry": "^13.0.0-next.10",
30
+ "@schematics/angular": "^20.0.0",
31
31
  "@yarnpkg/cli": "^4.0.0",
32
32
  "@yarnpkg/core": "^4.1.1",
33
33
  "@yarnpkg/fslib": "^3.1.0",
@@ -36,8 +36,8 @@
36
36
  "globby": "^11.1.0",
37
37
  "semver": "^7.5.2",
38
38
  "ts-node": "~10.9.2",
39
- "type-fest": "^4.10.2",
40
- "typescript": "^5.5.4"
39
+ "type-fest": "^4.30.1",
40
+ "typescript": "^5.8.0"
41
41
  },
42
42
  "peerDependenciesMeta": {
43
43
  "@angular-devkit/schematics": {
@@ -67,9 +67,6 @@
67
67
  "globby": {
68
68
  "optional": true
69
69
  },
70
- "semver": {
71
- "optional": true
72
- },
73
70
  "type-fest": {
74
71
  "optional": true
75
72
  }
@@ -82,50 +79,50 @@
82
79
  "typedoc": "~0.28.0"
83
80
  },
84
81
  "devDependencies": {
85
- "@angular-devkit/architect": "~0.1902.0",
86
- "@angular-devkit/build-angular": "~19.2.0",
87
- "@angular-devkit/core": "~19.2.0",
88
- "@angular-devkit/schematics": "~19.2.0",
89
- "@angular/animations": "~19.2.0",
90
- "@angular/common": "~19.2.0",
91
- "@angular/compiler": "~19.2.0",
92
- "@angular/compiler-cli": "~19.2.0",
93
- "@angular/core": "~19.2.0",
94
- "@angular/platform-browser": "~19.2.0",
95
- "@angular/platform-browser-dynamic": "~19.2.0",
96
- "@babel/core": "~7.27.0",
82
+ "@angular-devkit/architect": "~0.2000.0",
83
+ "@angular-devkit/build-angular": "~20.0.0",
84
+ "@angular-devkit/core": "~20.0.0",
85
+ "@angular-devkit/schematics": "~20.0.0",
86
+ "@angular/animations": "~20.0.0",
87
+ "@angular/common": "~20.0.0",
88
+ "@angular/compiler": "~20.0.0",
89
+ "@angular/compiler-cli": "~20.0.0",
90
+ "@angular/core": "~20.0.0",
91
+ "@angular/platform-browser": "~20.0.0",
92
+ "@angular/platform-browser-dynamic": "~20.0.0",
93
+ "@babel/core": "~7.28.0",
97
94
  "@babel/preset-typescript": "~7.27.0",
98
95
  "@compodoc/compodoc": "^1.1.19",
99
96
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
100
- "@nx/eslint": "~20.8.0",
101
- "@nx/eslint-plugin": "~20.8.0",
102
- "@nx/jest": "~20.8.0",
103
- "@nx/js": "~20.8.0",
104
- "@o3r/build-helpers": "^13.0.0-next.0",
105
- "@o3r/core": "^13.0.0-next.0",
106
- "@o3r/eslint-config": "^13.0.0-next.0",
107
- "@o3r/eslint-plugin": "^13.0.0-next.0",
108
- "@o3r/schematics": "^13.0.0-next.0",
109
- "@o3r/telemetry": "^13.0.0-next.0",
110
- "@o3r/test-helpers": "^13.0.0-next.0",
111
- "@schematics/angular": "~19.2.0",
97
+ "@nx/eslint": "~21.2.0",
98
+ "@nx/eslint-plugin": "~21.2.0",
99
+ "@nx/jest": "~21.2.0",
100
+ "@nx/js": "~21.2.0",
101
+ "@o3r/build-helpers": "^13.0.0-next.10",
102
+ "@o3r/core": "^13.0.0-next.10",
103
+ "@o3r/eslint-config": "^13.0.0-next.10",
104
+ "@o3r/eslint-plugin": "^13.0.0-next.10",
105
+ "@o3r/schematics": "^13.0.0-next.10",
106
+ "@o3r/telemetry": "^13.0.0-next.10",
107
+ "@o3r/test-helpers": "^13.0.0-next.10",
108
+ "@schematics/angular": "~20.0.0",
112
109
  "@stylistic/eslint-plugin": "~3.1.0",
113
110
  "@swc/helpers": "~0.5.0",
114
111
  "@types/jest": "~29.5.2",
115
112
  "@types/node": "^20.0.0",
116
113
  "@types/semver": "^7.3.13",
117
- "@typescript-eslint/parser": "~8.34.0",
114
+ "@typescript-eslint/parser": "~8.37.0",
118
115
  "@yarnpkg/cli": "^4.5.0",
119
116
  "@yarnpkg/core": "^4.1.3",
120
117
  "@yarnpkg/fslib": "^3.1.0",
121
118
  "@yarnpkg/plugin-npm": "^3.0.1",
122
119
  "@yarnpkg/plugin-pack": "^4.0.0",
123
- "angular-eslint": "~19.4.0",
120
+ "angular-eslint": "~20.1.0",
124
121
  "cpy-cli": "^5.0.0",
125
- "eslint": "~9.29.0",
122
+ "eslint": "~9.31.0",
126
123
  "eslint-import-resolver-node": "~0.3.9",
127
124
  "eslint-import-resolver-typescript": "~3.10.0",
128
- "eslint-plugin-import": "~2.31.0",
125
+ "eslint-plugin-import": "~2.32.0",
129
126
  "eslint-plugin-import-newlines": "~1.4.0",
130
127
  "eslint-plugin-jest": "~28.14.0",
131
128
  "eslint-plugin-jsdoc": "~50.8.0",
@@ -138,9 +135,9 @@
138
135
  "jest": "~29.7.0",
139
136
  "jest-environment-jsdom": "~29.7.0",
140
137
  "jest-junit": "~16.0.0",
141
- "jest-preset-angular": "~14.5.0",
138
+ "jest-preset-angular": "~14.6.0",
142
139
  "jsonc-eslint-parser": "~2.4.0",
143
- "nx": "~20.8.0",
140
+ "nx": "~21.2.0",
144
141
  "pid-from-port": "^1.1.3",
145
142
  "rimraf": "^6.0.1",
146
143
  "rxjs": "^7.8.1",
@@ -149,12 +146,12 @@
149
146
  "ts-node": "~10.9.2",
150
147
  "type-fest": "^4.30.1",
151
148
  "typescript": "~5.8.2",
152
- "typescript-eslint": "~8.34.0",
149
+ "typescript-eslint": "~8.37.0",
153
150
  "typescript-json-schema": "^0.65.0",
154
151
  "zone.js": "~0.15.0"
155
152
  },
156
153
  "engines": {
157
- "node": "^20.11.1 || >=22.0.0"
154
+ "node": "^20.19.0 || ^22.12.0 || ^24.0.0"
158
155
  },
159
156
  "builders": "./builders.json",
160
157
  "schematics": "./collection.json",
package/src/core/wrapper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/core/wrapper.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,cAAc,EACf,MAAM,gBAAgB,CAAC;AAaxB;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,EAAE,cAqEjD,CAAC"}
1
+ {"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/core/wrapper.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,cAAc,EACf,MAAM,gBAAgB,CAAC;AAaxB;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,EAAE,cA+DjD,CAAC"}
package/src/core/wrapper.js CHANGED
@@ -31,16 +31,12 @@ const createBuilderWithMetricsIfInstalled = (builderFn) => async (opts, ctx) =>
31
31
  }
32
32
  catch (e) {
33
33
  // Do not throw if `@o3r/telemetry is not installed
34
- if (packageJson.config?.o3r?.telemetry
35
- // TODO `o3rMetrics` is deprecated and will be removed in v13
36
- || packageJson.config?.o3rMetrics === true) {
34
+ if (packageJson.config?.o3r?.telemetry) {
37
35
  ctx.logger.info('`config.o3r.telemetry` is set in your package.json, please install the telemetry package with `ng add @o3r/telemetry` to enable the collection of metrics.');
38
36
  }
39
37
  else if (!isInCI()
40
38
  && (process.env.NX_CLI_SET !== 'true' || process.env.NX_INTERACTIVE === 'true')
41
39
  && packageJson.config?.o3r?.telemetry !== false
42
- // TODO `o3rMetrics` is deprecated and will be removed in v13
43
- && packageJson.config?.o3rMetrics !== false
44
40
  && process.env.O3R_METRICS !== 'false'
45
41
  && opts.o3rMetrics !== false) {
46
42
  ctx.logger.debug('`@o3r/telemetry` is not available.\nAsking to add the dependency\n' + e.toString());
package/src/core/wrapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/core/wrapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/core/wrapper.ts"],"names":[],"mappings":"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"}