You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2022/01/15 05:15:12 UTC
[dolphinscheduler] branch dev updated: Packaging problem fix (#8059)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 805ad72 Packaging problem fix (#8059)
805ad72 is described below
commit 805ad72e4242f3d13f7a2d140ef60b3a73405c55
Author: labbomb <73...@qq.com>
AuthorDate: Sat Jan 15 13:15:05 2022 +0800
Packaging problem fix (#8059)
---
dolphinscheduler-ui-next/package.json | 4 ++--
.../src/layouts/content/components/user/use-dropdown.ts | 1 +
dolphinscheduler-ui-next/src/views/resource/file/index.tsx | 2 +-
dolphinscheduler-ui-next/vite.config.ts | 8 ++++++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-ui-next/package.json b/dolphinscheduler-ui-next/package.json
index ecf2800..0d4f012 100644
--- a/dolphinscheduler-ui-next/package.json
+++ b/dolphinscheduler-ui-next/package.json
@@ -7,12 +7,12 @@
"build:prod": "vue-tsc --noEmit && vite build --mode production",
"preview": "vite preview",
"lint": "eslint src --fix --ext .ts,.tsx,.vue",
- "prettier": "prettier --write src/**/*.{vue,ts,tsx}"
+ "prettier": "prettier --write \"src/**/*.{vue,ts,tsx}\""
},
"dependencies": {
"@vueuse/core": "^7.5.3",
"axios": "^0.24.0",
- "date-fns": "^2.28.0",
+ "date-fns": "^2.27.0",
"echarts": "^5.2.2",
"lodash": "^4.17.21",
"monaco-editor": "^0.31.1",
diff --git a/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts b/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts
index d5dc391..31d8b30 100644
--- a/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts
+++ b/dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts
@@ -19,6 +19,7 @@ import { useRouter } from 'vue-router'
import { logout } from '@/service/modules/logout'
import { useUserStore } from '@/store/user/user'
import type { Router } from 'vue-router'
+import { DropdownOption } from 'naive-ui'
export function useDropDown() {
const router: Router = useRouter()
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/index.tsx
index c21ae0d..141c3dc 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/index.tsx
@@ -53,7 +53,7 @@ export default defineComponent({
const router: Router = useRouter()
const fileId = ref(Number(router.currentRoute.value.params.id) || -1)
- const reload = inject('reload')
+ const reload:any = inject('reload')
const resourceListRef = ref()
const folderShowRef = ref(false)
const uploadShowRef = ref(false)
diff --git a/dolphinscheduler-ui-next/vite.config.ts b/dolphinscheduler-ui-next/vite.config.ts
index 884f059..8e82cce 100644
--- a/dolphinscheduler-ui-next/vite.config.ts
+++ b/dolphinscheduler-ui-next/vite.config.ts
@@ -22,6 +22,7 @@ import viteCompression from 'vite-plugin-compression'
import path from 'path'
export default defineConfig({
+ base: process.env.NODE_ENV === 'production' ? './' : '/',
plugins: [
vue(),
vueJsx(),
@@ -30,7 +31,8 @@ export default defineConfig({
disable: false,
threshold: 10240,
algorithm: 'gzip',
- ext: '.gz'
+ ext: '.gz',
+ deleteOriginFile: false
})
],
build: {
@@ -43,7 +45,9 @@ export default defineConfig({
},
resolve: {
alias: {
- '@': path.resolve(__dirname, 'src')
+ '@': path.resolve(__dirname, 'src'),
+ // resolve vue-i18n warning: You are running the esm-bundler build of vue-i18n.
+ 'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
}
}
})