@o3r/pipeline 11.5.0-prerelease.3 → 11.5.0-prerelease.31
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.5.0-prerelease.
|
|
3
|
+
"version": "11.5.0-prerelease.31",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -39,15 +39,23 @@
|
|
|
39
39
|
"tslib": "^2.6.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@
|
|
43
|
-
"@o3r/
|
|
42
|
+
"@angular-devkit/schematics": "~18.2.0",
|
|
43
|
+
"@o3r/schematics": "^11.5.0-prerelease.31",
|
|
44
|
+
"@o3r/telemetry": "^11.5.0-prerelease.31",
|
|
45
|
+
"type-fest": "^4.10.2"
|
|
44
46
|
},
|
|
45
47
|
"peerDependenciesMeta": {
|
|
48
|
+
"@angular-devkit/schematics": {
|
|
49
|
+
"optional": true
|
|
50
|
+
},
|
|
46
51
|
"@o3r/schematics": {
|
|
47
52
|
"optional": true
|
|
48
53
|
},
|
|
49
54
|
"@o3r/telemetry": {
|
|
50
55
|
"optional": true
|
|
56
|
+
},
|
|
57
|
+
"type-fest": {
|
|
58
|
+
"optional": true
|
|
51
59
|
}
|
|
52
60
|
},
|
|
53
61
|
"devDependencies": {
|
|
@@ -59,11 +67,11 @@
|
|
|
59
67
|
"@nx/eslint-plugin": "~19.5.0",
|
|
60
68
|
"@nx/jest": "~19.5.0",
|
|
61
69
|
"@nx/js": "~19.5.0",
|
|
62
|
-
"@o3r/build-helpers": "^11.5.0-prerelease.
|
|
63
|
-
"@o3r/eslint-plugin": "^11.5.0-prerelease.
|
|
64
|
-
"@o3r/schematics": "^11.5.0-prerelease.
|
|
65
|
-
"@o3r/telemetry": "^11.5.0-prerelease.
|
|
66
|
-
"@o3r/test-helpers": "^11.5.0-prerelease.
|
|
70
|
+
"@o3r/build-helpers": "^11.5.0-prerelease.31",
|
|
71
|
+
"@o3r/eslint-plugin": "^11.5.0-prerelease.31",
|
|
72
|
+
"@o3r/schematics": "^11.5.0-prerelease.31",
|
|
73
|
+
"@o3r/telemetry": "^11.5.0-prerelease.31",
|
|
74
|
+
"@o3r/test-helpers": "^11.5.0-prerelease.31",
|
|
67
75
|
"@schematics/angular": "~18.2.0",
|
|
68
76
|
"@stylistic/eslint-plugin-ts": "~2.4.0",
|
|
69
77
|
"@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;
|
|
@@ -4,7 +4,7 @@ description: Sets up Node.js and installs dependencies
|
|
|
4
4
|
runs:
|
|
5
5
|
using: "composite"
|
|
6
6
|
steps:
|
|
7
|
-
- uses: actions/setup-node@
|
|
7
|
+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
|
|
8
8
|
with:
|
|
9
9
|
node-version: 20
|
|
10
10
|
cache: <%= packageManager %>
|
|
@@ -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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
|
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 }}
|