Merge remote-tracking branch 'origin/main' into swernli/impl-attrs

.github/workflows/ci.yml

@@ -120,6 +120,8 @@ jobs:
 
   integration-tests:
     name: Integration tests
+    if: ${{ ! github.event.pull_request }}
+    timeout-minutes: 15
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]

build.py

@@ -117,14 +117,17 @@
 
 def step_start(description):
     global start_time
-    print(f"build.py step: {description}")
+    prefix = "::group::" if os.getenv("GITHUB_ACTIONS") == "true" else ""
+    print(f"{prefix}build.py: {description}")
     start_time = time.time()
 
 
 def step_end():
     global start_time
     duration = time.time() - start_time
-    print(f"build.py step: Finished in {duration:.3f}s.")
+    print(f"build.py: Finished in {duration:.3f}s.")
+    if os.getenv("GITHUB_ACTIONS") == "true":
+        print(f"::endgroup::")
 
 
 if npm_install_needed:
@@ -386,6 +389,6 @@ def step_end():
 
 if args.integration_tests:
     step_start("Running the VS Code integration tests")
-    vscode_args = [npm_cmd, "test"]
+    vscode_args = [npm_cmd, "test", "--", "--verbose"]
     subprocess.run(vscode_args, check=True, text=True, cwd=vscode_src)
     step_end()

jupyterlab/package.json

@@ -36,7 +36,7 @@
     "typescript": "^5.0.2"
   },
   "dependencies": {
-    "@codemirror/language": "6.6.0",
+    "@codemirror/language": "6.9.1",
     "@codemirror/legacy-modes": "6.3.2",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/codemirror": "^4.0.0",

jupyterlab/src/index.ts

@@ -4,9 +4,7 @@ import {
 } from "@jupyterlab/application";
 
 import { IEditorLanguageRegistry } from "@jupyterlab/codemirror";
-// @ts-expect-error No typings avaiable for @codemirror/legacy-modes
 import { simpleMode } from "@codemirror/legacy-modes/mode/simple-mode";
-// @ts-expect-error No typings avaiable for @codemirror/language
 import { LanguageSupport, StreamLanguage } from "@codemirror/language";
 import { INotebookTracker, NotebookPanel } from "@jupyterlab/notebook";
 import { ICellModel } from "@jupyterlab/cells/lib/model";

jupyterlab/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "moduleResolution": "nodenext",
+    // To ensure compatibility with jupyterlab, options impacting emit (target,module) are copied from
+    // https://github.com/jupyterlab/jupyterlab/blob/c6744e548c7b2790e4c6a4d41a60aae03f22c62a/tsconfigbase.json
+    "target": "ES2018",
+    "module": "esnext",
+    "moduleResolution": "node",
     "outDir": "lib",
     "rootDir": "src",
     "strict": true,