diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cbbc48e5b1df3b747fbe34fac488a4666a1974d4..96d6d310cf09f8cc46d4ce8ec46633d2b28066da 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -61,7 +61,7 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v2.3.6 with: - install: true + install: false start: npm run dev:ssr working-directory: ./packages/playground/ssr wait-on: 'http://localhost:3000' diff --git a/package.json b/package.json index af10630148f4d9ddd6d18a9ed3f40bbac083198e..eb6a4d1ca370346eb4f758cf2508f2f78e578505 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,9 @@ "ls-lint": "ls-lint", "test": "jest", "preinstall": "node ./scripts/checkYarn.js", - "e2e:ssr:open": "cd packages/playground/ssr && npx cypress open", - "e2e:ssr:dev": "cd packages/playground/ssr && npm run dev:ssr" + "e2e:ssr:install": "cd packages/playground/ssr && rm -rf node_modules yarn.lock && yarn", + "e2e:ssr:dev": "cd packages/playground/ssr && npm run dev:ssr", + "e2e:ssr:open": "cd packages/playground/ssr && npx cypress open" }, "types": "test-dts/index.d.ts", "tsd": { @@ -74,7 +75,7 @@ "semver": "^7.3.4", "ts-jest": "^26.4.4", "typescript": "~4.1.3", - "vite": "^2.2.4", + "vite": "^2.3.0", "vue": "3.0.11", "yorkie": "^2.0.0" } diff --git a/packages/playground/ssr/package.json b/packages/playground/ssr/package.json index b11a703c39f838880aa59564ab2dfc9b6ebe85b6..0ca0d5e98baea38b17778877c0bd2d46e1a5f2f7 100644 --- a/packages/playground/ssr/package.json +++ b/packages/playground/ssr/package.json @@ -21,12 +21,12 @@ "devDependencies": { "@dcloudio/uni-cli-shared": "../../uni-cli-shared", "@dcloudio/vite-plugin-uni": "../../vite-plugin-uni", - "@vitejs/plugin-vue": "^1.2.1", + "@vitejs/plugin-vue": "^1.2.2", "@vue/compiler-sfc": "^3.0.11", "@vue/server-renderer": "^3.0.11", "compression": "^1.7.4", "cypress": "^7.3.0", "serve-static": "^1.14.1", - "vite": "^2.2.3" + "vite": "^2.3.0" } } diff --git a/packages/playground/ssr/yarn.lock b/packages/playground/ssr/yarn.lock index 210f9ebb0677ae91bf47e26c0a26faeb4dd5ed8e..d551649c1f4d7b32b2cf1ceccf4598f4dcc3fc4e 100644 --- a/packages/playground/ssr/yarn.lock +++ b/packages/playground/ssr/yarn.lock @@ -195,7 +195,7 @@ resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== -"@vitejs/plugin-vue@^1.2.1": +"@vitejs/plugin-vue@^1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.2.tgz#b0038fc11b9099f4cd01fcbf0ee419adda417b52" integrity sha512-5BI2WFfs/Z0pAV4S/IQf1oH3bmFYlL5ATMBHgTt1Lf7hAnfpNd5oUAAs6hZPfk3QhvyUQgtk0rJBlabwNFcBJQ== @@ -2449,7 +2449,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@^2.2.3: +vite@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.0.tgz#02b007c7aa4ac88cc18f854b9c68e4fbe76e3ef4" integrity sha512-gsCy0t3X9nGGYDoNiE2NJgYq6BPxrtKeo6FkpMXdMvtUluYxnRhl7xfpHaYDmQLCnMbYTWhvWS1L/Hpw/V9L5w== diff --git a/packages/vite-plugin-uni/package.json b/packages/vite-plugin-uni/package.json index 5bda93c7931fdcf78bc5b90c5409ecfd4254d344..f369cafbed47007df772922b82d9d32ddd42208e 100644 --- a/packages/vite-plugin-uni/package.json +++ b/packages/vite-plugin-uni/package.json @@ -44,7 +44,7 @@ "@dcloudio/uni-cli-shared": "^3.0.0", "@dcloudio/uni-shared": "^3.0.0", "@vue/shared": "^3.0.11", - "vite": "^2.2.3" + "vite": "^2.3.0" }, "devDependencies": { "@types/express": "^4.17.11", diff --git a/packages/vite-plugin-uni/src/config/index.ts b/packages/vite-plugin-uni/src/config/index.ts index 9aa2889dd4976367beac762073b6efc07f478f7a..cfd413a3496f872f94c98ef49f56ba60a116922b 100644 --- a/packages/vite-plugin-uni/src/config/index.ts +++ b/packages/vite-plugin-uni/src/config/index.ts @@ -31,6 +31,7 @@ export function createConfig( const { h5 } = parseManifestJsonOnce(options.inputDir) return { base: (h5 && h5.router && h5.router.base) || '', + publicDir: false, define: extend(define, options.compiler.define()), resolve: createResolve(options, config), optimizeDeps: createOptimizeDeps(options), diff --git a/yarn.lock b/yarn.lock index 30dbbee29e7c92d5dc572e3c4720fafa3c8e62bf..917d0db2cec00596745c57c29fe457c67db000fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6309,7 +6309,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@^2.2.4: +vite@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.0.tgz#02b007c7aa4ac88cc18f854b9c68e4fbe76e3ef4" integrity sha512-gsCy0t3X9nGGYDoNiE2NJgYq6BPxrtKeo6FkpMXdMvtUluYxnRhl7xfpHaYDmQLCnMbYTWhvWS1L/Hpw/V9L5w==