@o3r/schematics 12.4.0-prerelease.9 → 12.4.0-rc.1
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.
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../cli/environment.ts"],"names":[],"mappings":";;AAAA,gDAE8B;AAE9B,yEAAyE;AACzE,OAAO,CAAC,IAAI,CAAC,4BAA4B,IAAA,mCAA2B,GAAE,EAAE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "12.4.0-
|
|
3
|
+
"version": "12.4.0-rc.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"@angular-devkit/core": "^19.0.0",
|
|
30
30
|
"@angular-devkit/schematics": "^19.0.0",
|
|
31
31
|
"@angular/cli": "^19.0.0",
|
|
32
|
-
"@o3r/core": "^12.4.0-
|
|
33
|
-
"@o3r/telemetry": "^12.4.0-
|
|
32
|
+
"@o3r/core": "^12.4.0-rc.1",
|
|
33
|
+
"@o3r/telemetry": "^12.4.0-rc.1",
|
|
34
34
|
"@schematics/angular": "^19.0.0",
|
|
35
35
|
"eslint": "^9.14.0",
|
|
36
36
|
"rxjs": "^7.8.1",
|
|
@@ -96,26 +96,26 @@
|
|
|
96
96
|
"@nx/eslint-plugin": "~20.8.0",
|
|
97
97
|
"@nx/jest": "~20.8.0",
|
|
98
98
|
"@nx/js": "~20.8.0",
|
|
99
|
-
"@o3r/build-helpers": "^12.4.0-
|
|
100
|
-
"@o3r/eslint-plugin": "^12.4.0-
|
|
101
|
-
"@o3r/telemetry": "^12.4.0-
|
|
102
|
-
"@o3r/test-helpers": "^12.4.0-
|
|
99
|
+
"@o3r/build-helpers": "^12.4.0-rc.1",
|
|
100
|
+
"@o3r/eslint-plugin": "^12.4.0-rc.1",
|
|
101
|
+
"@o3r/telemetry": "^12.4.0-rc.1",
|
|
102
|
+
"@o3r/test-helpers": "^12.4.0-rc.1",
|
|
103
103
|
"@schematics/angular": "~19.2.0",
|
|
104
104
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
105
105
|
"@swc/helpers": "~0.5.0",
|
|
106
106
|
"@types/jest": "~29.5.2",
|
|
107
107
|
"@types/node": "^20.0.0",
|
|
108
108
|
"@types/semver": "^7.3.13",
|
|
109
|
-
"@typescript-eslint/parser": "~8.
|
|
109
|
+
"@typescript-eslint/parser": "~8.34.0",
|
|
110
110
|
"angular-eslint": "~19.4.0",
|
|
111
111
|
"cpy-cli": "^5.0.0",
|
|
112
|
-
"eslint": "~9.
|
|
112
|
+
"eslint": "~9.28.0",
|
|
113
113
|
"eslint-import-resolver-node": "~0.3.9",
|
|
114
114
|
"eslint-import-resolver-typescript": "~3.10.0",
|
|
115
115
|
"eslint-plugin-import": "~2.31.0",
|
|
116
116
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
117
|
-
"eslint-plugin-jest": "~28.
|
|
118
|
-
"eslint-plugin-jsdoc": "~50.
|
|
117
|
+
"eslint-plugin-jest": "~28.13.0",
|
|
118
|
+
"eslint-plugin-jsdoc": "~50.7.0",
|
|
119
119
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
120
120
|
"eslint-plugin-unicorn": "~56.0.0",
|
|
121
121
|
"eslint-plugin-unused-imports": "~4.1.4",
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"ts-node": "~10.9.2",
|
|
131
131
|
"type-fest": "^4.30.1",
|
|
132
132
|
"typescript": "~5.8.2",
|
|
133
|
-
"typescript-eslint": "~8.
|
|
133
|
+
"typescript-eslint": "~8.34.0",
|
|
134
134
|
"zone.js": "~0.15.0"
|
|
135
135
|
},
|
|
136
136
|
"engines": {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAIlC,2EAEkD;AAClD,qDAK8B;AAK9B;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,MAAM,sBAAsB,GAAG,CAAC,2BAA2B,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IACpJ,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;QACpB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,gDAAmC,EAAC,sBAAsB,EAAE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7J,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK;wBACL,KAAK,EAAE,CAAC,iCAAkB,CAAC,GAAG,CAAC;qBAChC,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,IAAA,gDAAmC,EAAC,sBAAsB,EAAE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;aACzG,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACxB,YAAY,CAAC,GAAG,CAAC,GAAG;gBAClB,UAAU,EAAE,CAAC;wBACX,KAAK;wBACL,KAAK,EAAE,CAAC,iCAAkB,CAAC,GAAG,CAAC;qBAChC,CAAC;aACH,CAAC;QACJ,CAAC,CAAC,CAAC;QACL,OAAO,IAAA,8BAAiB,EAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY;YACZ,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAuDxB;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA0CnD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,aAAa,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,2BAAgG,CAAC"}
|
package/src/utility/wrapper.js
CHANGED
|
@@ -10,6 +10,7 @@ const dependencies_2 = require("../rule-factories/ng-add/dependencies");
|
|
|
10
10
|
const index_1 = require("../rule-factories/options/index");
|
|
11
11
|
const noopSchematicWrapper = (fn) => fn;
|
|
12
12
|
const PACKAGE_JSON_PATH = 'package.json';
|
|
13
|
+
const ENV_VAR_LIST = ['CI', 'CONTINUOUS_INTEGRATION'];
|
|
13
14
|
const setupO3rMetricsInPackageJson = (activated) => (tree) => {
|
|
14
15
|
if (tree.exists(PACKAGE_JSON_PATH)) {
|
|
15
16
|
const packageJson = tree.readJson(PACKAGE_JSON_PATH);
|
|
@@ -19,6 +20,12 @@ const setupO3rMetricsInPackageJson = (activated) => (tree) => {
|
|
|
19
20
|
tree.overwrite(PACKAGE_JSON_PATH, JSON.stringify(packageJson, null, 2));
|
|
20
21
|
}
|
|
21
22
|
};
|
|
23
|
+
const enVarValueCheck = (value) => !!value && value !== 'false' && value !== '0';
|
|
24
|
+
const isInCI = () => {
|
|
25
|
+
return ENV_VAR_LIST.some((label) => enVarValueCheck(process.env[label]))
|
|
26
|
+
|| Object.entries(process.env).some(([envVar, value]) => envVar.startsWith('CI_') && enVarValueCheck(value))
|
|
27
|
+
|| !process.stdin.isTTY;
|
|
28
|
+
};
|
|
22
29
|
const setupTelemetry = ({ workingDirectory, runNgAdd, exactO3rVersion }) => (_, context) => {
|
|
23
30
|
const taskIdsFromContext = (0, dependencies_2.hasSetupInformation)(context) ? context.setupDependencies.taskIds : undefined;
|
|
24
31
|
const version = JSON.parse((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', 'package.json'), 'utf8')).version;
|
|
@@ -58,7 +65,7 @@ const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (
|
|
|
58
65
|
&& typeof packageJson.config?.o3r?.telemetry === 'undefined'
|
|
59
66
|
&& process.env.O3R_METRICS !== 'false'
|
|
60
67
|
&& opts.o3rMetrics !== false
|
|
61
|
-
&& (
|
|
68
|
+
&& !isInCI()) {
|
|
62
69
|
context.logger.debug('`@o3r/telemetry` is not available.\nAsking to add the dependency\n' + e.toString());
|
|
63
70
|
shouldInstallTelemetry = await (0, confirm_1.default)({
|
|
64
71
|
message: `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAIlC,2DAKoC;AACpC,+CAAwC;AAIxC,2EAEkD;AAClD,wEAG+C;AAC/C,2DAEyC;AAEzC,MAAM,oBAAoB,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAE1D,MAAM,iBAAiB,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"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"}
|