From 4b1560b6b549324ad6b157aee3f0c3ac869c373e Mon Sep 17 00:00:00 2001 From: Peter Burns Date: Tue, 17 Sep 2024 11:01:38 -0700 Subject: [PATCH 1/2] Update TypeScript to 5.6.2 --- package-lock.json | 8 ++++---- package.json | 2 +- src/playground-code-editor.ts | 6 +++--- src/test/typescript-worker_test.ts | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf1f86ad..c9ea8f9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "rollup-plugin-copy": "^3.3.0", "rollup-plugin-lit-css": "^4.0.0", "semver": "^7.3.5", - "typescript": "~5.4.5", + "typescript": "~5.6.2", "wireit": "^0.14.0" } }, @@ -8583,9 +8583,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 975904ac..53124652 100755 --- a/package.json +++ b/package.json @@ -294,7 +294,7 @@ "rollup-plugin-copy": "^3.3.0", "rollup-plugin-lit-css": "^4.0.0", "semver": "^7.3.5", - "typescript": "~5.4.5", + "typescript": "~5.6.2", "wireit": "^0.14.0" }, "dependencies": { diff --git a/src/playground-code-editor.ts b/src/playground-code-editor.ts index 4010e076..dd3e3289 100644 --- a/src/playground-code-editor.ts +++ b/src/playground-code-editor.ts @@ -43,9 +43,9 @@ interface TypedMap extends Map { get(key: K): T[K]; set(key: K, value: T[K]): this; delete(key: K): boolean; - keys(): IterableIterator; - values(): IterableIterator; - entries(): IterableIterator<{[K in keyof T]: [K, T[K]]}[keyof T]>; + keys(): MapIterator; + values(): MapIterator; + entries(): MapIterator<{[K in keyof T]: [K, T[K]]}[keyof T]>; } export interface CodeEditorHint { diff --git a/src/test/typescript-worker_test.ts b/src/test/typescript-worker_test.ts index 7d2f013b..bcf3ecf8 100644 --- a/src/test/typescript-worker_test.ts +++ b/src/test/typescript-worker_test.ts @@ -89,7 +89,7 @@ suite('typescript builder', () => { name: 'index.js', // TODO(aomarks) This should probably return a 400 error instead of an // empty but valid file. - content: 'export {};\n', + content: '', contentType: 'text/javascript', }, }, @@ -132,7 +132,7 @@ suite('typescript builder', () => { kind: 'file', file: { name: 'index.js', - content: 'let foo = 3;\n' + 'foo = "foo";\nexport {};\n', + content: 'let foo = 3;\n' + 'foo = "foo";\n', contentType: 'text/javascript', }, }, From c57630b5855185f1e9ff43d9ba3a4bc4f509f0ce Mon Sep 17 00:00:00 2001 From: Peter Burns Date: Tue, 17 Sep 2024 11:05:06 -0700 Subject: [PATCH 2/2] Bump node version to 20 --- .github/workflows/deploy-demo.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/version-module.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 12845e45..feeb79aa 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 19 + node-version: 20 cache: npm - uses: google/wireit@setup-github-actions-caching/v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c3e313d0..bffc6ed7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 19 + node-version: 20 cache: npm - uses: google/wireit@setup-github-actions-caching/v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fba168b..e51a08d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 19 + node-version: 20 cache: npm - uses: google/wireit@setup-github-actions-caching/v1 diff --git a/.github/workflows/version-module.yml b/.github/workflows/version-module.yml index 6e390b19..2374f691 100644 --- a/.github/workflows/version-module.yml +++ b/.github/workflows/version-module.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 19 + node-version: 20 cache: npm - uses: google/wireit@setup-github-actions-caching/v1