diff --git a/package.json b/package.json index ca466bf1..bfb2bff9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0-alpha.2", "description": "Vite & Vue powered static site generator", "type": "module", - "packageManager": "pnpm@7.1.7", + "packageManager": "pnpm@7.3.0", "main": "dist/node/index.js", "types": "types/index.d.ts", "exports": { @@ -73,12 +73,12 @@ "dependencies": { "@docsearch/css": "^3.0.0", "@docsearch/js": "^3.0.0", - "@vitejs/plugin-vue": "^3.0.0-beta.0", + "@vitejs/plugin-vue": "^2.3.2", "@vue/devtools-api": "^6.1.4", "@vueuse/core": "^8.5.0", "body-scroll-lock": "^4.0.0-beta.0", "shiki": "^0.10.1", - "vite": "^3.0.0-beta.0", + "vite": "^2.9.7", "vue": "^3.2.33" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b9ba705..7be12eca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,7 +25,7 @@ importers: '@types/node': ^15.6.1 '@types/polka': ^0.5.3 '@types/prompts': ^2.0.14 - '@vitejs/plugin-vue': ^3.0.0-beta.0 + '@vitejs/plugin-vue': ^2.3.2 '@vue/devtools-api': ^6.1.4 '@vueuse/core': ^8.5.0 body-scroll-lock: ^4.0.0-beta.0 @@ -68,18 +68,18 @@ importers: sirv: ^1.0.12 supports-color: ^9.2.2 typescript: ^4.7.2 - vite: ^3.0.0-beta.0 + vite: ^2.9.7 vitest: ^0.14.2 vue: ^3.2.33 dependencies: '@docsearch/css': 3.1.0 '@docsearch/js': 3.1.0 - '@vitejs/plugin-vue': 3.0.0-beta.0_np7gnt2t7gujl5lki2sr3iij4q + '@vitejs/plugin-vue': 2.3.3_vite@2.9.12+vue@3.2.33 '@vue/devtools-api': 6.1.4 '@vueuse/core': 8.5.0_vue@3.2.33 body-scroll-lock: 4.0.0-beta.0 shiki: 0.10.1 - vite: 3.0.0-beta.0 + vite: 2.9.12 vue: 3.2.33 devDependencies: '@rollup/plugin-alias': 3.1.5_rollup@2.57.0 @@ -675,14 +675,14 @@ packages: resolution: {integrity: sha512-4LPNrqSJknLzILMVXn2P/mh0djNgFvom4T9Y1hmhaB8OBm1cY71bMMSrGRu1q5qF4JZzY6iaGT11BHmCMY/NZg==} dev: true - /@vitejs/plugin-vue/3.0.0-beta.0_np7gnt2t7gujl5lki2sr3iij4q: - resolution: {integrity: sha512-t8os1QK1qpovpgYAJSOWYEu+Doy/DZRW1cNwMvUl0qo+Yv7D9a3cxo24oL01lbojcc9ABQhyvUP3BsvFNtriqg==} - engines: {node: '>=14.18.0'} + /@vitejs/plugin-vue/2.3.3_vite@2.9.12+vue@3.2.33: + resolution: {integrity: sha512-SmQLDyhz+6lGJhPELsBdzXGc+AcaT8stgkbiTFGpXPe8Tl1tJaBw1A6pxDqDuRsVkD8uscrkx3hA7QDOoKYtyw==} + engines: {node: '>=12.0.0'} peerDependencies: - vite: ^3.0.0-alpha + vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 3.0.0-beta.0 + vite: 2.9.12 vue: 3.2.33 dev: false @@ -3737,34 +3737,6 @@ packages: rollup: 2.75.6 optionalDependencies: fsevents: 2.3.2 - dev: true - - /vite/3.0.0-beta.0: - resolution: {integrity: sha512-GxQasmIQw3TplbchtSGijvPNlkciZ+QT+KQFk+07VsLNdf95G20VeFYkJpF2cTGtmG2cYYzvn2QU8XDGWZvcXQ==} - engines: {node: '>=14.18.0'} - hasBin: true - peerDependencies: - less: '*' - sass: '*' - stylus: '*' - terser: ^5.4.0 - peerDependenciesMeta: - less: - optional: true - sass: - optional: true - stylus: - optional: true - terser: - optional: true - dependencies: - esbuild: 0.14.43 - postcss: 8.4.14 - resolve: 1.22.1 - rollup: 2.75.6 - optionalDependencies: - fsevents: 2.3.2 - dev: false /vitest/0.14.2_supports-color@9.2.2: resolution: {integrity: sha512-vXQUl8OUCqHmxKWscMGL+6Xl1pBJmYHZ8N85iNpLGrirAC2vhspu7b73ShRcLonmZT44BYZW+LBAVvn0L4jyVA==} diff --git a/src/node/cli.ts b/src/node/cli.ts index b583b37a..fd625aeb 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -14,7 +14,7 @@ if (root) { } if (!command || command === 'dev') { - createServer(root, argv) + createServer(root, { port: 5173, ...argv }) .then((server) => server.listen()) .then((server) => { console.log() diff --git a/src/node/serve/serve.ts b/src/node/serve/serve.ts index 02523ddc..61af9a0d 100644 --- a/src/node/serve/serve.ts +++ b/src/node/serve/serve.ts @@ -21,8 +21,6 @@ export interface ServeOptions { } export async function serve(options: ServeOptions = {}) { - // align with `vite preview` - // https://github.com/vitejs/vite/blob/3f9e5d49dfeb25ee22423fb5d180fe63b1c23c41/packages/vite/src/node/preview.ts#L119 const port = options.port !== undefined ? options.port : 4173 const site = await resolveConfig(options.root, 'serve', 'production') const base = trimChar(site?.site?.base ?? '', '/')