Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/prettier-es…
Browse files Browse the repository at this point in the history
…lint
  • Loading branch information
setchy committed Feb 27, 2024
2 parents 05228e1 + 3353af8 commit c4c680a
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_meta-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
uses: actions/[email protected]

- name: Download Artifacts
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: assembled-frontend-node${{ inputs.node-version-package }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: actions/[email protected]

- name: Download Artifacts
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: assembled-frontend-node18

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:fe7d09315425216cbadaa6b0308b9fb9dcd0aff76d4018931afdf73976840d09
FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:c50bd1116f195ac5c10a84c008ced70afec201508433701967e35e565cfb0a6b

# Arguments that can be passed at build time
ARG COMMIT_SHA=unknown
Expand Down
129 changes: 67 additions & 62 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"devDependencies": {
"@babel/core": "7.23.2",
"@babel/eslint-parser": "^7.23.10",
"@cyclonedx/cyclonedx-npm": "^1.8.0",
"@cyclonedx/cyclonedx-npm": "^1.16.1",
"@cyclonedx/webpack-plugin": "2.0.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"@vue/babel-preset-jsx": "^1.4.0",
Expand Down Expand Up @@ -96,7 +96,7 @@
"not ie <= 10"
],
"engines": {
"node": ">= 8.10.x",
"npm": ">= 5.6.0"
"node": ">= 18",
"npm": ">= 9"
}
}
}

0 comments on commit c4c680a

Please sign in to comment.