diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..bf2e764 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +shamefully-hoist=true diff --git a/package.json b/package.json index b076ab7..7c9487a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "build": "cross-env NODE_ENV=production vite-ssg build" }, "dependencies": { - "@vueuse/core": "^4.0.12", + "@vueuse/core": "^4.1.0", "@vueuse/head": "^0.2.3", "nprogress": "^0.2.0", "prism-theme-vars": "^0.1.4", @@ -15,8 +15,8 @@ }, "devDependencies": { "@antfu/eslint-config": "^0.4.3", - "@iconify/json": "^1.1.297", - "@intlify/vite-plugin-vue-i18n": "1.0.0-beta.12", + "@iconify/json": "^1.1.298", + "@intlify/vite-plugin-vue-i18n": "^1.0.0-beta.15", "@tailwindcss/typography": "^0.4.0", "@types/nprogress": "^0.2.0", "@typescript-eslint/eslint-plugin": "^4.14.2", @@ -32,12 +32,12 @@ "postcss-nested": "^5.0.3", "tailwindcss": "^2.0.2", "typescript": "^4.1.3", - "vite": "2.0.0-beta.46", + "vite": "^2.0.0-beta.65", "vite-plugin-components": "^0.6.6", "vite-plugin-icons": "^0.2.1", "vite-plugin-md": "^0.4.2", - "vite-plugin-pages": "^0.1.9", - "vite-plugin-pwa": "^0.4.3", + "vite-plugin-pages": "^0.2.3", + "vite-plugin-pwa": "^0.4.4", "vite-ssg": "^0.8.0" }, "eslintConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23065e4..49946a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,5 @@ dependencies: - '@vueuse/core': 4.0.12_vue@3.0.5 + '@vueuse/core': 4.1.0_vue@3.0.5 '@vueuse/head': 0.2.3_vue@3.0.5 nprogress: 0.2.0 prism-theme-vars: 0.1.4 @@ -8,8 +8,8 @@ dependencies: vue-router: 4.0.3_vue@3.0.5 devDependencies: '@antfu/eslint-config': 0.4.3_eslint@7.19.0+typescript@4.1.3 - '@iconify/json': 1.1.297 - '@intlify/vite-plugin-vue-i18n': 1.0.0-beta.12 + '@iconify/json': 1.1.298 + '@intlify/vite-plugin-vue-i18n': 1.0.0-beta.15 '@tailwindcss/typography': 0.4.0_tailwindcss@2.0.2 '@types/nprogress': 0.2.0 '@typescript-eslint/eslint-plugin': 4.14.2_eslint@7.19.0+typescript@4.1.3 @@ -25,13 +25,13 @@ devDependencies: postcss-nested: 5.0.3_postcss@8.2.4 tailwindcss: 2.0.2_90874d0ac9c8f3b30e7bed02cb9a0d41 typescript: 4.1.3 - vite: 2.0.0-beta.46 + vite: 2.0.0-beta.65 vite-plugin-components: 0.6.6 - vite-plugin-icons: 0.2.1_90cfb2856576e5dadc7ba04728831630 - vite-plugin-md: 0.4.2_vite@2.0.0-beta.46 - vite-plugin-pages: 0.1.9_vite@2.0.0-beta.46+vue@3.0.5 - vite-plugin-pwa: 0.4.3 - vite-ssg: 0.8.0_67baffff43cafb4933a0b440cee9b6c9 + vite-plugin-icons: 0.2.1_5e9fc447dd28a648e529bbaba5a2fae3 + vite-plugin-md: 0.4.2_vite@2.0.0-beta.65 + vite-plugin-pages: 0.2.3_vite@2.0.0-beta.65+vue@3.0.5 + vite-plugin-pwa: 0.4.4 + vite-ssg: 0.8.0_c55ab035ab38f8736c0bba324bf99d97 lockfileVersion: 5.2 packages: /@antfu/eslint-config-basic/0.4.3_eslint@7.19.0: @@ -1069,11 +1069,11 @@ packages: dev: true resolution: integrity: sha512-LFelJDOLZ6JHlmlAkgrvmcu4hpNPB91KYcr4f60D/exzU1eNOb4/KCVHIydGHIQFaOacIOD+Xy+B7P1z812cZg== - /@iconify/json/1.1.297: + /@iconify/json/1.1.298: dev: true resolution: - integrity: sha512-mq2qFnxabHoB4eak/FUUHGHGM/U8KaSp+GzwEF9YJaIsztzym5OUzSQLFyUG8V/zHrnQhnNWTbtnHNZtU9Zg1w== - /@intlify/cli/0.1.3: + integrity: sha512-h+IxOqYrW5zL4O+4zyaFl3kVnErHZEBE6d9ZCd6hK+oOAOx0uMkaUgesoR0Ci54U9igyY3Mp6vdMDzHLDCdzkg== + /@intlify/cli/0.2.0: dependencies: '@intlify/core': 9.0.0-beta.16 '@intlify/core-base': 9.0.0-rc.5 @@ -1090,7 +1090,7 @@ packages: node: '>= 10' hasBin: true resolution: - integrity: sha512-brLMe0hD2odyBvqH/48MjfgrsAHS0CjAKz2crO9DVyLXUPPngE8Cu3Zahs68fH+QcGxO2DhgFfb+AXEYVRH3WA== + integrity: sha512-KIB6KggamrUoQJXa2CZad9D0dIH6FijPpRv020VtXvPFphprJKipG19GHndPgKRPK70t6Aj7zsJEqt5GvljKXg== /@intlify/core-base/9.0.0-beta.16: dependencies: '@intlify/message-compiler': 9.0.0-beta.16 @@ -1180,16 +1180,17 @@ packages: node: '>= 10' resolution: integrity: sha512-LGurIHW/TYo07WrbCWXBuZQ3Hg2CHAv5rXLFpxBfHjZawCTrrORQfD4NA+RPVbaWFgzMgw5VJybpJRd9iB1x6g== - /@intlify/vite-plugin-vue-i18n/1.0.0-beta.12: + /@intlify/vite-plugin-vue-i18n/1.0.0-beta.15: dependencies: - '@intlify/cli': 0.1.3 + '@intlify/cli': 0.2.0 '@intlify/shared': 9.0.0-rc.5 '@rollup/pluginutils': 4.1.0 + fast-glob: 3.2.5 dev: true engines: node: '>= 12' resolution: - integrity: sha512-aoM4NigU226DB/bMdEOlf/QVlgh4sV8+ZrDpPzOTEdSvVfild1+iOwILtiCETCSC41DS2u4+znYvzrwdQzcsDg== + integrity: sha512-G7+rtoiYDko2hAILMx5xYfWc3OLqVWQ3Sap/kuHbkXHYpsR9qo91mrTceXrgkYDy0pDXk7ouXHMK7cMeyQSJEA== /@nodelib/fs.scandir/2.1.4: dependencies: '@nodelib/fs.stat': 2.0.4 @@ -1617,15 +1618,15 @@ packages: /@vue/shared/3.0.5: resolution: integrity: sha512-gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw== - /@vueuse/core/4.0.12_vue@3.0.5: + /@vueuse/core/4.1.0_vue@3.0.5: dependencies: - '@vueuse/shared': 4.0.12_vue@3.0.5 + '@vueuse/shared': 4.1.0_vue@3.0.5 vue-demi: 0.6.0_vue@3.0.5 dev: false peerDependencies: vue: '*' resolution: - integrity: sha512-0pAEWyUP6HAqJ6Qzbybfpa8fNVdERMizrgjQI8vRe8+Fu5Ge5a8M2aLYCrdrLNxV6DsEZJ0bUFeTWb3aUnbxUA== + integrity: sha512-rcMceTJS6zDd5UOQr6bxhvqEsOitMNPlXAfTf0AJ9CaXs3ALAhtAyisGZCwZfHE5/Cid3Qy8bl3yWJwmrCOJSA== /@vueuse/head/0.2.3_vue@3.0.5: dependencies: vue: 3.0.5 @@ -1633,14 +1634,14 @@ packages: vue: '>=3' resolution: integrity: sha512-bAFZyUlT6+CVIwMcUw3TrtuhG/BfjS+UV5T8oH30tGPnVvqIsNuRCnNt9EbVd1GxHRDZD0K41515B5NiXPt84A== - /@vueuse/shared/4.0.12_vue@3.0.5: + /@vueuse/shared/4.1.0_vue@3.0.5: dependencies: vue-demi: 0.6.0_vue@3.0.5 dev: false peerDependencies: vue: '*' resolution: - integrity: sha512-t5Amxc3BIwi+M2mI0iy9yHKe5plYJUMbxpIBuMDR953J5s12ewRe3s8MLvQdlhAiNN8FTh9CBKU+mfdNgbWauw== + integrity: sha512-E0g3MGu2RKLjPm6+EEsl93Q8+SDt1FDBnnzLz0iiUjpdo8KmHM6ivcGNe58B44/fNi9p+y0db53fubT0d/XJJQ== /abab/2.0.5: dev: true resolution: @@ -5148,9 +5149,9 @@ packages: dev: true resolution: integrity: sha512-tOcWm/2T+XUImJ8yFZb/i8dUWXNoraqDdKrBBpfbHGg3MES0T6AN1315iuKYHTG71fwKI0OGElw3S9B04ZUwPA== - /vite-plugin-icons/0.2.1_90cfb2856576e5dadc7ba04728831630: + /vite-plugin-icons/0.2.1_5e9fc447dd28a648e529bbaba5a2fae3: dependencies: - '@iconify/json': 1.1.297 + '@iconify/json': 1.1.298 '@iconify/json-tools': 1.0.10 '@vue/compiler-sfc': 3.0.5_vue@3.0.5 dev: true @@ -5159,32 +5160,32 @@ packages: '@vue/compiler-sfc': ^3.0.2 resolution: integrity: sha512-ZIJ8G2AHwEDt4oDST46E6Uy7W2EtVyoe1hzmJMkutbq3esUkcYVoYydT6Y12lhq1ppnVnShkbc0XzfKqolfCSg== - /vite-plugin-md/0.4.2_vite@2.0.0-beta.46: + /vite-plugin-md/0.4.2_vite@2.0.0-beta.65: dependencies: gray-matter: 4.0.2 markdown-it: 12.0.4 - vite: 2.0.0-beta.46 + vite: 2.0.0-beta.65 dev: true peerDependencies: vite: ^2.0.0-beta.1 resolution: integrity: sha512-gAmtGCiPj0ESdWJikKTg4h0ADqybezRVOh1a51KtWqYk4WgwrvFRpTeVq9fVqLXLFhuU0iUIKJ04V3KeXAeWdQ== - /vite-plugin-pages/0.1.9_vite@2.0.0-beta.46+vue@3.0.5: + /vite-plugin-pages/0.2.3_vite@2.0.0-beta.65+vue@3.0.5: dependencies: debug: 4.3.2 directory-tree: 2.2.6 fast-glob: 3.2.5 glob-to-regexp: 0.4.1 - vite: 2.0.0-beta.46 + vite: 2.0.0-beta.65 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 dev: true peerDependencies: - vite: ^2.0.0-beta.61 + vite: ^2.0.0-beta.64 vue: ^3.0.0 resolution: - integrity: sha512-N1xYT14PORPLJaUCCgDKlC8S1SYKKztsWeA7ChPeD23FS76Cs6ST6Hr/sGN4qaesRVdEfwQwUFsYU8Vv2O5t1A== - /vite-plugin-pwa/0.4.3: + integrity: sha512-xt8lBt6ibVHVOjPnVvs9SMjwqbZuJsNliMq80Wi5r5hmbKeiEcwvLje2B65+rLIhDAVJXHBOggqCGB8GL2eP+A== + /vite-plugin-pwa/0.4.4: dependencies: debug: 4.3.2 fast-glob: 3.2.5 @@ -5192,8 +5193,8 @@ packages: workbox-build: 6.1.0 dev: true resolution: - integrity: sha512-VwC/bgAAziH1WiQG0QdjuNIxwlvA/rTFCMQuWQ5VCUHXdxoYb8n0pA/u1/dDP7D7yR1myxUvYZe97wAbJxfscw== - /vite-ssg/0.8.0_67baffff43cafb4933a0b440cee9b6c9: + integrity: sha512-GboCS5XJYHtCYjmU2XU0C8VTccYstJOX8m2Qy1izoUA5YendhjQRByjj9EYTgvh+ImsoXW6gHkMK2eR+AsCFDg== + /vite-ssg/0.8.0_c55ab035ab38f8736c0bba324bf99d97: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 '@vue/server-renderer': 3.0.5_vue@3.0.5 @@ -5203,7 +5204,7 @@ packages: html-minifier: 4.0.0 jsdom: 16.4.0 prettier: 2.2.1 - vite: 2.0.0-beta.46 + vite: 2.0.0-beta.65 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 yargs: 16.2.0 @@ -5219,7 +5220,7 @@ packages: vue-router: ^4.0.1 resolution: integrity: sha512-WAEs2bivu3F4nwC01KQWJjb4Z4rwob+lU12TPY5+EZsz4I2ZzD6tQJcQ9q3DPY4I1bTsPd7CdKKxD8IUuWU6qA== - /vite/2.0.0-beta.46: + /vite/2.0.0-beta.65: dependencies: esbuild: 0.8.34 postcss: 8.2.4 @@ -5232,7 +5233,7 @@ packages: optionalDependencies: fsevents: 2.1.3 resolution: - integrity: sha512-RiiJdjiFDaM9youfcTFnCztstwBXHHSdsSATZVD5A4QSb39KJRTpSKoveFo0PT7VJM5HjOP7QC/sVOqX011F6Q== + integrity: sha512-mdHNTP6fGeb8m8lWAM3UbSPw1+un1lUv0i4MQJcNiK2/P01RHIY02VjQeXBv3NemkExkgLji88LN9ySFMUQpIw== /vue-demi/0.6.0_vue@3.0.5: dependencies: vue: 3.0.5 @@ -5603,15 +5604,15 @@ packages: integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== specifiers: '@antfu/eslint-config': ^0.4.3 - '@iconify/json': ^1.1.297 - '@intlify/vite-plugin-vue-i18n': 1.0.0-beta.12 + '@iconify/json': ^1.1.298 + '@intlify/vite-plugin-vue-i18n': ^1.0.0-beta.15 '@tailwindcss/typography': ^0.4.0 '@types/nprogress': ^0.2.0 '@typescript-eslint/eslint-plugin': ^4.14.2 '@vitejs/plugin-vue': ^1.1.4 '@vue/compiler-sfc': ^3.0.5 '@vue/server-renderer': ^3.0.5 - '@vueuse/core': ^4.0.12 + '@vueuse/core': ^4.1.0 '@vueuse/head': ^0.2.3 autoprefixer: ^10.2.4 cross-env: ^7.0.3 @@ -5624,12 +5625,12 @@ specifiers: prism-theme-vars: ^0.1.4 tailwindcss: ^2.0.2 typescript: ^4.1.3 - vite: 2.0.0-beta.46 + vite: ^2.0.0-beta.65 vite-plugin-components: ^0.6.6 vite-plugin-icons: ^0.2.1 vite-plugin-md: ^0.4.2 - vite-plugin-pages: ^0.1.9 - vite-plugin-pwa: ^0.4.3 + vite-plugin-pages: ^0.2.3 + vite-plugin-pwa: ^0.4.4 vite-ssg: ^0.8.0 vue: ^3.0.5 vue-i18n: ^9.0.0-rc.5 diff --git a/src/main.ts b/src/main.ts index ef86b25..0f2ad33 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ import './styles/main.postcss' -import routes from 'vite-plugin-pages/client' +import routes from 'pages-generated' import { ViteSSG } from 'vite-ssg' import App from './App.vue' diff --git a/tsconfig.json b/tsconfig.json index 60262f5..57c961e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,10 @@ "noUnusedLocals": true, "strictNullChecks": true, "forceConsistentCasingInFileNames": true, - "types": ["vite/client"], + "types": [ + "vite/client", + "vite-plugin-pages/client" + ], "paths": { "~/*": ["src/*"] } diff --git a/vite.config.ts b/vite.config.ts index 1767621..db73a47 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -86,4 +86,15 @@ export default defineConfig({ script: 'async', formatting: 'minify', }, + + optimizeDeps: { + include: [ + 'vue', + 'vue-router', + '@vueuse/core', + ], + exclude: [ + 'vue-demi', + ], + }, })