Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement/add vite plugin #386

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Add panel to display all errors.
* Add a button to rearrange all components automatically.
* Splash screen.
* Technical content:
* quasar/app-vite plugin to use vite.

### Changed

Expand Down
5 changes: 2 additions & 3 deletions src/index.template.html → index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html>
<head>
<title><%= productName %></title>

Expand All @@ -18,7 +18,6 @@
<link rel="mask-icon" href="/icons/safari-pinned-tab.svg" color="#474262">
</head>
<body>
<!-- DO NOT touch the following DIV -->
<div id="q-app"></div>
<!-- quasar:entry-point -->
</body>
</html>
4,737 changes: 2,912 additions & 1,825 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"@babel/preset-env": "=7.23.2",
"@badeball/cypress-cucumber-preprocessor": "=18.0.6",
"@cypress/browserify-preprocessor": "=3.0.2",
"@quasar/app-vite": "^1.4.6",
"@quasar/app-webpack": "=3.9.6",
"@quasar/quasar-app-extension-testing": "=2.1.1",
"@quasar/quasar-app-extension-testing-unit-jest": "=3.0.0-alpha.10",
Expand Down
4 changes: 2 additions & 2 deletions src/components/card/DiagramsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ import { getAllModels } from 'src/composables/Project';
import { getAllTagsByType } from 'src/composables/PluginManager';
import { searchText } from 'src/composables/Filter';

import DiagramTable from 'src/components/table/DiagramTable';
import DiagramGrid from 'src/components/grid/DiagramGrid';
import DiagramTable from 'src/components/table/DiagramTable.vue';
import DiagramGrid from 'src/components/grid/DiagramGrid.vue';
import DiagramFilterCard from 'components/card/DiagramFilterCard.vue';

import DialogEvent from 'src/composables/events/DialogEvent';
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/FileExplorerActionCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<script setup>
import { ref } from 'vue';
import FileExplorerActionMenu from 'components/menu/FileExplorerActionMenu';
import FileExplorerActionMenu from 'components/menu/FileExplorerActionMenu.vue';

const isActionMenuOpen = ref(false);

Expand Down
2 changes: 1 addition & 1 deletion src/components/card/GitBranchCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useRoute } from 'vue-router';
import { onMounted, onUnmounted, ref } from 'vue';
import GitEvent from 'src/composables/events/GitEvent';
import FileEvent from 'src/composables/events/FileEvent';
import GitBranchMenu from 'components/menu/GitBranchMenu';
import GitBranchMenu from 'components/menu/GitBranchMenu.vue';

let addRemoteSubscription;
let checkoutSubscription;
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/CreateFileDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<script setup>
import { ref, onMounted, onUnmounted } from 'vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import CreateFileForm from 'components/form/CreateFileForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import CreateFileForm from 'components/form/CreateFileForm.vue';

defineProps({
projectName: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/CreateModelDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import CreateModelForm from 'components/form/CreateModelForm.vue';

defineProps({
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/CreateProjectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'src/components/dialog/DefaultDialog';
import CreateProjectForm from 'src/components/form/CreateProjectForm';
import DefaultDialog from 'src/components/dialog/DefaultDialog.vue';
import CreateProjectForm from 'src/components/form/CreateProjectForm.vue';
import { useRouter } from 'vue-router';
import { initProject } from 'src/composables/Project';
import { Notify } from 'quasar';
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/CreateProjectTemplateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'src/components/dialog/DefaultDialog';
import CreateProjectTemplateForm from 'src/components/form/CreateProjectTemplateForm';
import DefaultDialog from 'src/components/dialog/DefaultDialog.vue';
import CreateProjectTemplateForm from 'src/components/form/CreateProjectTemplateForm.vue';
import { useRouter } from 'vue-router';
import {
onMounted,
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/DeleteFileDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import {
onUnmounted,
} from 'vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import DeleteFileForm from 'components/form/DeleteFileForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import DeleteFileForm from 'components/form/DeleteFileForm.vue';

defineProps({
projectName: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/DeleteModelDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import DeleteModelForm from 'components/form/DeleteModelForm.vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/DeleteProjectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'src/components/dialog/DefaultDialog';
import DeleteProjectForm from 'src/components/form/DeleteProjectForm';
import DefaultDialog from 'src/components/dialog/DefaultDialog.vue';
import DeleteProjectForm from 'src/components/form/DeleteProjectForm.vue';
import { onMounted, onUnmounted, ref } from 'vue';

const projectId = ref(null);
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitAddRemoteDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import GitAddRemoteForm from 'components/form/GitAddRemoteForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import GitAddRemoteForm from 'components/form/GitAddRemoteForm.vue';

defineProps({
projectName: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitAuthenticationDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import GitAuthenticationForm from 'components/form/GitAuthenticationForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import GitAuthenticationForm from 'components/form/GitAuthenticationForm.vue';

defineProps({
projectName: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitCommitDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import {
onMounted,
onUnmounted,
ref,
} from 'vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import { getStatus } from 'src/composables/Project';
import GitCommitForm from 'components/form/GitCommitForm';
import GitCommitForm from 'components/form/GitCommitForm.vue';
import GitEvent from 'src/composables/events/GitEvent';

const props = defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/GitLogDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

<script setup>
import { onMounted, onUnmounted, ref } from 'vue';
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import { gitLog } from 'src/composables/Project';

Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitNewBranchDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import GitNewBranchForm from 'components/form/GitNewBranchForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import GitNewBranchForm from 'components/form/GitNewBranchForm.vue';
import { onMounted, onUnmounted, ref } from 'vue';

defineProps({
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitPushDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import GitPushForm from 'components/form/GitPushForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import GitPushForm from 'components/form/GitPushForm.vue';
import { onMounted, onUnmounted, ref } from 'vue';

defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/GitStatusDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import {
computed,
onMounted,
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/GitUpdateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'components/dialog/DefaultDialog';
import GitUpdateForm from 'components/form/GitUpdateForm';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import GitUpdateForm from 'components/form/GitUpdateForm.vue';
import { onMounted, onUnmounted, ref } from 'vue';

defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/ImportModelTemplateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import ImportModelTemplateForm from 'components/form/ImportModelTemplateForm.vue';
import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/ImportProjectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'src/components/dialog/DefaultDialog';
import ImportProjectForm from 'src/components/form/ImportProjectForm';
import DefaultDialog from 'src/components/dialog/DefaultDialog.vue';
import ImportProjectForm from 'src/components/form/ImportProjectForm.vue';
import { useRouter } from 'vue-router';

const router = useRouter();
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/RenameModelDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</template>

<script setup>
import DefaultDialog from 'components/dialog/DefaultDialog';
import DefaultDialog from 'components/dialog/DefaultDialog.vue';
import RenameModelForm from 'components/form/RenameModelForm.vue';
import DialogEvent from 'src/composables/events/DialogEvent';
import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/RenameProjectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<script setup>
import DialogEvent from 'src/composables/events/DialogEvent';
import DefaultDialog from 'src/components/dialog/DefaultDialog';
import RenameProjectForm from 'src/components/form/RenameProjectForm';
import DefaultDialog from 'src/components/dialog/DefaultDialog.vue';
import RenameProjectForm from 'src/components/form/RenameProjectForm.vue';
import { onMounted, onUnmounted, ref } from 'vue';

const projectId = ref(null);
Expand Down
4 changes: 2 additions & 2 deletions src/components/drawer/HomeDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
</template>

<script setup>
import DefaultDrawer from 'src/components/drawer/DefaultDrawer';
import ShortProjectsItem from 'src/components/item/ShortProjectsItem';
import DefaultDrawer from 'src/components/drawer/DefaultDrawer.vue';
import ShortProjectsItem from 'src/components/item/ShortProjectsItem.vue';
</script>
2 changes: 1 addition & 1 deletion src/components/drawer/ModelizerTextLeftDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<script setup>
import FileExplorer from 'src/components/FileExplorer.vue';
import GitBranchCard from 'src/components/card/GitBranchCard';
import GitBranchCard from 'src/components/card/GitBranchCard.vue';
import { computed, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';

Expand Down
8 changes: 3 additions & 5 deletions src/components/editor/MonacoEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@ import {
onMounted,
onUpdated,
onUnmounted,
nextTick,
ref,
} from 'vue';
import FileEvent from 'src/composables/events/FileEvent';
import GitEvent from 'src/composables/events/GitEvent';
import { getPlugins } from 'src/composables/PluginManager';
import Languages from 'assets/editor/languages';

const monaco = require('monaco-editor');

const props = defineProps({
projectName: {
type: String,
Expand All @@ -43,6 +40,7 @@ const props = defineProps({
});

const container = ref(null);
let monaco;
let editor;
let checkoutSubscription;
let addRemoteSubscription;
Expand Down Expand Up @@ -141,7 +139,8 @@ async function updateEditorContent() {
}

onBeforeMount(async () => {
await nextTick();
monaco = await import('monaco-editor');

if (!editor) {
await createEditor();
}
Expand All @@ -163,7 +162,6 @@ onMounted(() => {
});

onUpdated(async () => {
await nextTick();
await updateEditorLayout();
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/grid/ComponentDefinitionGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</template>

<script setup>
import ComponentDefinitionCard from 'src/components/card/ComponentDefinitionCard';
import ComponentDefinitionCard from 'src/components/card/ComponentDefinitionCard.vue';

defineProps({
definitions: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/grid/DiagramGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</template>

<script setup>
import ModelCard from 'src/components/card/ModelCard';
import ModelCard from 'src/components/card/ModelCard.vue';

defineEmits(['click:diagram']);
defineProps({
Expand Down
2 changes: 1 addition & 1 deletion src/components/grid/TemplateGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<script setup>
import { ref, computed } from 'vue';
import { searchText } from 'src/composables/Filter';
import TemplateCard from 'src/components/card/TemplateCard';
import TemplateCard from 'src/components/card/TemplateCard.vue';

defineEmits(['add:template']);

Expand Down
2 changes: 1 addition & 1 deletion src/components/inputs/AttributesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<script setup>
import { reactive, toRef, watch } from 'vue';
import InputWrapper from 'components/inputs/InputWrapper';
import InputWrapper from 'components/inputs/InputWrapper.vue';
import ObjectInput from 'src/components/inputs/ObjectInput.vue';

const emit = defineEmits([
Expand Down
14 changes: 7 additions & 7 deletions src/components/inputs/InputWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ const props = defineProps({
});

const inputList = {
Boolean: defineAsyncComponent(() => import('./BooleanInput')),
String: defineAsyncComponent(() => import('./StringInput')),
Number: defineAsyncComponent(() => import('./NumberInput')),
Reference: defineAsyncComponent(() => import('./ReferenceInput')),
Select: defineAsyncComponent(() => import('./SelectInput')),
Link: defineAsyncComponent(() => import('./LinkInput')),
Array: defineAsyncComponent(() => import('./ArrayInput')),
Boolean: defineAsyncComponent(() => import('./BooleanInput.vue')),
String: defineAsyncComponent(() => import('./StringInput.vue')),
Number: defineAsyncComponent(() => import('./NumberInput.vue')),
Reference: defineAsyncComponent(() => import('./ReferenceInput.vue')),
Select: defineAsyncComponent(() => import('./SelectInput.vue')),
Link: defineAsyncComponent(() => import('./LinkInput.vue')),
Array: defineAsyncComponent(() => import('./ArrayInput.vue')),
};

const propsAttribute = toRef(props, 'attribute');
Expand Down
2 changes: 1 addition & 1 deletion src/components/list/ComponentDefinitionsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</template>

<script setup>
import LibraryList from 'src/components/list/LibraryList';
import LibraryList from 'src/components/list/LibraryList.vue';
import { useRouter } from 'vue-router';

const router = useRouter();
Expand Down
Loading