Skip to content

Commit

Permalink
Revert nuxt update to fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
MWedl committed Sep 23, 2024
1 parent 810257b commit 78df776
Show file tree
Hide file tree
Showing 15 changed files with 475 additions and 549 deletions.
396 changes: 128 additions & 268 deletions frontend/NOTICE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createProxyServer } from "httpxy"
import type { IncomingMessage, ServerResponse } from 'http';
import type { IncomingMessage, ServerResponse } from "http";

const isDev = process.env.NODE_ENV === 'development';

Expand Down
599 changes: 334 additions & 265 deletions frontend/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": "npm run generate-notice"
},
"dependencies": {
"nuxt": "~3.13",
"nuxt": "3.13.0",
"vuetify": "~3.7",
"vuetify-nuxt-module": "^0.18.2",
"@mdi/font": "^7.3.67",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Comment/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

<script setup lang="ts">
import { groupBy } from 'lodash-es';
import { CommentStatus, type Comment, type FieldDefinition } from '@/utils/types';
import { CommentStatus, type Comment, type FieldDefinition } from '#imports';
const localSettings = useLocalSettings();
const apiSettings = useApiSettings();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<script setup lang="ts">
import Draggable from 'vuedraggable';
import { SortOrder } from '~/utils/types';
import { SortOrder } from '#imports';
const props = defineProps<{
modelValue: FindingOrderingDefinition[];
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/EditToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@
import { debounce, cloneDeep, isEqual } from 'lodash-es';
import type { VForm } from "vuetify/lib/components/index.mjs";
import type { NavigationGuardNext, RouteLocationNormalized } from "vue-router";
import type { LockInfo } from '@/utils/types';
import { EditMode } from '@/utils/types';
import { type LockInfo, EditMode } from '#imports';
const props = withDefaults(defineProps<{
data?: T|null,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ErrorList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

<script setup lang="ts">
import { sortBy, groupBy } from "lodash-es";
import type { MessageLevel as MessageLevelType } from '~/utils/types';
import type { MessageLevel as MessageLevelType } from '#imports';
const props = defineProps<{
value: ErrorMessage[];
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/LoginForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@

<script setup lang="ts">
import { get as navigatorCredentialsGet, parseRequestOptionsFromJSON } from "@github/webauthn-json/browser-ponyfill";
import { LoginResponseStatus, mfaMethodChoices, MfaMethodType } from '@/utils/types';
import { LoginResponseStatus, mfaMethodChoices, MfaMethodType } from '#imports';
const props = defineProps({
username: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Markdown/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import {
isTaskListInSelection,
} from 'reportcreator-markdown/editor';
import type { VToolbar } from 'vuetify/lib/components/index.mjs';
import { MarkdownEditorMode } from '@/utils/types';
import { MarkdownEditorMode } from '#imports';
const props = defineProps<{
editorView?: EditorView|null;
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/composables/apisettings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { AuthProviderType } from '@/utils/types';
import type { ApiSettings, AuthProvider, CWE } from '@/utils/types';
import { type ApiSettings, type AuthProvider, type CWE, AuthProviderType } from '#imports';

export const useApiSettings = defineStore('apisettings', {
state: () => ({
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/composables/history.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { pick, get, trim } from "lodash-es";
import {
MergeView, type EditorView,
} from "reportcreator-markdown/editor";
import { MarkdownEditorMode, type FieldDefinition, type PentestProject, type ProjectType } from '@/utils/types';
import { MarkdownEditorMode, type FieldDefinition, type PentestProject, type ProjectType } from '#imports';

export type DiffFieldProps = {
value?: any;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/backups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</template>

<script setup lang="ts">
import { BackupLogType } from '@/utils/types';
import { BackupLogType } from '#imports';
definePageMeta({
title: 'Backup',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/users/self/security.vue
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
import { create as navigatorCredentialsCreate, parseCreationOptionsFromJSON } from "@github/webauthn-json/browser-ponyfill";
import { cloneDeep } from 'lodash-es';
import type { VForm } from "vuetify/lib/components/index.mjs";
import { mfaMethodChoices, MfaMethodType } from '@/utils/types';
import { mfaMethodChoices, MfaMethodType } from '#imports';
const auth = useAuth();
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/stores/projecttype.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { pick } from 'lodash-es';
import { parseISO, formatISO9075 } from 'date-fns';
import { ProjectTypeScope } from '~/utils/types';
import type { FieldDefinition, ProjectType } from "#imports";
import { type FieldDefinition, type ProjectType, ProjectTypeScope } from "#imports";

export const useProjectTypeStore = defineStore('projecttype', {
state: () => ({
Expand Down

0 comments on commit 78df776

Please sign in to comment.