Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump typescript => 5.2.2; migrate to ESM #1979

Merged
merged 103 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
31878b6
bump typescript => 5.2.2
pokey Oct 27, 2023
729472d
Fixes to satisfy new typescript
pokey Oct 27, 2023
8797571
more flailing
pokey Oct 27, 2023
6317473
More bumps
pokey Oct 27, 2023
8cfcaa7
Switch to moduleResolution bundler
pokey Oct 27, 2023
5b106ce
Prettier cleanup
pokey Oct 27, 2023
39da3e2
try adding type module to package json
pokey Oct 27, 2023
2ffa7fa
tweak webpack
pokey Oct 27, 2023
bb8a2d7
more fix
pokey Oct 27, 2023
ce519ae
more flailing
pokey Oct 27, 2023
6503a82
revert type module
pokey Oct 27, 2023
7364473
fix meta-updater
pokey Oct 27, 2023
ef98d34
remove extraneous config
pokey Oct 27, 2023
6a20279
cleanup
pokey Oct 27, 2023
c8b009a
whoops
pokey Oct 27, 2023
a458c7f
don't run on generated code
pokey Oct 27, 2023
fccda9a
Merge branch 'main' into pokey/bump-typescript-greater-522
pokey Nov 2, 2023
57fed2f
Merge branch 'main' into pokey/bump-typescript-greater-522
pokey Nov 6, 2023
abe10d1
Revert to last passing commit 8797571
pokey Nov 6, 2023
804a9b1
Attempt to simplify
pokey Nov 6, 2023
a69157f
Attempt to use bundler and esm again
pokey Nov 6, 2023
8c7a5b4
Failed attempt to bundle extensionTests
pokey Oct 27, 2023
424e0ce
Attempt to fix things
pokey Nov 6, 2023
d55da1d
Some progress
pokey Nov 6, 2023
c364c05
Passing tests locally
pokey Nov 6, 2023
9402136
working my-ts-node without source maps
pokey Nov 7, 2023
638dca4
generate tmp file instead of using process substitution
pokey Nov 7, 2023
b5d70f1
my-ts-node with working source maps
pokey Nov 7, 2023
f557ebe
Get all scripts working using my-ts-node
pokey Nov 7, 2023
995fe9d
try to fix ci
pokey Nov 7, 2023
c3b554b
Start trying to get website to build
pokey Nov 7, 2023
271462d
get web build working locally
pokey Nov 7, 2023
214d4ea
Fix unit tests launch config
pokey Nov 7, 2023
efdb686
More launch config fixes
pokey Nov 7, 2023
3a78e40
Merge branch 'main' into pokey/bump-typescript-greater-522
pokey Nov 8, 2023
94bcc59
Reset .npmrc
pokey Nov 8, 2023
5526545
Re-add sourcemaps to go with removing `noEmit`
pokey Nov 8, 2023
9b5ec4d
Attempt to get docusaurus working
pokey Nov 9, 2023
501eb3b
try ts docusaurus
pokey Nov 9, 2023
4dc90a3
more tweaks
pokey Nov 9, 2023
3060c80
Maybe working docs
pokey Nov 9, 2023
85d1250
Attempt to fix docs build by bumping node version
pokey Nov 9, 2023
1c9b46e
Downgrade node
pokey Nov 9, 2023
8a20d66
More stuff
pokey Nov 9, 2023
f60e522
Basically working cheatsheet config
pokey Nov 9, 2023
27a2d0f
Maybe working
pokey Nov 9, 2023
193bcda
Fix watch
pokey Nov 9, 2023
1d52287
Fix undefined in meta-updater
pokey Nov 9, 2023
7f7b342
Fix local cheatsheet
pokey Nov 9, 2023
e859282
more esm
pokey Nov 9, 2023
37c64c8
More tweaks
pokey Nov 9, 2023
2cdaeee
More fix
pokey Nov 9, 2023
ced4b3d
Attempt to fix windows
pokey Nov 9, 2023
d614db2
tweak
pokey Nov 9, 2023
acc8287
Switch from cross-env to env
pokey Nov 10, 2023
8e15054
Simplify
pokey Nov 10, 2023
31213eb
Fix launch configs
pokey Nov 10, 2023
c8dc5df
Remove unnecessary esbuild deps
pokey Nov 10, 2023
4e9b175
more cleanup
pokey Nov 10, 2023
369f283
tweaks
pokey Nov 10, 2023
c3bc0c7
Be stricter
pokey Nov 10, 2023
39662fd
Fix watch
pokey Nov 10, 2023
cd381e4
cleanup
pokey Nov 10, 2023
9ca3737
cleanup
pokey Nov 10, 2023
1dbdf3b
more cleanup
pokey Nov 10, 2023
df5e782
more cleanup
pokey Nov 10, 2023
fabfa0c
cleanup
pokey Nov 10, 2023
a072466
cleanup
pokey Nov 10, 2023
c752994
Add comment
pokey Nov 10, 2023
d8634cf
more cleanup
pokey Nov 10, 2023
6d85bcd
Attempt to fix windows
pokey Nov 10, 2023
cd7b64c
Cleanup
pokey Nov 10, 2023
2fd1eed
Try to fix windows again
pokey Nov 10, 2023
2b2315a
fix script
pokey Nov 10, 2023
0264723
Another attempt to fix windows
pokey Nov 10, 2023
2191878
Revert "Another attempt to fix windows"
pokey Nov 10, 2023
8af373f
Try switching my-ts-node to js
pokey Nov 10, 2023
b1edf25
improve error message
pokey Nov 10, 2023
214213f
try fix
pokey Nov 10, 2023
565298e
miore fix attempt
pokey Nov 10, 2023
673e7cd
fix
pokey Nov 10, 2023
602a89a
get some type checking
pokey Nov 10, 2023
ac91b87
More stuff
pokey Nov 10, 2023
0564f48
remove esbuild
pokey Nov 10, 2023
6e4950d
more debugging
pokey Nov 10, 2023
8d1b773
again
pokey Nov 10, 2023
9b71b10
one more time
pokey Nov 10, 2023
bf252c9
Cleanup
pokey Nov 10, 2023
9ce24ad
comments
pokey Nov 10, 2023
e342216
inherit exit code
pokey Nov 10, 2023
df90915
Enable source maps
pokey Nov 10, 2023
5b43466
more windows fix try
pokey Nov 10, 2023
f8bdae8
Revert "more windows fix try"
pokey Nov 10, 2023
2f42a41
try bumping test-electron
pokey Nov 10, 2023
c52c2bc
Support absolute paths
AndreasArvidsson Nov 11, 2023
f3d78a6
Added CURSORLESS_REPO_ROOT env
AndreasArvidsson Nov 11, 2023
c49c289
Check for windows
AndreasArvidsson Nov 11, 2023
6b86ab1
Rollback andreas commits
pokey Nov 11, 2023
d9452bf
use cross-spawn
pokey Nov 11, 2023
bf4fbfb
Set CURSORLESS_REPO_ROOT in my-ts-node
pokey Nov 11, 2023
b0192ac
fix meta-updater
pokey Nov 11, 2023
d947dad
add unicorn module eslint rule
pokey Nov 11, 2023
5a0596b
Merge branch 'main' into pokey/bump-typescript-greater-522
pokey Nov 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"prettier": "3.0.0",
"syncpack": "9.8.4",
"tsx": "3.12.3",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"pnpm": {
"patchedDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cheatsheet-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"tailwindcss": "3.2.7",
"ts-loader": "9.4.2",
"ts-node": "10.9.1",
"typescript": "^5.1.6",
"typescript": "^5.2.2",
"webpack": "5.88.2",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.11.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/cheatsheet-local/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"allowSyntheticDefaultImports": true,
"skipLibCheck": true,
"esModuleInterop": true,
"module": "es6",
"module": "NodeNext",
"target": "es5",
"allowJs": true
},
"ts-node": {
"compilerOptions": {
"module": "CommonJS"
"module": "NodeNext"
}
pokey marked this conversation as resolved.
Show resolved Hide resolved
},
"references": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cheatsheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
"@types/react-helmet": "6.1.6",
"jest-environment-jsdom": "29.6.2",
"ts-jest": "29.0.5",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
shouldUpdateFixtures,
} from "@cursorless/common";
import * as yaml from "js-yaml";
import * as assert from "node:assert";
import assert from "node:assert";
import { promises as fsp } from "node:fs";
import { canonicalizeAndValidateCommand } from "../core/commandVersionUpgrades/canonicalizeAndValidateCommand";
import { getHatMapCommand } from "./getHatMapCommand";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
asyncSafety,
getRecordedTestPaths,
} from "@cursorless/common";
import * as assert from "assert";
import assert from "assert";
import * as yaml from "js-yaml";
import { promises as fsp } from "node:fs";
import { canonicalizeAndValidateCommand } from "../core/commandVersionUpgrades/canonicalizeAndValidateCommand";
Expand Down
2 changes: 1 addition & 1 deletion packages/cursorless-org-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"devDependencies": {
"@docusaurus/module-type-aliases": "3.0.0-alpha.0",
"@tsconfig/docusaurus": "2.0.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"license": "MIT",
"main": "./out/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/cursorless-org/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-player": "2.12.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"devDependencies": {
"@svgr/webpack": "6.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cursorless-org/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"skipLibCheck": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "nodenext",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
openNewNotebookEditor,
runCursorlessCommand,
} from "@cursorless/vscode-common";
import * as assert from "assert";
import assert from "assert";
import { window } from "vscode";
import { endToEndTestSetup, sleepWithBackoff } from "../endToEndTestSetup";
import { skipIfWindowsCi } from "./skipIfWindowsCi";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
getCursorlessApi,
openNewNotebookEditor,
} from "@cursorless/vscode-common";
import * as assert from "assert";
import assert from "assert";
import { window } from "vscode";
import { endToEndTestSetup, sleepWithBackoff } from "../endToEndTestSetup";
import { runCursorlessCommand } from "@cursorless/vscode-common";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getCursorlessApi, openNewEditor } from "@cursorless/vscode-common";
import * as assert from "assert";
import assert from "assert";
import * as vscode from "vscode";
import { endToEndTestSetup } from "../endToEndTestSetup";

Expand Down
4 changes: 2 additions & 2 deletions packages/test-harness/src/runAllTests.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as globRaw from "glob";
import * as Mocha from "mocha";
import globRaw from "glob";
import Mocha from "mocha";
import * as path from "path";
import { getCursorlessRepoRoot } from "@cursorless/common";
import { promisify } from "util";
Expand Down
Loading