Skip to content

Commit

Permalink
Merge pull request #1299 from sundowndev/upgrade-node-20.3.1
Browse files Browse the repository at this point in the history
Upgrade nodejs to 20.3.1
  • Loading branch information
sundowndev committed Jul 10, 2023
2 parents 2fd3ccb + 3274105 commit ad3a393
Show file tree
Hide file tree
Showing 8 changed files with 3,547 additions and 6,735 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.7.0
with:
node-version: 15.11.x
node-version: 20.3.1

- name: Building static assets
run: (cd web/client && yarn install --immutable && yarn build)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [15.11.x]
node-version: [20.3.1]
steps:
- uses: actions/checkout@v3.5.3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.7.0
with:
node-version: 15.11.x
node-version: 20.3.1

- name: Set up Go
uses: actions/setup-go@v4.0.1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:15.11.0-alpine AS client_builder
FROM node:20.3.1-alpine AS client_builder

WORKDIR /app

Expand Down
43 changes: 22 additions & 21 deletions web/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@
"bootstrap-vue": "2.21.2",
"jquery": "3.6.0",
"popper.js": "1.16.1",
"vue": "2.6.12",
"vue": "2.7.14",
"vue-class-component": "7.2.6",
"vue-json-viewer": "2.2.22",
"vue-phone-number-input": "1.12.13",
"vue-property-decorator": "9.1.2",
"vue-router": "3.5.1",
"vue-router": "legacy",
"vuex": "3.6.2"
},
"devDependencies": {
"@types/jest": "26.0.22",
"@typescript-eslint/eslint-plugin": "4.21.0",
"@typescript-eslint/parser": "4.22.0",
"@vue/cli-plugin-e2e-cypress": "4.5.12",
"@vue/cli-plugin-eslint": "4.5.12",
"@vue/cli-plugin-router": "4.5.12",
"@vue/cli-plugin-typescript": "4.5.12",
"@vue/cli-plugin-unit-jest": "4.5.12",
"@vue/cli-plugin-vuex": "4.5.12",
"@vue/cli-service": "4.5.12",
"@vue/eslint-config-prettier": "6.0.0",
"@vue/eslint-config-typescript": "7.0.0",
"@vue/test-utils": "1.1.3",
"@typescript-eslint/eslint-plugin": "5.61.0",
"@typescript-eslint/parser": "5.61.0",
"@vue/cli-plugin-e2e-cypress": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-router": "5.0.8",
"@vue/cli-plugin-typescript": "5.0.8",
"@vue/cli-plugin-unit-jest": "5.0.8",
"@vue/cli-plugin-vuex": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-prettier": "7.1.0",
"@vue/eslint-config-typescript": "11.0.3",
"@vue/test-utils": "1.3.6",
"babel-core": "7.0.0-bridge.0",
"eslint": "7.25.0",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-vue": "7.8.0",
"eslint": "8.44.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.15.1",
"jest": "26.6.3",
"node-gyp": "8.2.0",
"prettier": "2.2.1",
"ts-jest": "26.5.4",
"typescript": "4.2.3",
"typescript": "4.9.5",
"vue-jest": "3.0.7",
"vue-template-compiler": "2.6.12"
},
Expand All @@ -61,13 +61,14 @@
"plugin:vue/essential",
"eslint:recommended",
"@vue/typescript/recommended",
"@vue/prettier",
"@vue/prettier/@typescript-eslint"
"@vue/prettier"
],
"parserOptions": {
"ecmaVersion": 2020
},
"rules": {},
"rules": {
"vue/multi-word-component-names": "off"
},
"overrides": [
{
"files": [
Expand Down
4 changes: 3 additions & 1 deletion web/client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
<b-container class="my-md-3">
<b-row>
<b-col cols="12">
<b-alert v-if="isDemo" show variant="warning" fade>Welcome to the demo of PhoneInfoga web client.</b-alert>
<b-alert v-if="isDemo" show variant="warning" fade
>Welcome to the demo of PhoneInfoga web client.</b-alert
>
<b-alert
v-for="(err, i) in errors"
v-bind:key="i"
Expand Down
4 changes: 2 additions & 2 deletions web/client/src/components/Scanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default class Scanner extends Vue {
data = null;
loading = false;
dryrunError = false;
error = null;
error: unknown = null;
computed = {
...mapState(["number"]),
...mapMutations(["pushError"]),
Expand Down Expand Up @@ -73,7 +73,7 @@ export default class Scanner extends Vue {
if (!res.data.success && res.data.error) {
throw res.data.error;
}
} catch (error) {
} catch (error: unknown) {
this.dryrunError = true;
this.error = error;
}
Expand Down
Loading

0 comments on commit ad3a393

Please sign in to comment.