@o3r/telemetry 13.0.0-next.0 → 13.0.0-next.2

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 (10) hide show
  1. package/package.json +8 -8
  2. package/src/builders/index.d.ts.map +1 -1
  3. package/src/builders/index.js +1 -9
  4. package/src/builders/index.js.map +1 -1
  5. package/src/cli/index.d.ts.map +1 -1
  6. package/src/cli/index.js +1 -9
  7. package/src/cli/index.js.map +1 -1
  8. package/src/schematics/index.d.ts.map +1 -1
  9. package/src/schematics/index.js +1 -9
  10. package/src/schematics/index.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/telemetry",
3
- "version": "13.0.0-next.0",
3
+ "version": "13.0.0-next.2",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -24,7 +24,7 @@
24
24
  "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
25
25
  "@angular-devkit/core": "^19.0.0",
26
26
  "@angular-devkit/schematics": "^19.0.0",
27
- "@o3r/core": "^13.0.0-next.0",
27
+ "@o3r/core": "^13.0.0-next.2",
28
28
  "rxjs": "^7.8.1"
29
29
  },
30
30
  "peerDependenciesMeta": {
@@ -52,20 +52,20 @@
52
52
  "@nx/eslint-plugin": "~20.8.0",
53
53
  "@nx/jest": "~20.8.0",
54
54
  "@nx/js": "~20.8.0",
55
- "@o3r/build-helpers": "^13.0.0-next.0",
56
- "@o3r/eslint-plugin": "^13.0.0-next.0",
57
- "@o3r/test-helpers": "^13.0.0-next.0",
55
+ "@o3r/build-helpers": "^13.0.0-next.2",
56
+ "@o3r/eslint-plugin": "^13.0.0-next.2",
57
+ "@o3r/test-helpers": "^13.0.0-next.2",
58
58
  "@stylistic/eslint-plugin": "~3.1.0",
59
59
  "@types/jest": "~29.5.2",
60
60
  "@types/minimist": "^1.2.2",
61
61
  "@types/node": "^20.0.0",
62
- "@typescript-eslint/parser": "~8.34.0",
62
+ "@typescript-eslint/parser": "~8.35.0",
63
63
  "angular-eslint": "~19.4.0",
64
64
  "cpy-cli": "^5.0.0",
65
65
  "eslint": "~9.29.0",
66
66
  "eslint-import-resolver-node": "~0.3.9",
67
67
  "eslint-import-resolver-typescript": "~3.10.0",
68
- "eslint-plugin-import": "~2.31.0",
68
+ "eslint-plugin-import": "~2.32.0",
69
69
  "eslint-plugin-import-newlines": "~1.4.0",
70
70
  "eslint-plugin-jest": "~28.14.0",
71
71
  "eslint-plugin-jsdoc": "~50.8.0",
@@ -81,7 +81,7 @@
81
81
  "ts-jest": "~29.3.0",
82
82
  "ts-node": "~10.9.2",
83
83
  "typescript": "~5.8.2",
84
- "typescript-eslint": "~8.34.0"
84
+ "typescript-eslint": "~8.35.0"
85
85
  },
86
86
  "schematics": "./collection.json",
87
87
  "ng-update": {
package/src/builders/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACd,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,IAC9D,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9J;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,cAmEpC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACd,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,IAC9D,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9J;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,cA4DpC,CAAC"}
package/src/builders/index.js CHANGED
@@ -54,15 +54,7 @@ const createBuilderWithMetrics = (builderFn, sendData = index_2.sendData) => asy
54
54
  const packageJson = (0, node_fs_1.existsSync)(packageJsonPath) ? JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf8')) : {};
55
55
  const shouldSendData = !!(options.o3rMetrics
56
56
  ?? ((process.env.O3R_METRICS || '').length > 0 ? process.env.O3R_METRICS !== 'false' : undefined)
57
- ?? packageJson.config?.o3r?.telemetry
58
- ?? packageJson.config?.o3rMetrics // deprecated will be removed in v13
59
- );
60
- if (typeof packageJson.config?.o3rMetrics !== 'undefined') {
61
- context.logger.warn([
62
- '`config.o3rMetrics` is deprecated and will be removed in v13, please use `config.o3r.telemetry` instead.',
63
- 'You can run `ng update @o3r/telemetry` to have the automatic update.'
64
- ].join('\n'));
65
- }
57
+ ?? packageJson.config?.o3r?.telemetry);
66
58
  if (shouldSendData) {
67
59
  if (typeof (options.o3rMetrics ?? process.env.O3R_METRICS) === 'undefined') {
68
60
  context.logger.info('Telemetry is globally activated for the project (`config.o3r.telemetry` in package.json). '
package/src/builders/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"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"}
package/src/cli/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,IAAI,eAAe,EACxB,MAAM,UAAU,CAAC;AAIlB,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAEnB,8BAA8B;AAC9B,UAAU,MAAM;IACd,+BAA+B;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,+BAA+B;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,qCAAqC;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,uCAAuC;IACvC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,yCAAyC;AACzC,UAAU,iBAAiB;IACzB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,yDAAyD;IACzD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,EACvD,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAC3F,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD,eAAO,MAAM,oBAAoB,EAAE,UA0DlC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,IAAI,eAAe,EACxB,MAAM,UAAU,CAAC;AAIlB,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAEnB,8BAA8B;AAC9B,UAAU,MAAM;IACd,+BAA+B;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,+BAA+B;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,qCAAqC;IACrC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,uCAAuC;IACvC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,yCAAyC;AACzC,UAAU,iBAAiB;IACzB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,yDAAyD;IACzD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,EACvD,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAC3F,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD,eAAO,MAAM,oBAAoB,EAAE,UAmDlC,CAAC"}
package/src/cli/index.js CHANGED
@@ -42,15 +42,7 @@ const createCliWithMetrics = (cliFn, cliName, options) => async (...cliFnArgs) =
42
42
  const packageJson = (0, node_fs_1.existsSync)(packageJsonPath) ? JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf8')) : {};
43
43
  const shouldSendData = !!(argv.o3rMetrics
44
44
  ?? ((process.env.O3R_METRICS || '').length > 0 ? process.env.O3R_METRICS !== 'false' : undefined)
45
- ?? packageJson.config?.o3r?.telemetry
46
- ?? packageJson.config?.o3rMetrics // deprecated will be removed in v13
47
- );
48
- if (typeof packageJson.config?.o3rMetrics !== 'undefined') {
49
- logger.warn([
50
- '`config.o3rMetrics` is deprecated and will be removed in v13, please use `config.o3r.telemetry` instead.',
51
- 'You can run `ng update @o3r/telemetry` to have the automatic update.'
52
- ].join('\n'));
53
- }
45
+ ?? packageJson.config?.o3r?.telemetry);
54
46
  if (shouldSendData) {
55
47
  if (typeof (argv.o3rMetrics ?? process.env.O3R_METRICS) === 'undefined') {
56
48
  logger.info('Telemetry is globally activated for the project (`config.o3r.telemetry` in package.json). '
package/src/cli/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}
package/src/schematics/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAEvH;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,EAAE,gBAwDxC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAEvH;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,EAAE,gBAiDxC,CAAC"}
package/src/schematics/index.js CHANGED
@@ -42,15 +42,7 @@ const createSchematicWithMetrics = (schematicFn, sendData = index_2.sendData) =>
42
42
  const packageJson = (tree.exists('/package.json') ? tree.readJson('/package.json') : {});
43
43
  const shouldSendData = !!(options.o3rMetrics
44
44
  ?? ((process.env.O3R_METRICS || '').length > 0 ? process.env.O3R_METRICS !== 'false' : undefined)
45
- ?? packageJson.config?.o3r?.telemetry
46
- ?? packageJson.config?.o3rMetrics // deprecated will be removed in v13
47
- );
48
- if (typeof packageJson.config?.o3rMetrics !== 'undefined') {
49
- context.logger.warn([
50
- '`config.o3rMetrics` is deprecated and will be removed in v13, please use `config.o3r.telemetry` instead.',
51
- 'You can run `ng update @o3r/telemetry` to have the automatic update.'
52
- ].join('\n'));
53
- }
45
+ ?? packageJson.config?.o3r?.telemetry);
54
46
  if (shouldSendData) {
55
47
  if (typeof (options.o3rMetrics ?? process.env.O3R_METRICS) === 'undefined') {
56
48
  context.logger.info('Telemetry is globally activated for the project (`config.o3r.telemetry` in package.json). '
package/src/schematics/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"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"}