From d247ffc20fd030947cd4e88129c87af9a75e43bc Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Sun, 1 Nov 2020 22:20:29 +0100 Subject: [PATCH] start refactor to vite --- .../App/components/buttons/select-button.vue | 2 +- zero.Web.UI/App/components/date.vue | 2 +- zero.Web.UI/App/components/forms/alias.vue | 2 +- zero.Web.UI/App/components/forms/error.vue | 2 +- .../App/components/forms/media-old.vue | 2 +- zero.Web.UI/App/components/forms/rte.vue | 2 +- zero.Web.UI/App/components/header-bar.vue | 2 +- .../App/components/modules/edit-module.vue | 2 +- .../App/components/modules/modules-select.vue | 2 +- .../App/components/modules/modules.vue | 2 +- .../components/overlays/dropdown-button.vue | 2 +- .../App/components/overlays/dropdown.vue | 2 +- zero.Web.UI/App/components/permissions.vue | 2 +- .../pickers/colorPicker/colorpicker.vue | 2 +- .../pickers/countryPicker/countrypicker.vue | 2 +- .../pickers/datePicker/datepicker.vue | 4 +- .../dateRangePicker/daterangepicker.vue | 4 +- .../pickers/iconPicker/iconpicker.vue | 4 +- .../pickers/mediaPicker/mediapicker.vue | 4 +- .../pickers/mediaPicker/overlay.vue | 4 +- .../pickers/pagePicker/pagepicker.vue | 6 +- .../pickers/userPicker/userpicker.vue | 2 +- zero.Web.UI/App/components/revisions.vue | 2 +- .../tables/table-filter-overlay.vue | 4 +- .../App/components/tables/table-filter.vue | 6 +- .../App/components/tables/table-value.js | 4 +- zero.Web.UI/App/components/tabs/tab.vue | 2 +- zero.Web.UI/App/config/axios.config.js | 2 +- zero.Web.UI/App/config/router.config.js | 2 +- zero.Web.UI/App/directives/currency.js | 2 +- zero.Web.UI/App/directives/date.js | 2 +- zero.Web.UI/App/directives/filesize.js | 2 +- zero.Web.UI/App/directives/globals.js | 16 ++-- zero.Web.UI/App/directives/localize.js | 2 +- .../App/editor/editor-component-old.vue | 6 +- zero.Web.UI/App/editor/editor-component.vue | 6 +- zero.Web.UI/App/editor/editor-overlay.vue | 2 +- .../App/editor/fields/culturepicker.vue | 2 +- zero.Web.UI/App/editor/fields/language.vue | 2 +- zero.Web.UI/App/editor/fields/nested.vue | 6 +- zero.Web.UI/App/filters/globals.js | 2 +- zero.Web.UI/App/filters/localize.js | 2 +- zero.Web.UI/App/navigation.vue | 2 +- zero.Web.UI/App/pages/dashboard/dashboard.vue | 3 +- zero.Web.UI/App/pages/media/detail.vue | 4 +- zero.Web.UI/App/pages/media/media.vue | 12 +-- zero.Web.UI/App/pages/pages/overlays/copy.vue | 2 +- zero.Web.UI/App/pages/pages/overlays/move.vue | 2 +- zero.Web.UI/App/pages/pages/overlays/sort.vue | 2 +- zero.Web.UI/App/pages/pages/page-info.vue | 2 +- zero.Web.UI/App/pages/pages/page.vue | 14 +-- zero.Web.UI/App/pages/pages/pages.vue | 12 +-- .../pages/recyclebin/recyclebin-actions.vue | 2 +- .../App/pages/pages/recyclebin/recyclebin.vue | 4 +- .../pages/settings/application-features.vue | 2 +- .../App/pages/settings/application.vue | 4 +- .../App/pages/settings/applications.vue | 2 +- zero.Web.UI/App/pages/settings/country.vue | 4 +- zero.Web.UI/App/pages/settings/language.vue | 4 +- zero.Web.UI/App/pages/settings/role.vue | 4 +- zero.Web.UI/App/pages/settings/settings.vue | 2 +- .../App/pages/settings/translation.vue | 2 +- .../App/pages/settings/translations.vue | 2 +- zero.Web.UI/App/pages/settings/user.vue | 4 +- zero.Web.UI/App/pages/spaces/spaces.vue | 6 +- zero.Web.UI/App/pages/spaces/views/editor.vue | 2 +- zero.Web.UI/App/renderer/createListField.js | 31 ------- .../App/renderer/createListRenderer.js | 85 ------------------- zero.Web.UI/App/renderer/list-fields/text.js | 32 ------- zero.Web.UI/App/renderers/lists/languages.js | 2 +- zero.Web.UI/App/resources/media.js | 2 +- zero.Web.UI/App/resources/users.js | 2 +- zero.Web.UI/App/services/auth.js | 4 +- zero.Web.UI/App/services/notification.js | 2 +- zero.Web.UI/App/services/overlay.js | 4 +- zero.Web.UI/app.js | 16 ---- zero.Web.UI/app/app.js | 16 ++++ .../core/editor-field.ts} | 0 .../core/editor.js => app/core/editor.ts} | 0 .../core/list-action.ts} | 6 +- .../core/list-column.ts} | 6 +- .../{App/core/list.js => app/core/list.ts} | 0 .../core/plugin.js => app/core/plugin.ts} | 0 .../{App/core/zero.js => app/core/zero.ts} | 8 +- zero.Web.UI/index.html | 13 +++ zero.Web.UI/package.json | 27 ++---- zero.Web.UI/vite.config.js | 50 +++++++++++ 87 files changed, 221 insertions(+), 316 deletions(-) delete mode 100644 zero.Web.UI/App/renderer/createListField.js delete mode 100644 zero.Web.UI/App/renderer/createListRenderer.js delete mode 100644 zero.Web.UI/App/renderer/list-fields/text.js delete mode 100644 zero.Web.UI/app.js create mode 100644 zero.Web.UI/app/app.js rename zero.Web.UI/{App/core/editor-field.js => app/core/editor-field.ts} (100%) rename zero.Web.UI/{App/core/editor.js => app/core/editor.ts} (100%) rename zero.Web.UI/{App/core/list-action.js => app/core/list-action.ts} (75%) rename zero.Web.UI/{App/core/list-column.js => app/core/list-column.ts} (96%) rename zero.Web.UI/{App/core/list.js => app/core/list.ts} (100%) rename zero.Web.UI/{App/core/plugin.js => app/core/plugin.ts} (100%) rename zero.Web.UI/{App/core/zero.js => app/core/zero.ts} (93%) create mode 100644 zero.Web.UI/index.html create mode 100644 zero.Web.UI/vite.config.js diff --git a/zero.Web.UI/App/components/buttons/select-button.vue b/zero.Web.UI/App/components/buttons/select-button.vue index aaba2b79..e095ee5d 100644 --- a/zero.Web.UI/App/components/buttons/select-button.vue +++ b/zero.Web.UI/App/components/buttons/select-button.vue @@ -16,7 +16,7 @@ diff --git a/zero.Web.UI/App/pages/media/detail.vue b/zero.Web.UI/App/pages/media/detail.vue index c09fdb2a..17db9679 100644 --- a/zero.Web.UI/App/pages/media/detail.vue +++ b/zero.Web.UI/App/pages/media/detail.vue @@ -32,8 +32,8 @@ + + \ No newline at end of file diff --git a/zero.Web.UI/package.json b/zero.Web.UI/package.json index 83a310e1..cba1d1f2 100644 --- a/zero.Web.UI/package.json +++ b/zero.Web.UI/package.json @@ -3,32 +3,23 @@ "version": "0.1.0", "private": true, "scripts": { - "install": "", - "zero": "node zero.run.js", - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "build-dev": "vue-cli-service build --mode development", - "watch": "vue-cli-service build --mode development --watch" + "dev": "vite", + "build": "vite build" }, "dependencies": { - "core-js": "^3.6.5", - "axios": "^0.19.2", + "axios": "^0.21.0", "dayjs": "^1.8.26", "flatpickr": "^4.6.3", - "lodash": "*", + "qs": "^6.9.4", "sortablejs": "^1.10.2", "underscore": "^1.10.2", - "vue": "^2.6.11", - "vue-router": "^3.2.0" + "vue": "^2.6.12", + "vue-router": "^3.4.8" }, "devDependencies": { - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-service": "~4.5.0", - "npm-cmd": "^0.2.0", "sass": "^1.26.5", - "sass-loader": "^8.0.2", - "syncpack": "^5.6.10", - "vue-template-compiler": "^2.6.11" + "vite": "^1.0.0-rc.8", + "vite-plugin-vue2": "^0.2.1", + "vue-template-compiler": "^2.6.12" } } diff --git a/zero.Web.UI/vite.config.js b/zero.Web.UI/vite.config.js new file mode 100644 index 00000000..952fef80 --- /dev/null +++ b/zero.Web.UI/vite.config.js @@ -0,0 +1,50 @@ +const path = require('path'); +const { createVuePlugin } = require('vite-plugin-vue2'); + +let zeroPlugins = []; +//if (process.env.ZERO_PLUGINS) +//{ +// let plugins = JSON.parse(process.env.ZERO_PLUGINS); + +// plugins.forEach(plugin => +// { +// const pluginConfig = require(plugin.path); + +// if (pluginConfig != null) +// { +// zeroPlugins.push(pluginConfig()); +// } +// }); +//} + +const aliasResolver = { + alias(id) + { + if (id.indexOf('zero/') === 0 || id.indexOf('shop/') === 0) + { + return '/@' + id; + } + } + //requestToFile(publicPath, root) + //{ + // if (publicPath.indexOf('/@zero/') === 0) + // { + // return path.join(root, publicPath.replace('/@zero/', '')); + // } + // if (publicPath.indexOf('/@shop/') === 0) + // { + // return path.join(root, publicPath.replace('/@shop/', '../zero.Commerce/Plugins/zero.Commerce/')); + // } + //} +}; + +export default { + port: process.env.PORT, + cors: true, + emitManifest: true, + plugins: [createVuePlugin(), ...zeroPlugins], + alias: { + '/@zero/': path.resolve(__dirname, 'app/') + }, + resolvers: [aliasResolver] +} \ No newline at end of file