Skip to content

Commit f005955

Browse files
authored
Merge pull request #1844 from Fryguy/upgrade_yarn
Fix build after merge of Node 18
2 parents 87fef9f + ba245ea commit f005955

File tree

5 files changed

+891
-645
lines changed

5 files changed

+891
-645
lines changed

.yarn/releases/yarn-3.0.2.cjs

Lines changed: 0 additions & 631 deletions
This file was deleted.

.yarn/releases/yarn-3.5.0.cjs

Lines changed: 873 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
enableGlobalCache: true
2+
23
nodeLinker: node-modules
3-
yarnPath: .yarn/releases/yarn-3.0.2.cjs
4+
5+
yarnPath: .yarn/releases/yarn-3.5.0.cjs

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
"version": "1.0.1",
1313
"scripts": {
1414
"available-languages": "cd ./config/ && node available-languages.js",
15-
"build": "yarn build:git-hash && NODE_ENV=\"production\" webpack --bail --progress --profile --config config/webpack.prod.js",
15+
"build": "yarn build:git-hash && NODE_ENV=\"production\" NODE_OPTIONS=\"--openssl-legacy-provider\" webpack --bail --progress --profile --config config/webpack.prod.js",
1616
"build:git-hash": "node config/githash.js",
17-
"build:test": "webpack --bail --progress --config config/webpack.testing.js",
17+
"build:test": "NODE_OPTIONS=\"--openssl-legacy-provider\" webpack --bail --progress --config config/webpack.testing.js",
1818
"gettext:compile": "angular-gettext-cli --compile --files './client/gettext/po/**/*.po' --dest 'client/gettext/json/manageiq-ui-service.json' --format json && yarn available-languages && yarn gettext:validate-language-codes",
1919
"gettext:extract": "angular-gettext-cli --files './client/**/*.+(js|html)' --exclude '**/*.+spec.js' --dest './client/gettext/po/manageiq-ui-service.pot' --marker-names '__,N_'",
2020
"gettext:validate": "yarn node language/validate.js",
2121
"gettext:validate-language-codes": "yarn node language/validate-language-codes.js",
22-
"start": "webpack serve --progress --config config/webpack.dev.js",
22+
"start": "NODE_OPTIONS=\"--openssl-legacy-provider\" webpack serve --progress --config config/webpack.dev.js",
2323
"t": "yarn run build:test && yarn run test:karma",
2424
"test": "yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
2525
"test:karma": "karma start karma.conf.js --single-run",
@@ -137,7 +137,7 @@
137137
"node": ">= 18.0.0",
138138
"npm": ">= 8.6.0"
139139
},
140-
"packageManager": "yarn@3.0.2",
140+
"packageManager": "yarn@3.5.0",
141141
"resolutions": {
142142
"nth-check": "^2.1.1",
143143
"node-sass": "^8.0.0",

yarn.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 4
5+
version: 6
66
cacheKey: 8
77

88
"@ampproject/remapping@npm:^2.2.0":
@@ -31,7 +31,7 @@ __metadata:
3131
languageName: node
3232
linkType: hard
3333

34-
"@babel/core@npm:7.21.0, @babel/core@npm:^7.7.5":
34+
"@babel/core@npm:^7.7.5":
3535
version: 7.21.0
3636
resolution: "@babel/core@npm:7.21.0"
3737
dependencies:
@@ -3454,7 +3454,7 @@ __metadata:
34543454
languageName: node
34553455
linkType: hard
34563456

3457-
"browserslist@npm:4.21.5, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.3, browserslist@npm:^4.21.5":
3457+
"browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.3, browserslist@npm:^4.21.5":
34583458
version: 4.21.5
34593459
resolution: "browserslist@npm:4.21.5"
34603460
dependencies:
@@ -7125,25 +7125,26 @@ fsevents@^1.2.7:
71257125
bindings: ^1.5.0
71267126
nan: ^2.12.1
71277127
checksum: ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1
7128+
conditions: os=darwin
71287129
languageName: node
71297130
linkType: hard
71307131

71317132
"fsevents@patch:fsevents@^1.2.7#~builtin<compat/fsevents>":
71327133
version: 1.2.13
7133-
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=1cc4b2"
7134+
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=d11327"
71347135
dependencies:
71357136
bindings: ^1.5.0
71367137
nan: ^2.12.1
7137-
checksum: b264407498db2cfdcc2a05287334a4160c985a88e4a989e2f2f8dcc6afc8b04a4fcd82c797266442452e11c1fb07d7747d138b078fe4bb1f8f4fd2a6f2484d7e
7138+
conditions: os=darwin
71387139
languageName: node
71397140
linkType: hard
71407141

71417142
"fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
71427143
version: 2.3.2
7143-
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
7144+
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
71447145
dependencies:
71457146
node-gyp: latest
7146-
checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
7147+
conditions: os=darwin
71477148
languageName: node
71487149
linkType: hard
71497150

@@ -7153,6 +7154,7 @@ fsevents@~2.3.2:
71537154
dependencies:
71547155
node-gyp: latest
71557156
checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
7157+
conditions: os=darwin
71567158
languageName: node
71577159
linkType: hard
71587160

@@ -12238,14 +12240,14 @@ fsevents@~2.3.2:
1223812240

1223912241
"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
1224012242
version: 1.22.1
12241-
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=00b1ff"
12243+
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
1224212244
dependencies:
1224312245
is-core-module: ^2.9.0
1224412246
path-parse: ^1.0.7
1224512247
supports-preserve-symlinks-flag: ^1.0.0
1224612248
bin:
1224712249
resolve: bin/resolve
12248-
checksum: d45553550a85af4c6c310a4d9790b60f1fcbdbb1b7ca93f1ad8e06424d69aa6782d59bd93a4c085777baf6159ecc1dbe432299a6027c4837de4db5851a5d3435
12250+
checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
1224912251
languageName: node
1225012252
linkType: hard
1225112253

0 commit comments

Comments
 (0)