diff --git a/.devcontainer/dev-with-python/devcontainer.json b/.devcontainer/dev-with-python/devcontainer.json index c4521197f8..e954d107a9 100644 --- a/.devcontainer/dev-with-python/devcontainer.json +++ b/.devcontainer/dev-with-python/devcontainer.json @@ -33,7 +33,7 @@ "mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"], // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "npm ci", + // "postCreateCommand": "npm install", // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode" } diff --git a/.devcontainer/dev/devcontainer.json b/.devcontainer/dev/devcontainer.json index b6604a3267..b9973f6fcf 100644 --- a/.devcontainer/dev/devcontainer.json +++ b/.devcontainer/dev/devcontainer.json @@ -19,7 +19,7 @@ }, "mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"] // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "npm ci", + // "postCreateCommand": "npm install", // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. // , "remoteUser": "vscode" } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b66b64164c..f1d831af5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,9 +7,6 @@ on: branches: [main] workflow_dispatch: -env: - NODE_VERSION: 22.x - permissions: actions: read contents: read @@ -32,7 +29,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -59,7 +56,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -107,7 +104,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -157,7 +154,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -181,7 +178,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -205,7 +202,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -229,7 +226,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 281d2a5c9c..88ef3d80d0 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -12,7 +12,6 @@ on: - .github/workflows/copilot-setup-steps.yml env: - NODE_VERSION: 22.15.1 NPM_VERSION: 10.9.2 PYTHON_VERSION: 3.12 DENO_VERSION: '~1.37' @@ -42,7 +41,7 @@ jobs: - name: Use Node ${{env.NODE_VERSION}} uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: - node-version: ${{env.NODE_VERSION}} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 35927c838c..d3f441cdca 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -6,9 +6,6 @@ on: - cron: '0 9 * * 1' workflow_dispatch: -env: - NODE_VERSION: 22.x - permissions: actions: read contents: read @@ -30,7 +27,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' @@ -62,7 +59,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' cache: 'npm' - name: Install dependencies diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 90f9006ce4..d6fabe5f1a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -7,9 +7,6 @@ on: branches: [main] workflow_dispatch: -env: - NODE_VERSION: 22.x - permissions: contents: read packages: read @@ -31,7 +28,7 @@ jobs: uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5 with: cache: 'npm' - node-version: ${{ env.NODE_VERSION }} + node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@deepnote' diff --git a/.husky/post-checkout b/.husky/post-checkout index 385cb3aa69..5fdd18ffd2 100755 --- a/.husky/post-checkout +++ b/.husky/post-checkout @@ -1 +1 @@ -npm ci +npm install diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fca3298da1..7804b104c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ The `@deepnote/blocks` package is published on GitHub Packages. To install it, y ``` Replace `YOUR_TOKEN_HERE` with your actual token. -After completing these steps, you can install dependencies normally with `npm ci`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope. +After completing these steps, you can install dependencies normally with `npm install`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope. On Apple Silicon, you will have to use system versions of `libsodium` and `libzmq` instead of the bundled ones: @@ -78,7 +78,7 @@ npm_config_build_from_source=true npm install zeromq@ Install the dependecies: ```shell -npm ci +npm install # Run this to setup the necessary pre-commit hooks. npm run setup-precommit-hook python3 -m venv .venv @@ -277,7 +277,7 @@ Here's an example of a typical workflow: 1. Sync to main (get your fork's main to match vscode-jupyter's main) 1. Create branch -1. `npm ci` +1. `npm install` 1. `npm run clean` 1. Start VS code Insiders root 1. CTRL+SHIFT+B (run the task `compile`) @@ -354,7 +354,7 @@ Steps to build the extension on your machine once you've cloned the repo: ```bash > npm install -g @vscode/vsce # Perform the next steps in the vscode-jupyter folder. -> npm ci +> npm install > npm run clean > npm run package # This step takes around 10 minutes. ```