diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 940e199504d899840e570fdc7a6e3eb4811d6260..4d4e1ae001a007f57acabb9bb2e6b6f3a4578049 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -54,7 +54,7 @@ jobs: npx cypress version --component node - name: Cypress run - uses: cypress-io/github-action@v2.3.6 + uses: cypress-io/github-action@v4 with: install: false start: npm run dev:ssr diff --git a/packages/playground/ssr/cypress.config.js b/packages/playground/ssr/cypress.config.js new file mode 100644 index 0000000000000000000000000000000000000000..40e05fcf1cafaf927fdaa88e1f4be15560b7ef03 --- /dev/null +++ b/packages/playground/ssr/cypress.config.js @@ -0,0 +1,13 @@ +const { defineConfig } = require('cypress') + +module.exports = defineConfig({ + pageLoadTimeout: 200000, + e2e: { + // We've imported your old cypress plugins here. + // You may want to clean this up later by importing these. + setupNodeEvents(on, config) { + return require('./cypress/plugins/index.js')(on, config) + }, + baseUrl: 'http://localhost:3000', + }, +}) diff --git a/packages/playground/ssr/cypress.json b/packages/playground/ssr/cypress.json deleted file mode 100644 index 6652e567acd6dfb8d7f7dd595a62e4d2f53803d4..0000000000000000000000000000000000000000 --- a/packages/playground/ssr/cypress.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "pageLoadTimeout": 200000 -} diff --git a/packages/playground/ssr/cypress/integration/ssr.spec.js b/packages/playground/ssr/cypress/e2e/ssr.cy.js similarity index 100% rename from packages/playground/ssr/cypress/integration/ssr.spec.js rename to packages/playground/ssr/cypress/e2e/ssr.cy.js diff --git a/packages/playground/ssr/cypress/support/index.js b/packages/playground/ssr/cypress/support/e2e.js similarity index 100% rename from packages/playground/ssr/cypress/support/index.js rename to packages/playground/ssr/cypress/support/e2e.js diff --git a/packages/playground/ssr/package.json b/packages/playground/ssr/package.json index 8cf666eb8f9472512b26776b5151e78d33d36afe..e19013dab4380e534018b7017927421260baf1bf 100644 --- a/packages/playground/ssr/package.json +++ b/packages/playground/ssr/package.json @@ -19,8 +19,8 @@ "devDependencies": { "@dcloudio/vite-plugin-uni": "../../vite-plugin-uni", "compression": "^1.7.4", - "cypress": "^7.3.0", - "serve-static": "^1.14.1", + "cypress": "^10.7.0", + "serve-static": "^1.15.0", "vite": "2.9.14" } } diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json index 9a82cc9dff9751221b73e8ea06aa1bfb65411c94..4327873503cad7377fc981369c9d337510bbc346 100644 --- a/packages/uni-app-plus/package.json +++ b/packages/uni-app-plus/package.json @@ -35,7 +35,7 @@ "@dcloudio/uni-shared": "3.0.0-alpha-3060120220907003", "@types/pako": "1.0.2", "@vue/compiler-sfc": "3.2.39", - "autoprefixer": "^10.4.8", + "autoprefixer": "^10.4.9", "pako": "^1.0.11", "postcss": "^8.4.13", "vue": "3.2.39" diff --git a/packages/uni-cli-shared/package.json b/packages/uni-cli-shared/package.json index f9434ad9b21a9ee28f1359464aaf7c0dbad02149..033ac120a437f80a4be9f18bb2dcc4512b53997e 100644 --- a/packages/uni-cli-shared/package.json +++ b/packages/uni-cli-shared/package.json @@ -33,7 +33,7 @@ "@vue/compiler-sfc": "3.2.39", "@vue/server-renderer": "3.2.39", "@vue/shared": "3.2.39", - "autoprefixer": "^10.4.8", + "autoprefixer": "^10.4.9", "base64url": "^3.0.1", "chokidar": "^3.5.3", "compare-versions": "^3.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96bb1421d7c6a6d9d9e8c26ae1c90f064701d44c..26664ceb6b0f3aeda949c3e665d3470098c0e83c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -113,8 +113,8 @@ importers: '@dcloudio/uni-h5': ../../uni-h5 '@dcloudio/vite-plugin-uni': ../../vite-plugin-uni compression: ^1.7.4 - cypress: ^7.3.0 - serve-static: ^1.14.1 + cypress: ^10.7.0 + serve-static: ^1.15.0 vite: 2.9.14 vue: 3.2.39 vue-router: ^4.1.5 @@ -129,7 +129,7 @@ importers: devDependencies: '@dcloudio/vite-plugin-uni': link:../../vite-plugin-uni compression: 1.7.4 - cypress: 7.7.0 + cypress: 10.7.0 serve-static: 1.15.0 vite: 2.9.14 @@ -193,7 +193,7 @@ importers: '@dcloudio/uni-uts-vite': 3.0.0-alpha-3060120220907003 '@types/pako': 1.0.2 '@vue/compiler-sfc': 3.2.39 - autoprefixer: ^10.4.8 + autoprefixer: ^10.4.9 pako: ^1.0.11 postcss: ^8.4.13 vue: 3.2.39 @@ -209,7 +209,7 @@ importers: '@dcloudio/uni-shared': link:../uni-shared '@types/pako': 1.0.2 '@vue/compiler-sfc': 3.2.39 - autoprefixer: 10.4.8_postcss@8.4.14 + autoprefixer: 10.4.9_postcss@8.4.14 pako: 1.0.11 postcss: 8.4.14 vue: 3.2.39 @@ -324,7 +324,7 @@ importers: '@vue/compiler-sfc': 3.2.39 '@vue/server-renderer': 3.2.39 '@vue/shared': 3.2.39 - autoprefixer: ^10.4.8 + autoprefixer: ^10.4.9 base64url: ^3.0.1 chokidar: ^3.5.3 compare-versions: ^3.6.0 @@ -367,7 +367,7 @@ importers: '@vue/compiler-sfc': 3.2.39 '@vue/server-renderer': 3.2.39_vue@3.2.39 '@vue/shared': 3.2.39 - autoprefixer: 10.4.8_postcss@8.4.14 + autoprefixer: 10.4.9_postcss@8.4.14 base64url: 3.0.1 chokidar: 3.5.3 compare-versions: 3.6.0 @@ -2922,8 +2922,8 @@ packages: '@types/node': 18.0.0 dev: true - /@types/sinonjs__fake-timers/6.0.4: - resolution: {integrity: sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==} + /@types/sinonjs__fake-timers/8.1.1: + resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==} dev: true /@types/sizzle/2.3.3: @@ -2954,7 +2954,7 @@ packages: resolution: {integrity: sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==} requiresBuild: true dependencies: - '@types/node': 14.18.21 + '@types/node': 18.0.0 dev: true optional: true @@ -3446,15 +3446,15 @@ packages: engines: {node: '>= 4.0.0'} dev: true - /autoprefixer/10.4.8_postcss@8.4.14: - resolution: {integrity: sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==} + /autoprefixer/10.4.9_postcss@8.4.14: + resolution: {integrity: sha512-Uu67eduPEmOeA0vyJby5ghu1AAELCCNSsLAjK+lz6kYzNM5sqnBO36MqfsjhPjQF/BaJM5U/UuFYyl7PavY/wQ==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: browserslist: 4.21.3 - caniuse-lite: 1.0.30001380 + caniuse-lite: 1.0.30001399 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -3588,6 +3588,10 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: true + /base64-js/1.5.1: + resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} + dev: true + /base64url/3.0.1: resolution: {integrity: sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==} engines: {node: '>=6.0.0'} @@ -3739,7 +3743,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001380 + caniuse-lite: 1.0.30001399 electron-to-chromium: 1.4.225 node-releases: 2.0.6 update-browserslist-db: 1.0.5_browserslist@4.21.3 @@ -3773,6 +3777,13 @@ packages: resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} dev: true + /buffer/5.7.1: + resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} + dependencies: + base64-js: 1.5.1 + ieee754: 1.2.1 + dev: true + /builtin-modules/3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} @@ -3821,8 +3832,8 @@ packages: /caniuse-lite/1.0.30001355: resolution: {integrity: sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g==} - /caniuse-lite/1.0.30001380: - resolution: {integrity: sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg==} + /caniuse-lite/1.0.30001399: + resolution: {integrity: sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==} /caseless/0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} @@ -4215,8 +4226,8 @@ packages: /csstype/2.6.20: resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} - /cypress/7.7.0: - resolution: {integrity: sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==} + /cypress/10.7.0: + resolution: {integrity: sha512-gTFvjrUoBnqPPOu9Vl5SBHuFlzx/Wxg/ZXIz2H4lzoOLFelKeF7mbwYUOzgzgF0oieU2WhJAestQdkgwJMMTvQ==} engines: {node: '>=12.0.0'} hasBin: true requiresBuild: true @@ -4224,11 +4235,12 @@ packages: '@cypress/request': 2.88.10 '@cypress/xvfb': 1.2.4_supports-color@8.1.1 '@types/node': 14.18.21 - '@types/sinonjs__fake-timers': 6.0.4 + '@types/sinonjs__fake-timers': 8.1.1 '@types/sizzle': 2.3.3 arch: 2.2.0 blob-util: 2.0.2 bluebird: 3.7.2 + buffer: 5.7.1 cachedir: 2.3.0 chalk: 4.1.2 check-more-types: 2.24.0 @@ -4255,12 +4267,12 @@ packages: minimist: 1.2.6 ospath: 1.2.2 pretty-bytes: 5.6.0 - ramda: 0.27.2 + proxy-from-env: 1.0.0 request-progress: 3.0.0 + semver: 7.3.7 supports-color: 8.1.1 tmp: 0.2.1 untildify: 4.0.0 - url: 0.11.0 yauzl: 2.10.0 dev: true @@ -4994,7 +5006,7 @@ packages: dev: true /extsprintf/1.3.0: - resolution: {integrity: sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=} + resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==} engines: {'0': node >=0.6.0} dev: true @@ -5170,7 +5182,7 @@ packages: engines: {node: '>=10'} dependencies: at-least-node: 1.0.0 - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 jsonfile: 6.1.0 universalify: 2.0.0 dev: true @@ -5309,7 +5321,7 @@ packages: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} /graceful-fs/4.2.9: - resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==, registry: https://registry.yarnpkg.com/} + resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz} dev: true /has-flag/3.0.0: @@ -5451,6 +5463,10 @@ packages: resolution: {integrity: sha512-zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg==} dev: true + /ieee754/1.2.1: + resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + dev: true + /ignore/4.0.6: resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==} engines: {node: '>= 4'} @@ -7203,6 +7219,10 @@ packages: ipaddr.js: 1.9.1 dev: false + /proxy-from-env/1.0.0: + resolution: {integrity: sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=} + dev: true + /prr/0.0.0: resolution: {integrity: sha512-LmUECmrW7RVj6mDWKjTXfKug7TFGdiz9P18HMcO4RHL+RW7MCOGNvpj5j47Rnp6ne6r4fZ2VzyUWEpKbg+tsjQ==} dev: true @@ -7237,10 +7257,6 @@ packages: once: 1.4.0 dev: true - /punycode/1.3.2: - resolution: {integrity: sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=} - dev: true - /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} @@ -7267,19 +7283,9 @@ packages: engines: {node: '>=0.6'} dev: true - /querystring/0.2.0: - resolution: {integrity: sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=} - engines: {node: '>=0.4.x'} - deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. - dev: true - /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - /ramda/0.27.2: - resolution: {integrity: sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==} - dev: true - /randombytes/2.1.0: resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} dependencies: @@ -8237,13 +8243,6 @@ packages: punycode: 2.1.1 dev: true - /url/0.11.0: - resolution: {integrity: sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==} - dependencies: - punycode: 1.3.2 - querystring: 0.2.0 - dev: true - /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} diff --git a/scripts/checkVersion.js b/scripts/checkVersion.js index 778df70d160bb3e439e476e6f2b2d31b2cf6aafa..df5da04b684c4a61f4cc999d5f1997af49fab45d 100644 --- a/scripts/checkVersion.js +++ b/scripts/checkVersion.js @@ -40,7 +40,7 @@ const pkgs = { next: '3.0.14', }, autoprefixer: { - latest: '10.4.8', + latest: '10.4.9', }, 'rollup-plugin-copy': { latest: '3.4.0',