Skip to content

Commit 94d2faf

Browse files
committed
Merge pull request #1918 from electrode-io/cuid2-fix-2
Update yarn.lock
2 parents fdadab0 + b31997f commit 94d2faf

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

ern-core/src/Platform.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,20 @@ export default class Platform {
117117
if (this.isYarnInstalled()) {
118118
// Favor yarn if it is installed as it will greatly speed up install
119119
execSync(`yarn init --yes`, { cwd: pathToVersion });
120+
// Inject resolutions field into package.json
121+
const packageJsonPath = path.join(pathToVersion, 'package.json');
122+
if (fs.existsSync(packageJsonPath)) {
123+
const packageJson = JSON.parse(
124+
fs.readFileSync(packageJsonPath, 'utf-8'),
125+
);
126+
packageJson.resolutions = {
127+
'path-loader': '1.0.10',
128+
};
129+
fs.writeFileSync(
130+
packageJsonPath,
131+
JSON.stringify(packageJson, null, 2),
132+
);
133+
}
120134
execSync(
121135
`yarn add ${ERN_LOCAL_CLI_PACKAGE}@${version} --exact --ignore-engines`,
122136
{

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,7 +4176,7 @@ json-refs@^2.1.5:
41764176
graphlib "^2.1.1"
41774177
js-yaml "^3.8.3"
41784178
native-promise-only "^0.8.1"
4179-
path-loader "^1.0.2"
4179+
path-loader "1.0.10"
41804180
slash "^1.0.0"
41814181
uri-js "^3.0.2"
41824182

@@ -5630,7 +5630,7 @@ path-key@^3.0.0, path-key@^3.1.0:
56305630
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
56315631
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
56325632

5633-
path-loader@^1.0.2:
5633+
56345634
version "1.0.10"
56355635
resolved "https://registry.yarnpkg.com/path-loader/-/path-loader-1.0.10.tgz#dd3d1bd54cb6f2e6423af2ad334a41cc0bce4cf6"
56365636
integrity sha512-CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA==

0 commit comments

Comments
 (0)