Skip to content

Commit 533a239

Browse files
authored
Upgrade to pnpm 7 and node 16 (#799)
1 parent d121751 commit 533a239

File tree

19 files changed

+1381
-439
lines changed

19 files changed

+1381
-439
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: pnpm/[email protected]
1616
with:
17-
version: 6.23.1
17+
version: 7.9.5
1818

1919
- name: Checkout Repo
2020
uses: actions/checkout@main

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: pnpm/[email protected]
1313
with:
14-
version: 6.23.1
14+
version: 7.9.5
1515

1616
- name: Checkout Repo
1717
uses: actions/checkout@main

.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: pnpm/[email protected]
1313
with:
14-
version: 6.23.1
14+
version: 7.9.5
1515

1616
- name: Checkout Repo
1717
uses: actions/checkout@main
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
- uses: pnpm/[email protected]
4343
with:
44-
version: 6.23.1
44+
version: 7.9.5
4545

4646
- name: Checkout Repo
4747
uses: actions/checkout@main

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v14.19.1
1+
v16.17.0

package.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
]
2828
},
2929
"volta": {
30-
"node": "14.16.0"
30+
"node": "16.17.0"
3131
},
3232
"dependencies": {
3333
"@babel/core": "^7.13.10",
@@ -37,16 +37,23 @@
3737
"@changesets/changelog-github": "^0.4.0",
3838
"@changesets/cli": "^2.17.0",
3939
"@manypkg/cli": "^0.19.1",
40-
"@playwright/test": "^1.14.1",
40+
"@playwright/test": "^1.25.1",
4141
"@preconstruct/cli": "^2.0.1",
4242
"@swc/core": "^1.2.112",
43+
"@testing-library/jest-dom": "^5.11.9",
4344
"@types/jest": "^27.0.3",
45+
"@types/testing-library__jest-dom": "^5.14.5",
4446
"@vanilla-extract/babel-plugin": "*",
4547
"babel-jest": "^27.3.1",
4648
"fast-glob": "^3.2.7",
4749
"jest": "^27.3.1",
4850
"prettier": "^2.3.2",
4951
"ts-node": "^10.0.0",
5052
"typescript": "^4.5.0"
53+
},
54+
"pnpm": {
55+
"patchedDependencies": {
56+
57+
}
5158
}
5259
}

packages/babel-plugin/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@
2323
"@babel/core": "^7.13.10",
2424
"@babel/template": "^7.12.13",
2525
"@vanilla-extract/integration": "^5.0.0"
26+
},
27+
"devDependencies": {
28+
"@types/babel__core": "^7.1.19",
29+
"@types/babel__template": "^7.4.1"
2630
}
2731
}

patches/[email protected]

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/dist/evaluateFromFileSystem.js b/dist/evaluateFromFileSystem.js
2+
index 8adee8897407a9d496a31f315bd1341e28e0ab8a..6de8dd8a5b72700f55004ba610f36e9a0d7dc638 100644
3+
--- a/dist/evaluateFromFileSystem.js
4+
+++ b/dist/evaluateFromFileSystem.js
5+
@@ -33,7 +33,10 @@ function createLinker(parentModulePath, fsModule, rootDir, extraGlobals) {
6+
const absPath = path_1.default.join(path_1.default.dirname(parentModulePath), specifier);
7+
if (!getFromSourceModules(specifier, fsModule, rootDir)) {
8+
logging_1.log(`Using external require for ${specifier} from ${parentModulePath}`);
9+
- return require(specifier);
10+
+
11+
+ const absPath = require.resolve(specifier, {paths: [rootDir]})
12+
+
13+
+ return require(absPath);
14+
}
15+
logging_1.log(`Linking ${parentModulePath} to asset ${specifier}`);
16+
return evaluateFromFileSystem(absPath, fsModule, rootDir, extraGlobals);

playwright.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const config: PlaywrightTestConfig = {
55
updateSnapshots: 'none',
66
expect: {
77
toMatchSnapshot: {
8-
threshold: 0.2,
8+
threshold: 0.3,
9+
maxDiffPixelRatio: 0.05,
910
},
1011
},
1112

0 commit comments

Comments
 (0)