@o3r/pipeline 11.4.0-rc.2 → 11.4.0-rc.4
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/pipeline",
|
|
3
|
-
"version": "11.4.0-rc.
|
|
3
|
+
"version": "11.4.0-rc.4",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"tslib": "^2.6.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@o3r/schematics": "^11.4.0-rc.
|
|
43
|
-
"@o3r/telemetry": "^11.4.0-rc.
|
|
42
|
+
"@o3r/schematics": "^11.4.0-rc.4",
|
|
43
|
+
"@o3r/telemetry": "^11.4.0-rc.4"
|
|
44
44
|
},
|
|
45
45
|
"peerDependenciesMeta": {
|
|
46
46
|
"@o3r/schematics": {
|
|
@@ -59,11 +59,11 @@
|
|
|
59
59
|
"@nx/eslint-plugin": "~19.5.0",
|
|
60
60
|
"@nx/jest": "~19.5.0",
|
|
61
61
|
"@nx/js": "~19.5.0",
|
|
62
|
-
"@o3r/build-helpers": "^11.4.0-rc.
|
|
63
|
-
"@o3r/eslint-plugin": "^11.4.0-rc.
|
|
64
|
-
"@o3r/schematics": "^11.4.0-rc.
|
|
65
|
-
"@o3r/telemetry": "^11.4.0-rc.
|
|
66
|
-
"@o3r/test-helpers": "^11.4.0-rc.
|
|
62
|
+
"@o3r/build-helpers": "^11.4.0-rc.4",
|
|
63
|
+
"@o3r/eslint-plugin": "^11.4.0-rc.4",
|
|
64
|
+
"@o3r/schematics": "^11.4.0-rc.4",
|
|
65
|
+
"@o3r/telemetry": "^11.4.0-rc.4",
|
|
66
|
+
"@o3r/test-helpers": "^11.4.0-rc.4",
|
|
67
67
|
"@schematics/angular": "~18.2.0",
|
|
68
68
|
"@stylistic/eslint-plugin-ts": "~2.4.0",
|
|
69
69
|
"@types/jest": "~29.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAC/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAC/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6EtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAQtD,CAAC"}
|
|
@@ -13,9 +13,9 @@ function ngAddFn(options) {
|
|
|
13
13
|
return async (tree, context) => {
|
|
14
14
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
15
15
|
const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
16
|
-
const commitHash = ownPackageJson.
|
|
16
|
+
const commitHash = ownPackageJson.config?.o3r?.commitHash;
|
|
17
17
|
const ownVersion = ownPackageJson.version;
|
|
18
|
-
const actionVersionString = commitHash ? `${commitHash} # v${ownVersion}` : ownVersion
|
|
18
|
+
const actionVersionString = commitHash ? `${commitHash} # v${ownVersion}` : `v${ownVersion}`;
|
|
19
19
|
let packageManager = 'npm';
|
|
20
20
|
try {
|
|
21
21
|
const schematics = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
@@ -53,13 +53,17 @@ function ngAddFn(options) {
|
|
|
53
53
|
}
|
|
54
54
|
else if (packageManager === 'npm') {
|
|
55
55
|
const npmrcPath = '/.npmrc';
|
|
56
|
-
const npmRegistry = `registry=${options.npmRegistry}`;
|
|
57
56
|
if (!tree.exists(npmrcPath)) {
|
|
58
|
-
tree.create(npmrcPath, npmRegistry);
|
|
57
|
+
tree.create(npmrcPath, `registry=${options.npmRegistry}`);
|
|
59
58
|
}
|
|
60
59
|
else {
|
|
61
60
|
const npmrcContent = tree.readText(npmrcPath);
|
|
62
|
-
|
|
61
|
+
const registryPattern = /^registry=.*$/m;
|
|
62
|
+
const newRegistryLine = `registry=${options.npmRegistry}`;
|
|
63
|
+
const newContent = registryPattern.test(npmrcContent)
|
|
64
|
+
? npmrcContent.replace(registryPattern, newRegistryLine)
|
|
65
|
+
: `${npmrcContent}\n${newRegistryLine}`;
|
|
66
|
+
tree.overwrite(npmrcPath, newContent);
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
return tree;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+G;AAE/G,qCAAmC;AACnC,kCAAkC;AAClC,8BAA8B;AAG9B;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAE7C,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,12 +45,12 @@ jobs:
|
|
|
45
45
|
contents: write
|
|
46
46
|
runs-on: <%= runner %>
|
|
47
47
|
outputs:
|
|
48
|
-
nextVersionTag: ${{ steps.
|
|
48
|
+
nextVersionTag: ${{ steps.newVersion.outputs.nextVersionTag }}
|
|
49
49
|
steps:
|
|
50
50
|
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
|
|
51
51
|
- name: New version
|
|
52
52
|
if: github.event_name != 'merge_group'
|
|
53
|
-
id:
|
|
53
|
+
id: newVersion
|
|
54
54
|
uses: AmadeusITGroup/otter/tools/github-actions/new-version@<%= actionVersionString %>
|
|
55
55
|
with:
|
|
56
56
|
defaultBranch: ${{ env.DEFAULT_BRANCH }}
|