diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0ffe58fbd..5110a3c9e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -40,3 +40,11 @@ updates: pip: patterns: - "*" + - package-ecosystem: 'npm' + directory: "/apps/admin/webapp/" + schedule: + interval: "daily" + groups: + npm: + patterns: + - "*" diff --git a/.github/workflows/multibuild.yaml b/.github/workflows/multibuild.yaml index abd7661ad..6c42d5159 100644 --- a/.github/workflows/multibuild.yaml +++ b/.github/workflows/multibuild.yaml @@ -103,6 +103,7 @@ jobs: - name: build admin webapp working-directory: ./apps/admin/webapp run: | + npm install -g npm@10.9.0 npm install npm run build - if: ${{ matrix.os != 'windows-latest' }} diff --git a/apps/admin/webapp/.npmrc b/apps/admin/webapp/.npmrc new file mode 100644 index 000000000..b6f27f135 --- /dev/null +++ b/apps/admin/webapp/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/apps/admin/webapp/package-lock.json b/apps/admin/webapp/package-lock.json index 55d5919a7..74ae4659d 100644 --- a/apps/admin/webapp/package-lock.json +++ b/apps/admin/webapp/package-lock.json @@ -8,9 +8,13 @@ "name": "webapp_proto", "version": "0.0.0", "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^3.1.1", - "svelte": "^4.2.19", - "vite": "^5.4.6" + "@sveltejs/vite-plugin-svelte": "3.1.1", + "svelte": "4.2.19", + "vite": "5.4.6" + }, + "engines": { + "node": ">=v20.15.0 <23", + "npm": "10.9.0" } }, "node_modules/@ampproject/remapping": { diff --git a/apps/admin/webapp/package.json b/apps/admin/webapp/package.json index 4673bb1ef..52d4f2771 100644 --- a/apps/admin/webapp/package.json +++ b/apps/admin/webapp/package.json @@ -9,8 +9,12 @@ "preview": "vite preview" }, "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^3.1.1", - "svelte": "^4.2.19", - "vite": "^5.4.6" + "@sveltejs/vite-plugin-svelte": "3.1.1", + "svelte": "4.2.19", + "vite": "5.4.6" + }, + "engines": { + "node": ">=v20.15.0 <23", + "npm": "10.9.0" } } diff --git a/packages/dart/sshnoports/buildArchive b/packages/dart/sshnoports/buildArchive index 37d714ee1..7bc246d13 100755 --- a/packages/dart/sshnoports/buildArchive +++ b/packages/dart/sshnoports/buildArchive @@ -38,6 +38,7 @@ echo "Compiling admin_api"; dart compile exe --verbosity error bin/np_admin.dart wait cd ../webapp || exit 1 echo "Building admin webapp" +npm install -g npm@10.9.0 || exit 1 npm install || exit 1 npm run build || exit 1 diff --git a/tools/multibuild/Dockerfile.package b/tools/multibuild/Dockerfile.package index 42b86d04c..f8922b193 100644 --- a/tools/multibuild/Dockerfile.package +++ b/tools/multibuild/Dockerfile.package @@ -9,7 +9,8 @@ WORKDIR /noports # install node for later (keep at the top file to increase cache hits) # hadolint ignore=DL3008 RUN apt-get update; \ - apt-get install -y --no-install-recommends npm + apt-get install -y --no-install-recommends npm; \ + npm install -g npm@10.9.0 COPY . .