Skip to content

Commit 08cc46c

Browse files
authored
upgrade vscode lib (#305)
* upgrade vscode lib * fix build * fix build * try build speedups * disable build speedups that don't work
1 parent b3af9b8 commit 08cc46c

File tree

8 files changed

+14
-21
lines changed

8 files changed

+14
-21
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# uses: actions/cache@v2
2020
# with:
2121
# path: ~/.cache/ms-playwright
22-
# key: pw-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
22+
# key: pw-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
2323

2424
# doesn't seem to cause significant speed up, maybe not right conf?
2525
# - name: cache lerna
@@ -28,7 +28,7 @@ jobs:
2828
# path: |
2929
# node_modules
3030
# packages/**/node_modules
31-
# key: lerna-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
31+
# key: lerna-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
3232

3333
- name: Cache node modules
3434
uses: actions/cache@v2
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
# npm cache files are stored in `~/.npm` on Linux/macOS
3939
path: ~/.npm
40-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
40+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./package-lock.json') }}
4141
restore-keys: |
4242
${{ runner.os }}-build-${{ env.cache-name }}-
4343
${{ runner.os }}-build-

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/editor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"ua-parser-js": "^0.7.28",
107107
"unified": "^10.0.1",
108108
"uuid": "^8.3.2",
109-
"vscode-lib": "^0.1.0",
109+
"vscode-lib": "^0.1.2",
110110
"wasm-loader": "^1.3.0",
111111
"web-vitals": "^1.0.1",
112112
"workerize-loader": "^1.3.0",

packages/editor/src/setupTests.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
// expect(element).toHaveTextContent(/react/i)
44
// learn more: https://github.com/testing-library/jest-dom
55
import "@testing-library/jest-dom";
6-
// https://github.com/developit/microbundle/issues/708, otherwise vscode-lib fails
7-
import "regenerator-runtime/runtime.js";
86
import "./runtime/editor/setupTests";

packages/editor/tests/end-to-end/setup/globalSetup.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// https://github.com/developit/microbundle/issues/708, otherwise vscode-lib fails
2-
import "regenerator-runtime/runtime.js";
3-
41
import { FullConfig } from "@playwright/test";
52
import { ensureMatrixIsRunning } from "../../util/startMatrixServer";
63

packages/editor/tests/end-to-end/setup/networkRequestFilter.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { BrowserContext, BrowserContextOptions } from "@playwright/test";
22
import { test as base } from "./scriptSetup";
3-
// https://github.com/developit/microbundle/issues/708, otherwise vscode-lib fails
4-
import "regenerator-runtime/runtime.js";
53
import { uri } from "vscode-lib";
64

75
export function addFilterToBrowserContext(context: BrowserContext) {

packages/engine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"lodash": "^4.17.21",
88
"mobx": "^6.2.0",
99
"react": "^17.0.2",
10-
"vscode-lib": "^0.1.0"
10+
"vscode-lib": "^0.1.2"
1111
},
1212
"devDependencies": {
1313
"@types/jest": "^26.0.22",

packages/engine/src/tests/setupTests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// expect(element).toHaveTextContent(/react/i)
44
// learn more: https://github.com/testing-library/jest-dom
55
// import "@testing-library/jest-dom";
6-
// https://github.com/developit/microbundle/issues/708, otherwise vscode-lib fails
7-
import "regenerator-runtime/runtime.js";
6+
7+
export {};

0 commit comments

Comments
 (0)