Skip to content

Commit

Permalink
Merge pull request #1446 from atsign-foundation/gkc-fix-deps
Browse files Browse the repository at this point in the history
build: require npm version 10.9.0 for the policy webapp. Addresses #1411
  • Loading branch information
gkc authored Oct 14, 2024
2 parents 63bfefa + b8a3896 commit 16a7ddc
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ updates:
pip:
patterns:
- "*"
- package-ecosystem: 'npm'
directory: "/apps/admin/webapp/"
schedule:
interval: "daily"
groups:
npm:
patterns:
- "*"
1 change: 1 addition & 0 deletions .github/workflows/multibuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
- name: build admin webapp
working-directory: ./apps/admin/webapp
run: |
npm install -g [email protected]
npm install
npm run build
- if: ${{ matrix.os != 'windows-latest' }}
Expand Down
1 change: 1 addition & 0 deletions apps/admin/webapp/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
10 changes: 7 additions & 3 deletions apps/admin/webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions apps/admin/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions packages/dart/sshnoports/buildArchive
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] || exit 1
npm install || exit 1
npm run build || exit 1

Expand Down
3 changes: 2 additions & 1 deletion tools/multibuild/Dockerfile.package
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]

COPY . .

Expand Down

0 comments on commit 16a7ddc

Please sign in to comment.