Merge upstream changes to linc neuroglancer

.github/workflows/build.yml

@@ -7,6 +7,13 @@ on:
     tags:
       - v**
   pull_request:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)"
+        required: false
+        default: false
 
 jobs:
   client:
@@ -24,11 +31,16 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           cache: "npm"
           cache-dependency-path: |
             package-lock.json
             examples/**/package-lock.json
+      # go needed for fake_gcs_server used by the javascript tests
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "stable"
       - run: npm install
       - run: npm run format:fix
       - name: Check for dirty working directory
@@ -47,7 +59,6 @@ jobs:
       - run: npm run build-package
       - run: npm publish --dry-run
         working-directory: dist/package
-      - uses: ./.github/actions/setup-firefox
       - name: Run JavaScript tests (including WebGL)
         run: npm test
         if: ${{ runner.os != 'macOS' }}
@@ -92,17 +103,17 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      # Uncomment the action below for an interactive shell
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
+      - uses: ./.github/actions/setup-firefox
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
       - name: Install Python packaging/test tools
         run: pip install tox nox wheel numpy -r python/requirements-test.txt
-      - uses: ./.github/actions/setup-firefox
       - run: nox -s lint format mypy
       - name: Check for dirty working directory
         run: git diff --exit-code
@@ -139,7 +150,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           cache: "npm"
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -214,7 +225,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           registry-url: "https://registry.npmjs.org"
       - uses: actions/download-artifact@v4
         with:

.github/workflows/build_preview.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - "20.x"
+          - "22.x"
     runs-on: ubuntu-latest
 
     steps:

.ncurc.yml

@@ -0,0 +1,5 @@
+reject:
+  # API break
+  - "gl-matrix"
+  - "@types/gl-matrix"
+  - "codemirror"

.oxlintrc.json

@@ -0,0 +1,60 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["import", "typescript", "oxc", "unicorn", "promise", "vitest"],
+  "env": {
+    "browser": true
+  },
+  "settings": {},
+  "rules": {
+    // Seems to be buggy
+    "no-loss-of-precision": "off",
+    "import/no-cycle": "error",
+    "import/first": "error",
+    "no-unsafe-finally": "off",
+    "require-yield": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-inferrable-types": "off",
+    "@typescript-eslint/no-this-alias": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-empty-interface": "off",
+    "erasing-op": "off",
+    "no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "ignoreRestSiblings": true
+      }
+    ],
+    "no-new-array": "off",
+    "no-document-cookie": "off",
+    "@typescript-eslint/consistent-type-imports": "error"
+  },
+  "overrides": [
+    {
+      "files": ["*.test.ts", "*.spec.ts"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
+      }
+    }
+  ],
+  "ignorePatterns": [
+    "**/node_modules",
+    "**/dist",
+    "**/python",
+    "templates/neuroglancer/sliceview",
+    "src/third_party/jpgjs/jpg.js",
+    "**/templates",
+    "**/build",
+    "**/.tox",
+    "**/.nox",
+    "lib",
+    "**/python",
+    "**/config",
+    "**/typings",
+    "src/mesh/draco/stub.js",
+    "**/tsconfig.tsbuildinfo",
+    "examples"
+  ]
+}

.prettierignore

@@ -1,9 +1,12 @@
 /templates/
 /python/
 /third_party/jpgjs/jpg.js
-/testdata/*.json
+/testdata/**/*.json
+zarr.json
 .parcel-cache
 dist
 /lib
 /docs/_build/
 /.ruff_cache
+package.json
+package-lock.json

MANIFEST.in

@@ -14,7 +14,6 @@ prune examples
 exclude .clang-format
 exclude .editorconfig
 exclude .eslintignore
-exclude .eslintrc
 exclude .style.yapf
 exclude cors_webserver.py
 exclude gulpfile.js
@@ -36,8 +35,9 @@ exclude MANIFEST.in
 exclude *.ts
 exclude .prettierrc.yml
 exclude .prettierignore
-exclude .eslintrc.yml
+exclude eslint.config.js
+exclude .ncurc.yml
 exclude index.html
-exclude webpack.config.js
+exclude rspack.config.js
 exclude firebase.json
 exclude .firebaserc

build_tools/after-version-change.ts

@@ -28,8 +28,17 @@ await Promise.all(
       await execFileAsync("npm", ["install", "--no-audit", "--no-fund"], {
         cwd: exampleDir,
       });
-      await execFileAsync("git", ["add", "package-lock.json"], {
-        cwd: exampleDir,
-      });
     }),
 );
+
+await execFileAsync(
+  "git",
+  [
+    "add",
+    ...(await glob("examples/*/*/package-lock.json", {
+      absolute: false,
+      cwd: rootDir,
+    })),
+  ],
+  { cwd: rootDir },
+);

build_tools/build-package.ts

@@ -32,8 +32,11 @@ function buildDeclarationFiles(
   program.emit();
 }
 
-async function buildPackage(options: { inplace?: boolean }) {
-  const { inplace = false } = options;
+async function buildPackage(options: {
+  inplace?: boolean;
+  skipDeclarations?: boolean;
+}) {
+  const { inplace = false, skipDeclarations = false } = options;
 
   const srcDir = path.resolve(rootDir, "src");
   const outDir = inplace ? rootDir : path.resolve(rootDir, "dist", "package");
@@ -68,6 +71,7 @@ async function buildPackage(options: { inplace?: boolean }) {
     outbase: srcDir,
     bundle: false,
     outdir: libDir,
+    target: "es2022",
   });
 
   let compilerOptionsFromConfigFile: ts.CompilerOptions = {};
@@ -80,10 +84,12 @@ async function buildPackage(options: { inplace?: boolean }) {
       "./",
     ).options;
   }
-  buildDeclarationFiles(entryPoints, {
-    ...compilerOptionsFromConfigFile,
-    outDir: libDir,
-  });
+  if (!skipDeclarations) {
+    buildDeclarationFiles(entryPoints, {
+      ...compilerOptionsFromConfigFile,
+      outDir: libDir,
+    });
+  }
 
   const otherSources = await glob(["**/*.{css,js,html,wasm}"], {
     cwd: srcDir,
@@ -117,6 +123,7 @@ async function buildPackage(options: { inplace?: boolean }) {
     const { postpack } = packageJson["scripts"];
     delete packageJson["scripts"];
     packageJson["scripts"] = { postpack };
+    packageJson["files"] = ["lib/**/*"];
   } else {
     delete packageJson["private"];
     packageJson["scripts"] = {};
@@ -156,6 +163,11 @@ async function parseArgsAndRunMain() {
         default: false,
         description: "Convert package to built format inplace.",
       },
+      ["skip-declarations"]: {
+        type: "boolean",
+        default: false,
+        description: "Skip generating .d.ts files.",
+      },
       ["if-not-toplevel"]: {
         type: "boolean",
         default: false,
@@ -193,7 +205,10 @@ async function parseArgsAndRunMain() {
       return;
     }
   }
-  buildPackage({ inplace: argv.inplace });
+  buildPackage({
+    inplace: argv.inplace,
+    skipDeclarations: argv.skipDeclarations,
+  });
 }
 
 if (process.argv[1] === import.meta.filename) {