Skip to content

Commit 5bd48c2

Browse files
authored
Merge pull request #89 from buggregator/feature/upgrade-nuxt-version
Feature/upgrade node version
2 parents 53bc907 + 6eaf12c commit 5bd48c2

File tree

154 files changed

+2962
-853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+2962
-853
lines changed

.docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG BRANCH=master
66
RUN git clone -b $BRANCH $REPOSITORY /app
77

88
# Build JS files
9-
FROM node:19-alpine as frontend
9+
FROM node:20-alpine as frontend
1010
COPY --from=git /app /app
1111
WORKDIR /app
1212

.eslintrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@
3939
"registeredComponentsOnly": true,
4040
"ignores": []
4141
}
42+
],
43+
"import/extensions": [
44+
"error",
45+
"ignorePackages",
46+
{
47+
"": "never",
48+
"js": "never",
49+
"jsx": "never",
50+
"ts": "never",
51+
"tsx": "never"
52+
}
4253
]
4354
}
4455
}

.github/workflows/test-build-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.x, 18.x, 20.x]
18+
node-version: [18.x, 20.x]
1919

2020
steps:
2121
- uses: actions/checkout@v3

layouts/default.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<script lang="ts">
1616
import { storeToRefs } from "pinia";
1717
import { defineComponent } from "vue";
18-
import { useSettingsStore } from "~/stores/settings";
1918
import { useNuxtApp } from "#app";
2019
import { LayoutSidebar } from "~/src/widgets/ui";
20+
import { useSettingsStore } from "~/stores/settings";
2121
2222
export default defineComponent({
2323
components: {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"autoprefixer": "^10.4.0",
4848
"eslint": "^8.32.0",
4949
"eslint-config-airbnb": "^19.0.4",
50-
"eslint-config-airbnb-typescript": "^17.0.0",
50+
"eslint-config-airbnb-typescript": "^17.1.0",
5151
"eslint-config-prettier": "^8.6.0",
5252
"eslint-plugin-import": "^2.29.0",
5353
"eslint-plugin-nuxt": "^4.0.0",
@@ -59,7 +59,7 @@
5959
"prettier": "^2.8.3",
6060
"sass": "^1.57.1",
6161
"storybook-addon-themes": "^6.1.0",
62-
"typescript": "^4.9.4",
62+
"typescript": "^5.1.6",
6363
"vitest": "^0.34.2",
6464
"vue-eslint-parser": "^9.1.0"
6565
},
@@ -85,7 +85,7 @@
8585
"lodash.isstring": "^4.0.1",
8686
"lodash.pick": "^4.4.0",
8787
"moment": "^2.29.4",
88-
"nuxt": "3.3.3",
88+
"nuxt": "^3.8.2",
8989
"pinia": "^2.0.30",
9090
"pluralize": "^8.0.0",
9191
"tailwindcss": "^3.2.4",

pages/http-dumps/[id].vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
<script lang="ts">
2626
import { defineComponent } from "vue";
27-
import { HttpDumpPage } from "~/src/screens/http-dump";
2827
import { useFetch, useNuxtApp, useRoute, useRouter } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
2928
import { PageHeader } from "~/src/widgets/ui";
3029
import { useHttpDump } from "~/src/entities/http-dump";
31-
import { HttpDump } from "~/src/entities/http-dump/types";
32-
import { EventId, ServerEvent } from "~/src/shared/types";
30+
import type { HttpDump } from "~/src/entities/http-dump/types";
31+
import type { EventId, ServerEvent } from "~/src/shared/types";
32+
import { HttpDumpPage } from "~/src/screens/http-dump";
3333
3434
const { normalizeHttpDumpEvent } = useHttpDump();
3535

pages/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
<script lang="ts">
4141
import pluralize from "pluralize"; // eslint-disable-line @conarti/feature-sliced/public-api
4242
import { defineComponent } from "vue";
43-
import { PauseButton } from "~/src/screens/events/ui/pause-button";
4443
import { useNuxtApp } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
4544
import { PageHeader, EventCard, PagePlaceholder } from "~/src/widgets/ui";
4645
import { PAGE_TYPES } from "~/src/shared/constants";
47-
import { EventType } from "~/src/shared/types";
46+
import type { EventType } from "~/src/shared/types";
47+
import { PauseButton } from "~/src/screens/events/ui/pause-button";
4848
4949
export default defineComponent({
5050
components: {

pages/inspector/[id].vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
<script lang="ts">
2626
import { defineComponent } from "vue";
27-
import { InspectorPage } from "~/src/screens/inspector";
2827
import { useFetch, useNuxtApp, useRoute, useRouter } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
2928
import { PageHeader } from "~/src/widgets/ui";
3029
import { useInspector } from "~/src/entities/inspector";
31-
import { EventId } from "~/src/shared/types";
30+
import type { EventId } from "~/src/shared/types";
31+
import { InspectorPage } from "~/src/screens/inspector";
3232
3333
const { normalizeInspectorEvent } = useInspector();
3434

pages/profiler/[id].vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
<script lang="ts">
2626
import { defineComponent } from "vue";
27-
import { ProfilerPage } from "~/src/screens/profiler";
2827
import { useFetch, useNuxtApp, useRoute, useRouter } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
2928
import { PageHeader } from "~/src/widgets/ui";
3029
import { useProfiler } from "~/src/entities/profiler/lib";
31-
import { EventId } from "~/src/shared/types";
30+
import type { EventId } from "~/src/shared/types";
31+
import { ProfilerPage } from "~/src/screens/profiler";
3232
3333
const { normalizeProfilerEvent } = useProfiler();
3434

pages/sentry/[id].vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
<script lang="ts">
2424
import { defineComponent } from "vue";
25-
import { SentryPage } from "~/src/screens/sentry";
2625
import { useNuxtApp, useRoute, useRouter, useFetch } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
2726
import { PageHeader } from "~/src/widgets/ui";
2827
import { useSentry } from "~/src/entities/sentry";
29-
import { EventId } from "~/src/shared/types";
28+
import type { EventId } from "~/src/shared/types";
29+
import { SentryPage } from "~/src/screens/sentry";
3030
3131
const { normalizeSentryEvent } = useSentry();
3232

0 commit comments

Comments
 (0)