diff --git a/index.html b/index.html deleted file mode 100644 index 58b802eca..000000000 --- a/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - Vite App - - -
- - - diff --git a/package.json b/package.json index b01be8251..5c7ae77da 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "@types/yaml-front-matter": "^4.1.0", "@typescript-eslint/eslint-plugin": "^4.8.0", "@typescript-eslint/parser": "^4.8.0", + "@vitejs/plugin-vue": "^1.0.0", "@vue/babel-plugin-jsx": "^1.0.0", "@vue/compiler-sfc": "^3.0.0", "@vue/eslint-config-prettier": "^6.0.0", @@ -82,8 +83,8 @@ "ts-node": "^9.1.0", "tslib": "^2.0.0", "typescript": "^4.1.0", - "vite": "^1.0.0-rc.13", - "vue": "^3.0.0", + "vite": "^v2.0.0-beta.2", + "vue": "^3.0.5", "vue-jest": "^5.0.0-alpha.7", "vue-router": "^4.0.0", "vue-types": "^3.0.0", diff --git a/packages/components/icon/demo/Basic.vue b/packages/components/icon/demo/Basic.vue index 30f33b893..28ed56959 100644 --- a/packages/components/icon/demo/Basic.vue +++ b/packages/components/icon/demo/Basic.vue @@ -21,8 +21,7 @@ export default defineComponent({ // 动态加载:不会被打包,可以减小包体积,需要加载的时候时候 http 请求加载 const loadIconDynamically = (iconName: string) => { - // TODO: fix with vite - return fetch(`site/docs/src/assets/icon-svg/${iconName}.svg`).then(res => res.text()) + return fetch(`/icon-svg/${iconName}.svg`).then(res => res.text()) } useGlobalConfig('icon', { loadIconDynamically }) diff --git a/scripts/gulp/buildConfig.ts b/scripts/gulp/buildConfig.ts index 5c93b646c..06974e507 100644 --- a/scripts/gulp/buildConfig.ts +++ b/scripts/gulp/buildConfig.ts @@ -24,7 +24,7 @@ export const buildConfig: BuildConfig = { packageRoot, docsDir, siteDir, - siteIconAssetsDir: join(siteDir, 'docs/src/assets/icon-svg'), + siteIconAssetsDir: join(siteDir, 'docs/public/icon-svg'), outputDir: join(outputRoot, 'dist'), publishDir: join(outputRoot, 'publish'), libDir: join(outputRoot, 'lib'), diff --git a/scripts/gulp/site/_site/docs/index.html b/scripts/gulp/site/_site/docs/index.html index 54db60dd2..d4bf43313 100644 --- a/scripts/gulp/site/_site/docs/index.html +++ b/scripts/gulp/site/_site/docs/index.html @@ -2,12 +2,12 @@ - + Vite App
- + diff --git a/scripts/gulp/site/_site/docs/src/App.vue b/scripts/gulp/site/_site/docs/src/App.vue index b7a08df3e..d7aaabe09 100644 --- a/scripts/gulp/site/_site/docs/src/App.vue +++ b/scripts/gulp/site/_site/docs/src/App.vue @@ -30,8 +30,7 @@ export default defineComponent({ setup() { // 动态加载:不会被打包,可以减小包体积,需要加载的时候时候 http 请求加载 const loadIconDynamically = (iconName: string) => { - // TODO: fix with vite - return fetch(`site/docs/src/assets/icon-svg/${iconName}.svg`).then(res => res.text()) + return fetch(`/icon-svg/${iconName}.svg`).then(res => res.text()) } useGlobalConfig('icon', { loadIconDynamically }) diff --git a/scripts/gulp/site/_site/docs/src/header/Logo.vue b/scripts/gulp/site/_site/docs/src/header/Logo.vue index 907020f27..f50f249b3 100644 --- a/scripts/gulp/site/_site/docs/src/header/Logo.vue +++ b/scripts/gulp/site/_site/docs/src/header/Logo.vue @@ -1,6 +1,6 @@ diff --git a/vite.config.ts b/vite.config.ts index f668569ee..2323b637b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,23 +1,21 @@ -import { UserConfig } from 'vite' +import { defineConfig } from 'vite' +import vuePlugin from '@vitejs/plugin-vue' +import path from 'path' -const config: UserConfig = { - entry: './site/docs/index.html', // not work - base: './site/docs/', // not work - resolvers: [ +export default defineConfig({ + root: './site/docs/', + plugins: [vuePlugin()], + alias: [ { - alias(path: string): string { - if (path.startsWith('@idux')) { - return path.replace('@idux', '/packages') - } - return path - }, + find: '@idux', + replacement: path.resolve(__dirname, 'packages'), }, ], - cssPreprocessOptions: { - less: { - javascriptEnabled: true, + css: { + preprocessorOptions: { + less: { + javascriptEnabled: true, + }, }, }, -} - -export default config +})