diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ebbd26a195d..a94b8981a18 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -34,6 +34,9 @@ "ghcr.io/devcontainers/features/git:1": {}, "ghcr.io/devcontainers-community/features/bazel:1": {}, "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}, + "ghcr.io/devcontainers/features/node:1": { + "version": "lts" + }, "ghcr.io/devcontainers/features/common-utils:2": { "username": "${localEnv:USER}" } @@ -42,6 +45,7 @@ "fixVolumePerms": "sudo chown -R $(whoami): ${containerEnv:HOME}/.config/engflow_auth && sudo chown -R $(whoami): ${containerEnv:HOME}/.cache", "venvActivation": "echo 'source ${containerWorkspaceFolder}/python3-venv/bin/activate && ${containerWorkspaceFolder}/buildscripts/poetry_sync.sh' >> ~/.bashrc && echo 'source ${containerWorkspaceFolder}/python3-venv/bin/activate && ${containerWorkspaceFolder}/buildscripts/poetry_sync.sh' >> ~/.zshrc;", "createDataDir": "sudo mkdir -p /data/db && sudo chown -R $(whoami): /data/db", + "installNodeModules": "bazel run @pnpm//:pnpm -- --dir ${containerWorkspaceFolder} install", "reportDockerServerPlatform": "echo \"\ncommon --bes_keywords=devcontainer:docker_server_platform=$(docker version --format '\"{{.Server.Platform.Name}}\"')\" >> ${containerEnv:HOME}/.bazelrc", "reportDockerServerVersion": "echo \"\ncommon --bes_keywords=devcontainer:docker_server_version=$(docker version --format '\"{{.Server.Version}}\"')\" >> ${containerEnv:HOME}/.bazelrc", "reportArch": "echo \"\ncommon --bes_keywords=devcontainer:arch=$(uname -i)\" >> ${containerEnv:HOME}/.bazelrc", diff --git a/BUILD.bazel b/BUILD.bazel index 455299df668..fb4ca574e6c 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -27,11 +27,6 @@ exports_files([ npm_link_all_packages(name = "node_modules") -npm_link_package( - name = "node_modules/eslint-plugin-mongodb", - src = "//buildscripts/eslint-plugin-mongodb:npm_package", -) - mongo_js_library( name = "eslintrc", srcs = ["eslint.config.mjs"], diff --git a/buildscripts/eslint-plugin-mongodb/BUILD.bazel b/buildscripts/eslint-plugin-mongodb/BUILD.bazel index 37cc7e18e9f..63cffcb8718 100644 --- a/buildscripts/eslint-plugin-mongodb/BUILD.bazel +++ b/buildscripts/eslint-plugin-mongodb/BUILD.bazel @@ -1,7 +1,7 @@ load("@aspect_rules_js//npm:defs.bzl", "npm_package") npm_package( - name = "npm_package", + name = "pkg", srcs = [ "package.json", "plugin.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b22c0cd9ed..50070537b90 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,11 @@ settings: onlyBuiltDependencies: [] +dependencies: + eslint-plugin-mongodb: + specifier: file:buildscripts/eslint-plugin-mongodb + version: file:buildscripts/eslint-plugin-mongodb + devDependencies: '@eslint/eslintrc': specifier: 3.2.0 @@ -605,3 +610,8 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} dev: true + + file:buildscripts/eslint-plugin-mongodb: + resolution: {directory: buildscripts/eslint-plugin-mongodb, type: directory} + name: eslint-plugin-mongodb + dev: false