@o3r/pipeline 11.4.0-rc.4 → 11.4.0-rc.6
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.6",
|
|
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.6",
|
|
43
|
+
"@o3r/telemetry": "^11.4.0-rc.6"
|
|
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.6",
|
|
63
|
+
"@o3r/eslint-plugin": "^11.4.0-rc.6",
|
|
64
|
+
"@o3r/schematics": "^11.4.0-rc.6",
|
|
65
|
+
"@o3r/telemetry": "^11.4.0-rc.6",
|
|
66
|
+
"@o3r/test-helpers": "^11.4.0-rc.6",
|
|
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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,IAAI,EAA4B,MAAM,4BAA4B,CAAC;AAK1H,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqFtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAQtD,CAAC"}
|
|
@@ -3,8 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const js_yaml_1 = require("js-yaml");
|
|
6
|
-
const path = require("node:path");
|
|
7
6
|
const fs = require("node:fs");
|
|
7
|
+
const path = require("node:path");
|
|
8
|
+
/**
|
|
9
|
+
* Determines if the Yarn version is 2 or higher based on the contents of the .yarnrc.yml file.
|
|
10
|
+
* @param tree tree
|
|
11
|
+
*/
|
|
12
|
+
function isYarn2(tree) {
|
|
13
|
+
const yarnrcPath = '/.yarnrc.yml';
|
|
14
|
+
if (tree.exists(yarnrcPath)) {
|
|
15
|
+
const { yarnPath } = ((0, js_yaml_1.load)(tree.readText(yarnrcPath)) || {});
|
|
16
|
+
return !yarnPath || !/yarn-1\./.test(yarnPath);
|
|
17
|
+
}
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
8
20
|
/**
|
|
9
21
|
* Add an Otter CI pipeline to an Angular Project
|
|
10
22
|
* @param options
|
|
@@ -26,12 +38,14 @@ function ngAddFn(options) {
|
|
|
26
38
|
}
|
|
27
39
|
context.logger.info(`Setting up pipeline for package manager: "${packageManager}" `);
|
|
28
40
|
const setupCommand = packageManager === 'yarn' ? 'yarn install --immutable' : 'npm ci';
|
|
41
|
+
const yarn2 = packageManager === 'yarn' && isYarn2(tree);
|
|
29
42
|
const baseTemplateSource = (0, schematics_1.apply)((0, schematics_1.url)(`./templates/${options.toolchain}`), [
|
|
30
43
|
(0, schematics_1.template)({
|
|
31
44
|
...options,
|
|
32
45
|
packageManager,
|
|
33
46
|
setupCommand,
|
|
34
47
|
actionVersionString,
|
|
48
|
+
yarn2,
|
|
35
49
|
dot: '.'
|
|
36
50
|
}),
|
|
37
51
|
(0, schematics_1.move)(tree.root.path)
|
|
@@ -40,18 +54,14 @@ function ngAddFn(options) {
|
|
|
40
54
|
if (!options.npmRegistry) {
|
|
41
55
|
return tree;
|
|
42
56
|
}
|
|
43
|
-
if (
|
|
57
|
+
if (yarn2) {
|
|
44
58
|
const yarnrcPath = '/.yarnrc.yml';
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
const yarnrcContent = (0, js_yaml_1.load)(tree.readText(yarnrcPath));
|
|
50
|
-
yarnrcContent.npmRegistryServer = options.npmRegistry;
|
|
51
|
-
tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrcContent, { indent: 2 }));
|
|
52
|
-
}
|
|
59
|
+
const yarnrcContent = (0, js_yaml_1.load)(tree.readText(yarnrcPath));
|
|
60
|
+
yarnrcContent.npmRegistryServer = options.npmRegistry;
|
|
61
|
+
tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrcContent, { indent: 2 }));
|
|
53
62
|
}
|
|
54
|
-
else
|
|
63
|
+
else {
|
|
64
|
+
// both npm and yarn 1 use .npmrc for the registry
|
|
55
65
|
const npmrcPath = '/.npmrc';
|
|
56
66
|
if (!tree.exists(npmrcPath)) {
|
|
57
67
|
tree.create(npmrcPath, `registry=${options.npmRegistry}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA0H;AAC1H,qCAAqC;AACrC,8BAA8B;AAC9B,kCAAkC;AAIlC;;;GAGG;AACH,SAAS,OAAO,CAAC,IAAU;IACzB,MAAM,UAAU,GAAG,cAAc,CAAC;IAClC,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAA,cAAI,EAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAA0B,CAAC;QACtF,OAAO,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;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,CAAiE,CAAC;QAC1J,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC;QAC1D,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;QAC1C,MAAM,mBAAmB,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;QAC7F,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YACnD,cAAc,GAAG,UAAU,CAAC,iBAAiB,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1G,CAAC;QAAC,MAAM,CAAC;YACP,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9D,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,cAAc,IAAI,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,QAAQ,CAAC;QACvF,MAAM,KAAK,GAAG,cAAc,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,kBAAkB,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,eAAe,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE;YACxE,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,cAAc;gBACd,YAAY;gBACZ,mBAAmB;gBACnB,KAAK;gBACL,GAAG,EAAE,GAAG;aACT,CAAC;YACF,IAAA,iBAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;SACrB,CAAC,CAAC;QAEH,MAAM,eAAe,GAAS,GAAG,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,UAAU,GAAG,cAAc,CAAC;gBAClC,MAAM,aAAa,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAmC,CAAC;gBACxF,aAAa,CAAC,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;gBACtD,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAA,cAAI,EAAC,aAAa,EAAE,EAAC,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,kDAAkD;gBAClD,MAAM,SAAS,GAAG,SAAS,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC9C,MAAM,eAAe,GAAG,gBAAgB,CAAC;oBACzC,MAAM,eAAe,GAAG,YAAY,OAAO,CAAC,WAAW,EAAE,CAAC;oBAC1D,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC;wBACnD,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC;wBACxD,CAAC,CAAC,GAAG,YAAY,KAAK,eAAe,EAAE,CAAC;oBAC1C,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG;YACZ,IAAA,sBAAS,EAAC,kBAAkB,EAAE,0BAAa,CAAC,SAAS,CAAC;YACtD,eAAe;SAChB,CAAC;QACF,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE3C,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrF,OAAO,MAAM,qCAAO,iBAAiB,GAClC,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,CAAC,IAAI,CAAC;iHAC+F,CAAC,CAAC;IAC/G,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CACrB,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,qCAAqC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CACnG,CAAC;AACN,CAAC,CAAC;AARW,QAAA,KAAK,SAQhB"}
|
|
@@ -6,16 +6,30 @@ runs:
|
|
|
6
6
|
steps:
|
|
7
7
|
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
|
|
8
8
|
with:
|
|
9
|
-
node-version: 20
|
|
10
|
-
cache: <%= packageManager %>
|
|
9
|
+
node-version: 20<% if (packageManager !== 'yarn') { %>
|
|
10
|
+
cache: <%= packageManager %><% } %>
|
|
11
11
|
- name: Enable Corepack
|
|
12
12
|
shell: bash
|
|
13
|
-
run: corepack enable
|
|
14
|
-
- name:
|
|
15
|
-
|
|
13
|
+
run: corepack enable<% if (packageManager === 'yarn') { %>
|
|
14
|
+
- name: Get yarn cache directory path
|
|
15
|
+
shell: bash
|
|
16
|
+
id: yarn-cache-dir-path
|
|
17
|
+
run: echo "dir=$(<% if (yarn2) { %>yarn config get cacheFolder<% } else { %>yarn cache dir<% } %>)" >> $GITHUB_OUTPUT
|
|
18
|
+
- name: Cache dependencies
|
|
19
|
+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
|
|
20
|
+
with:
|
|
21
|
+
path: |
|
|
22
|
+
${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
23
|
+
<% if (yarn2) { %>.yarn/unplugged
|
|
24
|
+
.pnp.cjs
|
|
25
|
+
.pnp.loader.mjs<% } %>
|
|
26
|
+
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
|
|
27
|
+
restore-keys: |
|
|
28
|
+
${{ runner.os }}-yarn
|
|
29
|
+
${{ runner.os }}<% } %>
|
|
30
|
+
- name: Install<% if (npmRegistry) { %>
|
|
16
31
|
env:
|
|
17
32
|
COREPACK_NPM_REGISTRY: <%= npmRegistry %>
|
|
18
|
-
COREPACK_INTEGRITY_KEYS: ""
|
|
19
|
-
<% } %>
|
|
33
|
+
COREPACK_INTEGRITY_KEYS: ""<% } %>
|
|
20
34
|
shell: bash
|
|
21
35
|
run: <%= setupCommand %>
|