From a7c7f8e6e06b6c9f3a33d69b80bc59b273832873 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 00:50:56 -0400 Subject: [PATCH 01/37] chore: [run ci] does further prerequisites for webpack 5: https://webpack.js.org/migrate/5/#make-sure-your-build-has-no-errors-or-warnings https://webpack.js.org/migrate/5/#make-sure-to-use-mode https://webpack.js.org/migrate/5/#update-outdated-options https://webpack.js.org/migrate/5/#test-webpack-5-compatibility app builds and runs locally. Time to test out in CI and see if buffer or process need to be polyfilled by the build --- npm/webpack-batteries-included-preprocessor/index.js | 2 ++ packages/web-config/webpack.config.base.ts | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/npm/webpack-batteries-included-preprocessor/index.js b/npm/webpack-batteries-included-preprocessor/index.js index 05130765dc02..f8eb4c64b7fb 100644 --- a/npm/webpack-batteries-included-preprocessor/index.js +++ b/npm/webpack-batteries-included-preprocessor/index.js @@ -90,6 +90,8 @@ const getDefaultWebpackOptions = () => { global: true, __filename: true, __dirname: true, + Buffer: false, + process: false, }, module: { rules: [{ diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index 3144d2d74f61..2646c68c92d0 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -1,6 +1,7 @@ import chalk from 'chalk' import { CleanWebpackPlugin } from 'clean-webpack-plugin' const webpack = require('webpack') +import type Webpack from 'webpack' import { RuleSetRule, DefinePlugin, Configuration } from 'webpack' // @ts-ignore import LiveReloadPlugin from 'webpack-livereload-plugin' @@ -30,12 +31,12 @@ const evalDevToolPlugin = new webpack.EvalDevToolModulePlugin({ evalDevToolPlugin.evalDevToolPlugin = true -const optimization = { +const optimization: Webpack.Options.Optimization = { usedExports: true, providedExports: true, sideEffects: true, - namedChunks: true, - namedModules: true, + chunkIds: 'named', + moduleIds: 'named', removeAvailableModules: true, mergeDuplicateChunks: true, flagIncludedChunks: true, @@ -122,6 +123,8 @@ export const getCommonConfig = () => { net: 'empty', tls: 'empty', module: 'empty', + Buffer: false, + process: false, }, resolve: { extensions: ['.ts', '.js', '.jsx', '.tsx', '.scss', '.json'], @@ -234,6 +237,8 @@ export const getSimpleConfig = () => ({ net: 'empty', tls: 'empty', module: 'empty', + Buffer: false, + process: false, }, resolve: { extensions: ['.js', '.ts', '.json'], From d62dac99e78d26338b957a3a2fe67b2e20549c92 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 11:20:49 -0400 Subject: [PATCH 02/37] chore: upgrade to webpack 5 and do the bare minimum to get it working --- .../package.json | 4 +- npm/webpack-preprocessor/package.json | 2 +- packages/driver/package.json | 2 +- packages/extension/package.json | 2 +- packages/reporter/package.json | 4 +- packages/runner/package.json | 4 +- packages/server/package.json | 2 +- packages/web-config/package.json | 12 +- packages/web-config/webpack.config.base.ts | 86 +-- system-tests/package.json | 2 +- yarn.lock | 534 +++++++++++------- 11 files changed, 413 insertions(+), 241 deletions(-) diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index 0ccd3b664836..8d24a6093cc9 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -23,12 +23,12 @@ "ts-loader": "8.4.0", "tsconfig-package": "npm:tsconfig@^7.0.0", "tsconfig-paths-webpack-plugin": "^3.5.2", - "webpack": "^4.46.0" + "webpack": "^5.88.2" }, "devDependencies": { "@cypress/webpack-preprocessor": "0.0.0-development", "@types/mocha": "^8.0.2", - "@types/webpack": "^4.41.21", + "@types/webpack": "^5.28.1", "chai": "^4.2.0", "fs-extra": "^9.1.0", "mocha": "^8.1.1", diff --git a/npm/webpack-preprocessor/package.json b/npm/webpack-preprocessor/package.json index 51037985e801..d95a0f3bda7f 100644 --- a/npm/webpack-preprocessor/package.json +++ b/npm/webpack-preprocessor/package.json @@ -48,7 +48,7 @@ "sinon-chai": "^3.5.0", "snap-shot-it": "7.9.2", "ts-node": "^10.9.1", - "webpack": "^4.46.0" + "webpack": "^5.88.2" }, "peerDependencies": { "@babel/core": "^7.0.1", diff --git a/packages/driver/package.json b/packages/driver/package.json index 60c876e4dff4..3f0026ecf996 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -83,7 +83,7 @@ "url-parse": "1.5.9", "vanilla-text-mask": "5.1.1", "vite": "4.3.2", - "webpack": "^4.46.0", + "webpack": "^5.88.2", "zone.js": "0.9.0" }, "files": [ diff --git a/packages/extension/package.json b/packages/extension/package.json index 82ccddb522d8..6542eb668229 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -34,7 +34,7 @@ "sinon-chai": "3.3.0", "ts-loader": "8.4.0", "webextension-polyfill": "0.4.0", - "webpack": "4.44.2" + "webpack": "^5.88.2" }, "files": [ "app", diff --git a/packages/reporter/package.json b/packages/reporter/package.json index 76649fed96f5..c5d27613d8ab 100644 --- a/packages/reporter/package.json +++ b/packages/reporter/package.json @@ -35,8 +35,8 @@ "react-dom": "16.8.6", "react-svg-loader": "3.0.3", "sinon": "7.5.0", - "webpack": "^4.46.0", - "webpack-cli": "^4.10.0" + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4" }, "files": [] } diff --git a/packages/runner/package.json b/packages/runner/package.json index c628a42080da..1df233ab6748 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -19,8 +19,8 @@ "bluebird": "3.5.3", "cross-env": "6.0.3", "rimraf": "^5.0.1", - "webpack": "^4.46.0", - "webpack-cli": "^4.10.0" + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4" }, "files": [ "dist" diff --git a/packages/server/package.json b/packages/server/package.json index eb78e33a07bb..87a5f6c58ed6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -192,7 +192,7 @@ "ts-loader": "8.4.0", "tsconfig-paths": "3.10.1", "tslint": "^6.1.3", - "webpack": "^4.46.0", + "webpack": "^5.88.2", "ws": "5.2.3", "xvfb": "https://github.com/cypress-io/node-xvfb.git#22e3783c31d81ebe64d8c0df491ea00cdc74726a", "xvfb-maybe": "0.2.1" diff --git a/packages/web-config/package.json b/packages/web-config/package.json index 8a8b4c349f08..335db77d6007 100644 --- a/packages/web-config/package.json +++ b/packages/web-config/package.json @@ -13,13 +13,14 @@ "@babel/register": "7.9.0", "@types/jsdom": "16.2.13", "@types/mock-require": "2.0.0", - "@types/webpack": "4.41.0", + "@types/webpack": "^5.28.1", "@types/webpack-dev-server": "^4.0.0", "ansi-escapes": "4.3.1", "arraybuffer-loader": "1.0.8", "autoprefixer": "9.7.4", "babel-loader": "8.3.0", "browser-resolve": "2.0.0", + "buffer": "6.0.3", "chai": "4.2.0", "chalk": "2.4.2", "clean-webpack-plugin": "4.0.0", @@ -32,14 +33,19 @@ "mini-css-extract-plugin": "1.6.2", "mock-require": "3.0.3", "node-sass-glob-importer": "5.3.3", + "os-browserify": "0.3.0", + "path-browserify": "1.0.1", "postcss": "^8.4.27", "postcss-loader": "4.3.0", + "process": "0.11.10", "resolve-url-loader": "5.0.0", "sass": "1.64.1", "sass-loader": "10.4.1", "sinon-chai": "3.3.0", - "webpack": "^4.46.0", - "webpack-cli": "^4.10.0", + "stream-browserify": "3.0.0", + "url": "0.11.1", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4", "webpack-livereload-plugin": "3.0.2" } } diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index 2646c68c92d0..d4e00dec3ab8 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -1,8 +1,6 @@ import chalk from 'chalk' import { CleanWebpackPlugin } from 'clean-webpack-plugin' -const webpack = require('webpack') -import type Webpack from 'webpack' -import { RuleSetRule, DefinePlugin, Configuration } from 'webpack' +import webpack from 'webpack' // @ts-ignore import LiveReloadPlugin from 'webpack-livereload-plugin' @@ -10,7 +8,6 @@ import LiveReloadPlugin from 'webpack-livereload-plugin' import sassGlobImporter = require('node-sass-glob-importer') import HtmlWebpackPlugin = require('html-webpack-plugin') import MiniCSSExtractWebpackPlugin = require('mini-css-extract-plugin') -// import { RuleSetRule } from 'webpack' const env = process.env.NODE_ENV === 'production' ? 'production' : 'development' const args = process.argv.slice(2) @@ -31,7 +28,7 @@ const evalDevToolPlugin = new webpack.EvalDevToolModulePlugin({ evalDevToolPlugin.evalDevToolPlugin = true -const optimization: Webpack.Options.Optimization = { +const optimization = { usedExports: true, providedExports: true, sideEffects: true, @@ -45,18 +42,18 @@ const optimization: Webpack.Options.Optimization = { const stats = { errors: true, - warningsFilter: /node_modules\/mocha\/lib\/mocha.js/, warnings: true, all: false, builtAt: true, colors: true, modules: true, - maxModules: 20, excludeModules: /(main|test-entry).scss/, timings: true, } -function makeSassLoaders ({ modules }: { modules: boolean }): RuleSetRule { +const ignoreWarnings = [/node_modules\/mocha\/lib\/mocha.js/] + +function makeSassLoaders ({ modules }: { modules: boolean }) { const exclude = [/node_modules/] if (!modules) exclude.push(/\.modules?\.s[ac]ss$/i) @@ -115,19 +112,25 @@ const babelPresetEnvConfig = [require.resolve('@babel/preset-env'), { targets: { const babelPresetTypeScriptConfig = [require.resolve('@babel/preset-typescript'), { allowNamespaces: true }] export const getCommonConfig = () => { - const commonConfig: Configuration = { + const commonConfig = { mode: 'none', - node: { - fs: 'empty', - child_process: 'empty', - net: 'empty', - tls: 'empty', - module: 'empty', - Buffer: false, - process: false, - }, + ignoreWarnings, resolve: { extensions: ['.ts', '.js', '.jsx', '.tsx', '.scss', '.json'], + // see https://gist.github.com/ef4/d2cf5672a93cf241fd47c020b9b3066a for polyfill migration details + fallback: { + Buffer: require.resolve('buffer/'), + child_process: false, + fs: false, + module: false, + net: false, + os: require.resolve('os-browserify/browser'), + path: require.resolve('path-browserify'), + process: require.resolve('process/browser'), + stream: require.resolve('stream-browserify'), + tls: false, + url: require.resolve('url/'), + }, }, stats, @@ -214,12 +217,14 @@ export const getCommonConfig = () => { // fallbackModuleFilenameTemplate: 'cypress://[namespace]/[resourcePath]?[hash]' // })] : - ...[ - (env === 'production' - ? new DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }) - : evalDevToolPlugin - ), - ], + // Cypress needs access globally to the buffer and process objects. + // These were polyfilled by webpack in v4 and no longer are in v5. + // To work around this, we provide the process and buffer and globals into the webpack bundle. + // @see https://gist.github.com/ef4/d2cf5672a93cf241fd47c020b9b3066a#polyfilling-globals + new webpack.ProvidePlugin({ + Buffer: ['buffer', 'Buffer'], + process: 'process/browser', + }), ...(liveReloadEnabled ? [new LiveReloadPlugin({ appendScriptTag: true, port: 0, hostname: 'localhost', protocol: 'http' })] : []), ], @@ -231,17 +236,23 @@ export const getCommonConfig = () => { // eslint-disable-next-line @cypress/dev/arrow-body-multiline-braces export const getSimpleConfig = () => ({ - node: { - fs: 'empty', - child_process: 'empty', - net: 'empty', - tls: 'empty', - module: 'empty', - Buffer: false, - process: false, - }, + ignoreWarnings, resolve: { extensions: ['.js', '.ts', '.json'], + // see https://gist.github.com/ef4/d2cf5672a93cf241fd47c020b9b3066a for polyfill migration details + fallback: { + Buffer: require.resolve('buffer/'), + child_process: false, + fs: false, + module: false, + net: false, + os: require.resolve('os-browserify/browser'), + path: require.resolve('path-browserify'), + process: require.resolve('process/browser'), + stream: require.resolve('stream-browserify'), + tls: false, + url: require.resolve('url/'), + }, }, stats, @@ -249,6 +260,15 @@ export const getSimpleConfig = () => ({ cache: true, + plugins: [ + new webpack.DefinePlugin({ + // The main & cross-origin injection code in @packages/runner needs + // access to the process.env.NODE_DEBUG variable. + // Since the injection lives inside html, it makes most sense to just use the + // DefinePlugin to push the value into the bundle instead of providing the whole process + 'process.env.NODE_DEBUG': JSON.stringify('process.env.NODE_DEBUG'), + }), + ], module: { rules: [ { diff --git a/system-tests/package.json b/system-tests/package.json index 3b60abccce54..a03243d0d4ba 100644 --- a/system-tests/package.json +++ b/system-tests/package.json @@ -84,7 +84,7 @@ "supertest": "4.0.2", "systeminformation": "5.16.9", "temp-dir": "^2.0.0", - "webpack": "^4.46.0", + "webpack": "^5.88.2", "ws": "5.2.3" }, "types": "lib/fixtures.ts", diff --git a/yarn.lock b/yarn.lock index df48c2349063..b4ec103fea39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4209,10 +4209,10 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== +"@jridgewell/source-map@^0.3.2", "@jridgewell/source-map@^0.3.3": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" + integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" @@ -6304,11 +6304,6 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" - integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== - "@types/aria-query@^4.2.0": version "4.2.1" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.1.tgz#78b5433344e2f92e8b306c06a5622c50c245bf6b" @@ -6378,7 +6373,7 @@ "@types/connect" "*" "@types/node" "*" -"@types/bonjour@*", "@types/bonjour@^3.5.9": +"@types/bonjour@^3.5.9": version "3.5.10" resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== @@ -6731,6 +6726,11 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== +"@types/http-errors@*": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65" + integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ== + "@types/http-proxy@1.17.4": version "1.17.4" resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.4.tgz#e7c92e3dbe3e13aa799440ff42e6d3a17a9d045b" @@ -6869,7 +6869,7 @@ resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= -"@types/mime@3.0.1": +"@types/mime@*", "@types/mime@3.0.1": version "3.0.1" resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== @@ -7152,19 +7152,20 @@ "@types/mime" "^1" "@types/node" "*" -"@types/serve-index@*", "@types/serve-index@^1.9.1": +"@types/serve-index@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== dependencies: "@types/express" "*" -"@types/serve-static@*": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" - integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== +"@types/serve-static@*", "@types/serve-static@^1.13.10": + version "1.15.2" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" + integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== dependencies: - "@types/mime" "^1" + "@types/http-errors" "*" + "@types/mime" "*" "@types/node" "*" "@types/server-destroy@^1.0.1": @@ -7278,7 +7279,7 @@ dependencies: "@types/superagent" "*" -"@types/tapable@*", "@types/tapable@^1", "@types/tapable@^1.0.5": +"@types/tapable@^1", "@types/tapable@^1.0.5": version "1.0.7" resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4" integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ== @@ -7369,15 +7370,6 @@ resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= -"@types/webpack-dev-middleware@*": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-5.0.2.tgz#0f66566c2ca7d484891b4552c8a7b64a3044e3e2" - integrity sha512-S3WUtef//Vx6WETyWZkM45WqgRxWSaqbpWtPcKySNRhiQNyhCqM9EueggaMX3L9N2IbG4dJIK5PgYcAWUifUbA== - dependencies: - "@types/connect" "*" - tapable "^2.1.1" - webpack "^5.38.1" - "@types/webpack-dev-server-3@npm:@types/webpack-dev-server@^3": version "3.11.6" resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz#d8888cfd2f0630203e13d3ed7833a4d11b8a34dc" @@ -7390,19 +7382,11 @@ http-proxy-middleware "^1.0.0" "@types/webpack-dev-server@^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.1.0.tgz#d2907eb3705919aec2e25c60b15d47af994375f4" - integrity sha512-7nylorFi/q2+TDro3U6q7S/AKIKs0x1hQUqgXAGNRC84owYVH/Av6ishEhgU2z9YUx2pNYU9BWz0qF4S34b6/g== + version "4.7.2" + resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.7.2.tgz#a12d9881aa23cdd4cecbb2d31fa784a45c4967e0" + integrity sha512-Y3p0Fmfvp0MHBDoCzo+xFJaWTw0/z37mWIo6P15j+OtmUDLvznJWdZNeD7Q004R+MpQlys12oXbXsrXRmxwg4Q== dependencies: - "@types/bonjour" "*" - "@types/connect-history-api-fallback" "*" - "@types/express" "*" - "@types/serve-index" "*" - "@types/serve-static" "*" - "@types/webpack" "^4" - "@types/webpack-dev-middleware" "*" - chokidar "^3.5.1" - http-proxy-middleware "^2.0.0" + webpack-dev-server "*" "@types/webpack-sources@*": version "2.1.0" @@ -7413,19 +7397,7 @@ "@types/source-list-map" "*" source-map "^0.7.3" -"@types/webpack@4.41.0": - version "4.41.0" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.0.tgz#b813a044d8b0dec7dfcd7622fdbe327bde06eb9a" - integrity sha512-tWkdf9nO0zFgAY/EumUKwrDUhraHKDqCPhwfFR/R8l0qnPdgb9le0Gzhvb7uzVpouuDGBgiE//ZdY+5jcZy2TA== - dependencies: - "@types/anymatch" "*" - "@types/node" "*" - "@types/tapable" "*" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - source-map "^0.6.0" - -"@types/webpack@^4", "@types/webpack@^4.41.12", "@types/webpack@^4.41.21", "@types/webpack@^4.41.8": +"@types/webpack@^4", "@types/webpack@^4.41.12", "@types/webpack@^4.41.8": version "4.41.33" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.33.tgz#16164845a5be6a306bcbe554a8e67f9cac215ffc" integrity sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g== @@ -7437,6 +7409,15 @@ anymatch "^3.0.0" source-map "^0.6.0" +"@types/webpack@^5.28.1": + version "5.28.1" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.1.tgz#c369baeff31abe54b45f7f29997e1623604198d6" + integrity sha512-qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw== + dependencies: + "@types/node" "*" + tapable "^2.2.0" + webpack "^5" + "@types/websocket@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a" @@ -7458,10 +7439,10 @@ dependencies: "@types/node" "*" -"@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== +"@types/ws@^8.5.5": + version "8.5.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== dependencies: "@types/node" "*" @@ -7872,6 +7853,14 @@ "@webassemblyjs/helper-numbers" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -7886,6 +7875,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" @@ -7896,6 +7890,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== + "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" @@ -7906,6 +7905,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -7939,11 +7943,25 @@ "@webassemblyjs/helper-api-error" "1.11.1" "@xtuc/long" "4.2.2" +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@xtuc/long" "4.2.2" + "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== + "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" @@ -7959,6 +7977,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.11.1" "@webassemblyjs/wasm-gen" "1.11.1" +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -7976,6 +8004,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -7990,6 +8025,13 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -8002,6 +8044,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" @@ -8035,6 +8082,20 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" @@ -8046,6 +8107,17 @@ "@webassemblyjs/leb128" "1.11.1" "@webassemblyjs/utf8" "1.11.1" +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -8067,6 +8139,16 @@ "@webassemblyjs/wasm-gen" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -8089,6 +8171,18 @@ "@webassemblyjs/leb128" "1.11.1" "@webassemblyjs/utf8" "1.11.1" +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -8121,6 +8215,14 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -8130,22 +8232,20 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@windicss/plugin-interaction-variants@^1.0.0": version "1.0.0" @@ -8245,10 +8345,10 @@ acorn-globals@^4.3.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-import-assertions@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" - integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== +acorn-import-assertions@^1.7.6, acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: version "5.3.1" @@ -10084,6 +10184,14 @@ buffer@4.9.2, buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" +buffer@6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + buffer@^5.1.0, buffer@^5.2.0, buffer@^5.5.0, buffer@^5.6.0, buffer@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -11322,6 +11430,11 @@ commander@6.2.1, commander@^6.1.0, commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^4.0.0, commander@^4.0.1, commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" @@ -11332,7 +11445,7 @@ commander@^5.0.0, commander@^5.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^7.0.0, commander@^7.2.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -11501,6 +11614,11 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +connect-history-api-fallback@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" + integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== + console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -13589,7 +13707,7 @@ engine.io@~5.0.0: engine.io-parser "~4.0.0" ws "~7.4.2" -enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0, enhanced-resolve@^4.5.0: +enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== @@ -13598,10 +13716,10 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0, enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.10.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== +enhanced-resolve@^5.15.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -13774,6 +13892,11 @@ es-module-lexer@^0.9.0: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +es-module-lexer@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" + integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -17225,7 +17348,7 @@ http-proxy-middleware@^1.0.0: is-plain-obj "^3.0.0" micromatch "^4.0.2" -http-proxy-middleware@^2.0.0, http-proxy-middleware@^2.0.3: +http-proxy-middleware@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== @@ -17387,7 +17510,7 @@ ieee754@1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -17532,7 +17655,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -17704,10 +17827,10 @@ interpret@^1.0.0, interpret@^1.4.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== into-stream@^3.1.0: version "3.1.0" @@ -19239,6 +19362,14 @@ launch-editor@2.3.0: picocolors "^1.0.0" shell-quote "^1.6.1" +launch-editor@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" + integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.7.3" + lazy-ass@1.6.0, lazy-ass@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" @@ -22863,7 +22994,7 @@ original@^1.0.0: dependencies: url-parse "^1.4.3" -os-browserify@^0.3.0: +os-browserify@0.3.0, os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= @@ -23443,6 +23574,11 @@ path-browserify@0.0.1: resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== +path-browserify@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" @@ -23859,7 +23995,7 @@ popper.js@^1.15.0: resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== -portfinder@^1.0.17, portfinder@^1.0.25, portfinder@^1.0.26, portfinder@^1.0.28: +portfinder@^1.0.17, portfinder@^1.0.25, portfinder@^1.0.26: version "1.0.28" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== @@ -24156,7 +24292,7 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -process@^0.11.10: +process@0.11.10, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= @@ -24497,7 +24633,14 @@ qs@6.9.7: resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== -qs@^6.4.0, qs@^6.5.1, qs@^6.9.4, qs@~6.10.3: +qs@^6.11.0, qs@^6.4.0, qs@^6.5.1, qs@^6.9.4: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + +qs@~6.10.3: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ== @@ -25159,12 +25302,12 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redent@^3.0.0: version "3.0.0" @@ -25660,7 +25803,7 @@ resolve@^0.6.3: resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz#dd957982e7e736debdf53b58a4dd91754575dd46" integrity sha1-3ZV5gufnNt699TtYpN2RdUV13UY= -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.3.2, resolve@^1.4.0: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -26028,10 +26171,10 @@ schema-utils@^2.6.5: ajv "^6.12.2" ajv-keywords "^3.4.1" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== +schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== dependencies: "@types/json-schema" "^7.0.8" ajv "^6.12.5" @@ -26069,10 +26212,10 @@ selfsigned@^1.10.8: dependencies: node-forge "^0.10.0" -selfsigned@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" - integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== +selfsigned@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" + integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== dependencies: node-forge "^1" @@ -26284,7 +26427,7 @@ serialize-javascript@5.0.1, serialize-javascript@^5.0.1: dependencies: randombytes "^2.1.0" -serialize-javascript@6.0.0, serialize-javascript@^6.0.0: +serialize-javascript@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== @@ -26298,6 +26441,13 @@ serialize-javascript@^4.0.0: dependencies: randombytes "^2.1.0" +serialize-javascript@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== + dependencies: + randombytes "^2.1.0" + serve-handler@6.1.5: version "6.1.5" resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.5.tgz#a4a0964f5c55c7e37a02a633232b6f0d6f068375" @@ -26461,10 +26611,10 @@ shell-env@3.0.1: execa "^1.0.0" strip-ansi "^5.2.0" -shell-quote@^1.6.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== +shell-quote@^1.6.1, shell-quote@^1.7.3: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== shelljs@0.8.5: version "0.8.5" @@ -27012,13 +27162,13 @@ sockjs-client@^1.5.0: json3 "^3.3.3" url-parse "^1.4.7" -sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== +sockjs@^0.3.21, sockjs@^0.3.24: + version "0.3.24" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== dependencies: faye-websocket "^0.11.3" - uuid "^3.4.0" + uuid "^8.3.2" websocket-driver "^0.7.4" socks-proxy-agent@^6.0.0: @@ -27443,6 +27593,14 @@ stop-only@3.0.1: execa "0.11.0" minimist "1.2.0" +stream-browserify@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" + integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== + dependencies: + inherits "~2.0.4" + readable-stream "^3.5.0" + stream-browserify@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" @@ -28273,18 +28431,18 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser-webpack-plugin@^5.1.3: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== +terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.7: + version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: + "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" + serialize-javascript "^6.0.1" + terser "^5.16.8" -terser@5.14.2, terser@^5.10.0, terser@^5.7.2: +terser@5.14.2: version "5.14.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== @@ -28303,6 +28461,16 @@ terser@^4.1.2, terser@^4.6.3: source-map "~0.6.1" source-map-support "~0.5.12" +terser@^5.10.0, terser@^5.16.8: + version "5.19.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e" + integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -29488,13 +29656,13 @@ url@0.10.3: punycode "1.3.2" querystring "0.2.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= +url@0.11.1, url@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32" + integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA== dependencies: - punycode "1.3.2" - querystring "0.2.0" + punycode "^1.4.1" + qs "^6.11.0" use-callback-ref@^1.2.1, use-callback-ref@^1.2.3: version "1.2.5" @@ -29599,7 +29767,7 @@ uuid@8.3.2, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: +uuid@^3.0.1, uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -30227,7 +30395,7 @@ webidl-conversions@^6.1.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -"webpack-4@npm:webpack@^4", webpack@^4.46.0: +"webpack-4@npm:webpack@^4": version "4.46.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== @@ -30256,22 +30424,23 @@ webidl-conversions@^6.1.0: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack-cli@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" + commander "^10.0.1" cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" webpack-dev-middleware@^3.7.2: @@ -30335,40 +30504,41 @@ webpack-dev-middleware@^5.3.1: ws "^6.2.1" yargs "^13.3.2" -webpack-dev-server@^4.7.4: - version "4.8.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29" - integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg== +webpack-dev-server@*, webpack-dev-server@^4.7.4: + version "4.15.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" + integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" "@types/express" "^4.17.13" "@types/serve-index" "^1.9.1" + "@types/serve-static" "^1.13.10" "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" + "@types/ws" "^8.5.5" ansi-html-community "^0.0.8" bonjour-service "^1.0.11" chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" - connect-history-api-fallback "^1.6.0" + connect-history-api-fallback "^2.0.0" default-gateway "^6.0.3" express "^4.17.3" graceful-fs "^4.2.6" html-entities "^2.3.2" http-proxy-middleware "^2.0.3" ipaddr.js "^2.0.1" + launch-editor "^2.6.0" open "^8.0.9" p-retry "^4.5.0" - portfinder "^1.0.28" rimraf "^3.0.2" schema-utils "^4.0.0" - selfsigned "^2.0.1" + selfsigned "^2.1.1" serve-index "^1.9.1" - sockjs "^0.3.21" + sockjs "^0.3.24" spdy "^4.0.2" webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + ws "^8.13.0" webpack-livereload-plugin@3.0.2: version "3.0.2" @@ -30419,51 +30589,22 @@ webpack-virtual-modules@^0.4.3: resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.4.tgz#a19fcf371923c59c4712d63d7d194b1e4d8262cc" integrity sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA== -webpack@4.44.2: - version "4.44.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72" - integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.3.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" - -webpack@^5.38.1: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== +webpack@^5, webpack@^5.88.2: + version "5.88.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" + integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" + "@types/estree" "^1.0.0" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" + acorn-import-assertions "^1.9.0" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" + enhanced-resolve "^5.15.0" + es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" @@ -30472,9 +30613,9 @@ webpack@^5.38.1: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.0" + schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" + terser-webpack-plugin "^5.3.7" watchpack "^2.4.0" webpack-sources "^3.2.3" @@ -30885,7 +31026,12 @@ ws@^6.1.2, ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^8.0.0, ws@^8.4.2, ws@^8.5.0, ws@~8.11.0: +ws@^8.0.0, ws@^8.13.0, ws@^8.5.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + +ws@~8.11.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== From b4cbe0acacee903418583e510e914848173625c5 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 16:38:27 -0400 Subject: [PATCH 03/37] chore: get @packages/extension working --- packages/extension/webpack.config.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/extension/webpack.config.js b/packages/extension/webpack.config.js index 82f250afc412..75317bcf2d06 100644 --- a/packages/extension/webpack.config.js +++ b/packages/extension/webpack.config.js @@ -1,4 +1,5 @@ const path = require('path') +const webpack = require('webpack') module.exports = { mode: process.env.NODE_ENV || 'development', @@ -23,4 +24,12 @@ module.exports = { filename: 'background.js', path: path.resolve(__dirname, 'dist'), }, + plugins: [ + new webpack.DefinePlugin({ + // The @packages/extension needs access to the process.env.NODE_DEBUG variable. + // Since it's one variable, it makes most sense to just use the + // DefinePlugin to push the value into the bundle instead of providing the whole process + 'process.env.NODE_DEBUG': JSON.stringify('process.env.NODE_DEBUG'), + }), + ], } From de6a53de9bb0484391b29a004febbb51a2612680 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 16:38:47 -0400 Subject: [PATCH 04/37] chore: add TODOs to finish after webpack 5 update --- packages/web-config/webpack.config.base.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index d4e00dec3ab8..103f91fb3ee4 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -23,6 +23,7 @@ process.env.NODE_ENV = env // @ts-ignore const evalDevToolPlugin = new webpack.EvalDevToolModulePlugin({ moduleFilenameTemplate: 'cypress://[namespace]/[resource-path]', + // TODO: changed [hash] to [contenthash] @see https://webpack.js.org/migrate/5/#clean-up-configuration fallbackModuleFilenameTemplate: 'cypress://[namespace]/[resourcePath]?[hash]', }) @@ -32,6 +33,7 @@ const optimization = { usedExports: true, providedExports: true, sideEffects: true, + // TODO: remove chunkIds & moduleIds @see https://webpack.js.org/migrate/5/#clean-up-configuration chunkIds: 'named', moduleIds: 'named', removeAvailableModules: true, @@ -177,6 +179,8 @@ export const getCommonConfig = () => { }, }, ], + // TODO: replaces file-loader. @see https://webpack.js.org/guides/asset-modules/ + // type: 'asset/resource', }, { test: /\.(png|gif)$/, @@ -184,10 +188,12 @@ export const getCommonConfig = () => { { loader: require.resolve('file-loader'), options: { - name: './img/[name].[ext]', + name: './fonts/[name].[ext]', }, }, ], + // TODO: replaces file-loader. @see https://webpack.js.org/guides/asset-modules/ + // type: 'asset/resource', }, { test: /\.wasm$/, From 3a152ac6fab40fac4a772ab1e348a1e03886330e Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 16:39:13 -0400 Subject: [PATCH 05/37] chore: update the webpack config for npm/webpack-batteries-included-preprocessor to be webpack 5 compliant --- .../empty.js | 0 .../index.js | 38 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 npm/webpack-batteries-included-preprocessor/empty.js diff --git a/npm/webpack-batteries-included-preprocessor/empty.js b/npm/webpack-batteries-included-preprocessor/empty.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/npm/webpack-batteries-included-preprocessor/index.js b/npm/webpack-batteries-included-preprocessor/index.js index f8eb4c64b7fb..ef0242c0e317 100644 --- a/npm/webpack-batteries-included-preprocessor/index.js +++ b/npm/webpack-batteries-included-preprocessor/index.js @@ -90,8 +90,6 @@ const getDefaultWebpackOptions = () => { global: true, __filename: true, __dirname: true, - Buffer: false, - process: false, }, module: { rules: [{ @@ -135,21 +133,27 @@ const getDefaultWebpackOptions = () => { }, resolve: { extensions: ['.js', '.json', '.jsx', '.mjs', '.coffee'], - alias: { - 'child_process': require.resolve('./empty'), - 'cluster': require.resolve('./empty'), - 'console': require.resolve('./empty'), - 'dgram': require.resolve('./empty'), - 'dns': require.resolve('./empty'), - 'fs': require.resolve('./empty'), - 'http2': require.resolve('./empty'), - 'inspector': require.resolve('./empty'), - 'module': require.resolve('./empty'), - 'net': require.resolve('./empty'), - 'perf_hooks': require.resolve('./empty'), - 'readline': require.resolve('./empty'), - 'repl': require.resolve('./empty'), - 'tls': require.resolve('./empty'), + fallback: { + // Buffer: require.resolve('buffer/'), + child_process: false, + cluster: false, + console: false, + dgram: false, + dns: false, + fs: false, + http2: false, + inspector: false, + module: false, + net: false, + // os: require.resolve('os-browserify/browser'), + perf_hooks: false, + path: require.resolve('path-browserify'), + // process: require.resolve('process/browser'), + readline: false, + repl: false, + // stream: require.resolve('stream-browserify'), + tls: false, + // url: require.resolve('url/'), }, plugins: [], }, From 23ff811aaaa5c30aa0befa92eb52708296d08b08 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 16:39:44 -0400 Subject: [PATCH 06/37] chore: patch whatwg-url 7.1.0. package 'source-map' uses whatwg-url@7.1.0 which has a dependency on punycode node expected API. since punycode is now polyfilled for us implicitly via the punycode npm package, the API signatures are a bit different https://github.com/mathiasbynens/punycode.js/blob/main/punycode.js#L101 vs https://nodejs.org/api/punycode.html#punycodeucs2. The patch uses the punycode npm package expected API and is needed for source maps to work for cy.origin() dependencies for Cypress.require() --- patches/whatwg-url+7.1.0.patch | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 patches/whatwg-url+7.1.0.patch diff --git a/patches/whatwg-url+7.1.0.patch b/patches/whatwg-url+7.1.0.patch new file mode 100644 index 000000000000..05fb6c99b3aa --- /dev/null +++ b/patches/whatwg-url+7.1.0.patch @@ -0,0 +1,58 @@ +diff --git a/node_modules/whatwg-url/lib/url-state-machine.js b/node_modules/whatwg-url/lib/url-state-machine.js +index f76a870..78dbca5 100644 +--- a/node_modules/whatwg-url/lib/url-state-machine.js ++++ b/node_modules/whatwg-url/lib/url-state-machine.js +@@ -17,7 +17,7 @@ const specialSchemes = { + const failure = Symbol("failure"); + + function countSymbols(str) { +- return punycode.ucs2.decode(str).length; ++ return punycode.ucs2decode(str).length; + } + + function at(input, idx) { +@@ -208,7 +208,7 @@ function parseIPv6(input) { + let compress = null; + let pointer = 0; + +- input = punycode.ucs2.decode(input); ++ input = punycode.ucs2decode(input); + + if (input[pointer] === 58) { + if (input[pointer + 1] !== 58) { +@@ -398,7 +398,7 @@ function parseOpaqueHost(input) { + } + + let output = ""; +- const decoded = punycode.ucs2.decode(input); ++ const decoded = punycode.ucs2decode(input); + for (let i = 0; i < decoded.length; ++i) { + output += percentEncodeChar(decoded[i], isC0ControlPercentEncode); + } +@@ -543,7 +543,7 @@ function URLStateMachine(input, base, encodingOverride, url, stateOverride) { + this.arrFlag = false; + this.passwordTokenSeenFlag = false; + +- this.input = punycode.ucs2.decode(this.input); ++ this.input = punycode.ucs2decode(this.input); + + for (; this.pointer <= this.input.length; ++this.pointer) { + const c = this.input[this.pointer]; +@@ -1271,7 +1271,7 @@ module.exports.basicURLParse = function (input, options) { + + module.exports.setTheUsername = function (url, username) { + url.username = ""; +- const decoded = punycode.ucs2.decode(username); ++ const decoded = punycode.ucs2decode(username); + for (let i = 0; i < decoded.length; ++i) { + url.username += percentEncodeChar(decoded[i], isUserinfoPercentEncode); + } +@@ -1279,7 +1279,7 @@ module.exports.setTheUsername = function (url, username) { + + module.exports.setThePassword = function (url, password) { + url.password = ""; +- const decoded = punycode.ucs2.decode(password); ++ const decoded = punycode.ucs2decode(password); + for (let i = 0; i < decoded.length; ++i) { + url.password += percentEncodeChar(decoded[i], isUserinfoPercentEncode); + } From 82a9b73746fa4a7c28eda37899be301de99792cd Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Sat, 29 Jul 2023 12:40:32 -0400 Subject: [PATCH 07/37] chore: convert whatwg patch into dev patch as source-map is not installed when building the binary / installing prod dependencies --- patches/{whatwg-url+7.1.0.patch => whatwg-url+7.1.0.dev.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{whatwg-url+7.1.0.patch => whatwg-url+7.1.0.dev.patch} (100%) diff --git a/patches/whatwg-url+7.1.0.patch b/patches/whatwg-url+7.1.0.dev.patch similarity index 100% rename from patches/whatwg-url+7.1.0.patch rename to patches/whatwg-url+7.1.0.dev.patch From 943912e1c3aaf13824f2ec5cc37f25cb5af94892 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Sun, 30 Jul 2023 10:58:05 -0400 Subject: [PATCH 08/37] chore: only move production level patches into the binary dist directory for yarn install --production --- scripts/binary/build.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/binary/build.ts b/scripts/binary/build.ts index 3f1ec76250ff..71fc5bcd787d 100644 --- a/scripts/binary/build.ts +++ b/scripts/binary/build.ts @@ -111,7 +111,19 @@ export async function buildCypressApp (options: BuildCypressAppOpts) { // Copy Packages: We want to copy the package.json, files, and output log('#copyAllToDist') await packages.copyAllToDist(DIST_DIR) - fs.copySync(path.join(CY_ROOT_DIR, 'patches'), path.join(DIST_DIR, 'patches')) + + fs.copySync(path.join(CY_ROOT_DIR, 'patches'), path.join(DIST_DIR, 'patches'), { + // in some cases the dependency tree for nested dependencies changes when running + // a `yarn install` vs a `yarn install --production`. This is the case for `whatwg-url@7`, + // which i as a dependency of `source-map`, which is a devDependency in @packages/driver. + // This package gets hoisted by lerna to the root monorepo directory, but when install + // is run with --production, the directory structure changes and `whatwg-url@5` is + // installed and hoisted, which causes problems with patch-package. + + // since we are only installing production level dependencies in this case, we do not need to copy + // dev patches into the DIST_DIR as they will not be applied anyway, allowing us to work around this problem. + filter: (src, _) => !src.includes('.dev.patch'), + }) const packageJsonContents = _.omit(jsonRoot, [ 'devDependencies', From b723bc4b7a90310c50a00fef342b8114d66e560b Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 28 Jul 2023 17:08:18 -0400 Subject: [PATCH 09/37] chore: remove --openssl-legacy-provider code for node versions 17 and over as webpack has been updated to v5 --- cli/lib/util.js | 16 -------- cli/test/lib/util_spec.js | 62 ------------------------------- scripts/gulp/tasks/gulpWebpack.ts | 19 ---------- scripts/run-webpack.js | 15 -------- 4 files changed, 112 deletions(-) diff --git a/cli/lib/util.js b/cli/lib/util.js index 30a4f763ef68..862f3689e039 100644 --- a/cli/lib/util.js +++ b/cli/lib/util.js @@ -21,7 +21,6 @@ const isInstalledGlobally = require('is-installed-globally') const logger = require('./logger') const debug = require('debug')('cypress:cli') const fs = require('./fs') -const semver = require('semver') const pkg = require(path.join(__dirname, '..', 'package.json')) @@ -305,21 +304,6 @@ const util = { opts.ORIGINAL_NODE_OPTIONS = process.env.NODE_OPTIONS } - // https://github.com/cypress-io/cypress/issues/18914 - // Node 17+ ships with OpenSSL 3 by default, so we may need the option - // --openssl-legacy-provider so that webpack@4 can use the legacy MD4 hash - // function. This option doesn't exist on Node <17 or when it is built - // against OpenSSL 1, so we have to detect Node's major version and check - // which version of OpenSSL it was built against before spawning the plugins - // process. - - // To be removed when the Cypress binary pulls in the @cypress/webpack-batteries-included-preprocessor - // version that has been updated to webpack >= 5.61, which no longer relies on - // Node's builtin crypto.hash function. - if (process.versions && semver.satisfies(process.versions.node, '>=17.0.0') && semver.satisfies(process.versions.openssl, '>=3', { includePrerelease: true })) { - opts.ORIGINAL_NODE_OPTIONS = `${opts.ORIGINAL_NODE_OPTIONS || ''} --openssl-legacy-provider` - } - return opts }, diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js index 008f4719e2fa..26110cabc982 100644 --- a/cli/test/lib/util_spec.js +++ b/cli/test/lib/util_spec.js @@ -278,68 +278,6 @@ describe('util', () => { ORIGINAL_NODE_OPTIONS: '--require foo.js', }) }) - - // https://github.com/cypress-io/cypress/issues/18914 - it('includes --openssl-legacy-provider in Node 17+ w/ OpenSSL 3', () => { - sandbox.stub(process.versions, 'node').value('v17.1.0') - sandbox.stub(process.versions, 'openssl').value('3.0.0-quic') - - restoreEnv = mockedEnv({ - NODE_OPTIONS: '--require foo.js', - }) - - let childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.eq('--require foo.js --openssl-legacy-provider') - - restoreEnv() - restoreEnv = mockedEnv({}) - childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.eq(' --openssl-legacy-provider') - }) - - // https://github.com/cypress-io/cypress/issues/19320 - it('does not include --openssl-legacy-provider in Node 17+ w/ OpenSSL 1', () => { - sandbox.stub(process.versions, 'node').value('v17.1.0') - sandbox.stub(process.versions, 'openssl').value('1.0.0') - - restoreEnv = mockedEnv({ - NODE_OPTIONS: '--require foo.js', - }) - - let childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.eq('--require foo.js') - expect(childOptions.ORIGINAL_NODE_OPTIONS).not.to.contain('--openssl-legacy-provider') - - restoreEnv() - restoreEnv = mockedEnv({}) - childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.be.undefined - }) - - // https://github.com/cypress-io/cypress/issues/18914 - it('does not include --openssl-legacy-provider in Node <=16', () => { - sandbox.stub(process.versions, 'node').value('v16.14.2') - sandbox.stub(process.versions, 'openssl').value('1.0.0') - - restoreEnv = mockedEnv({}) - - let childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.be.undefined - - restoreEnv = mockedEnv({ - NODE_OPTIONS: '--require foo.js', - }) - - childOptions = util.getOriginalNodeOptions() - - expect(childOptions.ORIGINAL_NODE_OPTIONS).to.eq('--require foo.js') - expect(childOptions.ORIGINAL_NODE_OPTIONS).not.to.contain('--openssl-legacy-provider') - }) }) context('.exit', () => { diff --git a/scripts/gulp/tasks/gulpWebpack.ts b/scripts/gulp/tasks/gulpWebpack.ts index 3dc9b2f1c7ca..31bef29a9f5a 100644 --- a/scripts/gulp/tasks/gulpWebpack.ts +++ b/scripts/gulp/tasks/gulpWebpack.ts @@ -3,7 +3,6 @@ import pDefer from 'p-defer' import { monorepoPaths } from '../monorepoPaths' import { universalSpawn } from '../utils/childProcessUtils' import { addChildProcess } from './gulpRegistry' -import semver from 'semver' type Env = typeof process.env @@ -31,23 +30,6 @@ type RunWebpackCfg = { devServer?: boolean } -// https://github.com/cypress-io/cypress/issues/18914 -// Node 17+ ships with OpenSSL 3 by default, so we may need the option -// --openssl-legacy-provider so that webpack@4 can use the legacy MD4 hash -// function. This option doesn't exist on Node <17 or when it is built -// against OpenSSL 1, so we have to detect Node's major version and check -// which version of OpenSSL it was built against before spawning the process. -// -// Can be removed once the webpack version is upgraded to >= 5.61, -// which no longer relies on Node's builtin crypto.hash function. -function useLegacyOpenSSLProvider (env: Env) { - if (process.versions && semver.satisfies(process.versions.node, '>=17.0.0') && semver.satisfies(process.versions.openssl, '>=3', { includePrerelease: true })) { - return { NODE_OPTIONS: `${env.NODE_OPTIONS ?? ''} --openssl-legacy-provider` } - } - - return {} -} - export async function runWebpack (cfg: RunWebpackCfg) { const { cwd, args = [], env = process.env, devServer = false, prefix } = cfg const dfd = pDefer() @@ -60,7 +42,6 @@ export async function runWebpack (cfg: RunWebpackCfg) { cwd, env: { ...(env || process.env), - ...useLegacyOpenSSLProvider(env), FORCE_COLOR: '1', }, }, diff --git a/scripts/run-webpack.js b/scripts/run-webpack.js index 6cf39d48bd1b..cf131b7d923a 100644 --- a/scripts/run-webpack.js +++ b/scripts/run-webpack.js @@ -1,25 +1,10 @@ const cp = require('child_process') const path = require('path') -const semver = require('semver') const webpackCli = path.join(__dirname, '..', 'node_modules', 'webpack-cli', 'bin', 'cli.js') -// https://github.com/cypress-io/cypress/issues/18914 -// Node 17+ ships with OpenSSL 3 by default, so we may need the option -// --openssl-legacy-provider so that webpack@4 can use the legacy MD4 hash -// function. This option doesn't exist on Node <17 or when it is built -// against OpenSSL 1, so we have to detect Node's major version and check -// which version of OpenSSL it was built against before spawning the process. -// -// Can be removed once the webpack version is upgraded to >= 5.61, -// which no longer relies on Node's builtin crypto.hash function. - let NODE_OPTIONS = process.env.NODE_OPTIONS || '' -if (process.versions && semver.satisfies(process.versions.node, '>=17.0.0') && semver.satisfies(process.versions.openssl, '>=3', { includePrerelease: true })) { - NODE_OPTIONS = `${NODE_OPTIONS} --openssl-legacy-provider` -} - function buildCommand () { const file = process.argv.slice(2) let program = `node "${webpackCli}"` From 09643d906917fbf083b5848a90933de4d454b417 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Sat, 29 Jul 2023 12:41:24 -0400 Subject: [PATCH 10/37] chore: fix the webpack-batteries-included-preprocessor tests by shimming the correct node globals and built ins --- .../index.js | 18 +++++--- .../package.json | 10 +++++ .../test/fixtures/node_builtins_spec.js | 5 ++- yarn.lock | 41 ++++++++++++++----- 4 files changed, 57 insertions(+), 17 deletions(-) diff --git a/npm/webpack-batteries-included-preprocessor/index.js b/npm/webpack-batteries-included-preprocessor/index.js index ef0242c0e317..fbe8d41edd12 100644 --- a/npm/webpack-batteries-included-preprocessor/index.js +++ b/npm/webpack-batteries-included-preprocessor/index.js @@ -134,26 +134,34 @@ const getDefaultWebpackOptions = () => { resolve: { extensions: ['.js', '.json', '.jsx', '.mjs', '.coffee'], fallback: { - // Buffer: require.resolve('buffer/'), child_process: false, cluster: false, console: false, + constants: require.resolve('constants-browserify'), + crypto: require.resolve('crypto-browserify'), dgram: false, dns: false, + domain: require.resolve('domain-browser'), fs: false, + http: require.resolve('stream-http'), + https: require.resolve('https-browserify'), http2: false, inspector: false, module: false, net: false, - // os: require.resolve('os-browserify/browser'), + os: require.resolve('os-browserify/browser'), perf_hooks: false, path: require.resolve('path-browserify'), - // process: require.resolve('process/browser'), readline: false, repl: false, - // stream: require.resolve('stream-browserify'), + stream: require.resolve('stream-browserify'), + sys: require.resolve('util/'), + timers: require.resolve('timers-browserify'), tls: false, - // url: require.resolve('url/'), + tty: require.resolve('tty-browserify'), + url: require.resolve('url/'), + vm: require.resolve('vm-browserify'), + zlib: require.resolve('browserify-zlib'), }, plugins: [], }, diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index 8d24a6093cc9..58a8cca1c5b5 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -17,12 +17,22 @@ "@babel/runtime": "^7.11.2", "babel-loader": "^8.3.0", "babel-plugin-add-module-exports": "^1.0.2", + "browserify-zlib": "^0.2.0", "coffee-loader": "^1.0.1", "coffeescript": "^1.12.7", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.12.0", + "domain-browser": "^4.22.0", + "https-browserify": "^1.0.0", "pnp-webpack-plugin": "^1.7.0", + "stream-http": "^3.2.0", + "timers-browserify": "^2.0.12", "ts-loader": "8.4.0", "tsconfig-package": "npm:tsconfig@^7.0.0", "tsconfig-paths-webpack-plugin": "^3.5.2", + "tty-browserify": "^0.0.1", + "util": "^0.12.5", + "vm-browserify": "^1.1.2", "webpack": "^5.88.2" }, "devDependencies": { diff --git a/npm/webpack-batteries-included-preprocessor/test/fixtures/node_builtins_spec.js b/npm/webpack-batteries-included-preprocessor/test/fixtures/node_builtins_spec.js index 1e07fbe075d7..f68fcea839b0 100644 --- a/npm/webpack-batteries-included-preprocessor/test/fixtures/node_builtins_spec.js +++ b/npm/webpack-batteries-included-preprocessor/test/fixtures/node_builtins_spec.js @@ -19,7 +19,10 @@ expect(require('net')).to.be.eql({}) expect(require('os')).to.be.an('object').and.have.property('platform') expect(require('path')).to.be.an('object').and.have.property('join') expect(require('perf_hooks')).to.eql({}) -expect(require('punycode')).to.be.an('object').and.have.property('encode') +const punycode = require('punycode') + +expect(typeof punycode).to.equal('object') +expect(punycode).to.have.property('encode') expect(require('querystring')).to.be.an('object').and.have.property('parse') expect(require('readline')).to.be.eql({}) expect(require('repl')).to.be.eql({}) diff --git a/yarn.lock b/yarn.lock index b4ec103fea39..2db3367ceebc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12105,7 +12105,7 @@ crypt@0.0.2: resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= -crypto-browserify@^3.11.0: +crypto-browserify@^3.11.0, crypto-browserify@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== @@ -13188,6 +13188,11 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== +domain-browser@^4.22.0: + version "4.22.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.22.0.tgz#6ddd34220ec281f9a65d3386d267ddd35c491f9f" + integrity sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw== + domelementtype@1, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" @@ -24593,9 +24598,9 @@ punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== pupa@^2.0.1, pupa@^2.1.1: version "2.1.1" @@ -27648,6 +27653,16 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" +stream-http@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.4" + readable-stream "^3.6.0" + xtend "^4.0.2" + "stream-parser@>= 0.0.2": version "0.3.1" resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773" @@ -28593,7 +28608,7 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= -timers-browserify@^2.0.4: +timers-browserify@^2.0.12, timers-browserify@^2.0.4: version "2.0.12" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== @@ -29072,6 +29087,11 @@ tty-browserify@0.0.0: resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= +tty-browserify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" + integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -29728,16 +29748,15 @@ util@0.10.3: dependencies: inherits "2.0.1" -"util@>=0.10.3 <1": - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== +"util@>=0.10.3 <1", util@^0.12.5: + version "0.12.5" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" + integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" is-generator-function "^1.0.7" is-typed-array "^1.1.3" - safe-buffer "^5.1.2" which-typed-array "^1.1.2" util@^0.11.0: @@ -30051,7 +30070,7 @@ vite@4.3.2: optionalDependencies: fsevents "~2.3.2" -vm-browserify@^1.0.1: +vm-browserify@^1.0.1, vm-browserify@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== From bcc5f400d6f8ad727798abfbf72dca90d50ece98 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 11:20:51 -0400 Subject: [PATCH 11/37] chore: provide the define plugin and evalDevtoolPlugin again as we need define in order to build the react-dom library correctly in the bundle to not include the development version --- packages/web-config/webpack.config.base.ts | 4 + .../cache/darwin/snapshot-meta.json | 97 ++++++++----------- 2 files changed, 46 insertions(+), 55 deletions(-) diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index 103f91fb3ee4..b323a4d9cdfd 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -223,6 +223,10 @@ export const getCommonConfig = () => { // fallbackModuleFilenameTemplate: 'cypress://[namespace]/[resourcePath]?[hash]' // })] : + (env === 'production' + ? new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }) + : evalDevToolPlugin + ), // Cypress needs access globally to the buffer and process objects. // These were polyfilled by webpack in v4 and no longer are in v5. // To work around this, we provide the process and buffer and globals into the webpack bundle. diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 146facb11d08..a14c070f31f3 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -239,14 +239,6 @@ "./node_modules/@cypress/request/lib/helpers.js", "./node_modules/@cypress/request/lib/querystring.js", "./node_modules/@cypress/request/node_modules/form-data/lib/form_data.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/index.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/md5.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/rng.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/sha1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v3.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v4.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v5.js", "./node_modules/@cypress/request/request.js", "./node_modules/@ffmpeg-installer/ffmpeg/index.js", "./node_modules/@graphql-tools/batch-execute/index.js", @@ -665,14 +657,15 @@ "./node_modules/utf8-stream/node_modules/readable-stream/lib/_stream_writable.js", "./node_modules/utf8-stream/node_modules/readable-stream/transform.js", "./node_modules/util-deprecate/node.js", + "./node_modules/uuid/dist/index.js", + "./node_modules/uuid/dist/md5.js", + "./node_modules/uuid/dist/rng.js", + "./node_modules/uuid/dist/sha1.js", + "./node_modules/uuid/dist/v1.js", + "./node_modules/uuid/dist/v3.js", + "./node_modules/uuid/dist/v4.js", + "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", - "./node_modules/ws/index.js", - "./node_modules/ws/lib/buffer-util.js", - "./node_modules/ws/lib/constants.js", - "./node_modules/ws/lib/receiver.js", - "./node_modules/ws/lib/validation.js", - "./node_modules/ws/lib/websocket-server.js", - "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -765,6 +758,13 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", + "./packages/graphql/node_modules/ws/index.js", + "./packages/graphql/node_modules/ws/lib/buffer-util.js", + "./packages/graphql/node_modules/ws/lib/constants.js", + "./packages/graphql/node_modules/ws/lib/receiver.js", + "./packages/graphql/node_modules/ws/lib/validation.js", + "./packages/graphql/node_modules/ws/lib/websocket-server.js", + "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -892,14 +892,6 @@ "./packages/server/node_modules/send/node_modules/mime/mime.js", "./packages/server/node_modules/signal-exit/signals.js", "./packages/server/node_modules/supports-color/index.js", - "./packages/server/node_modules/uuid/dist/index.js", - "./packages/server/node_modules/uuid/dist/md5.js", - "./packages/server/node_modules/uuid/dist/rng.js", - "./packages/server/node_modules/uuid/dist/sha1.js", - "./packages/server/node_modules/uuid/dist/v1.js", - "./packages/server/node_modules/uuid/dist/v3.js", - "./packages/server/node_modules/uuid/dist/v4.js", - "./packages/server/node_modules/uuid/dist/v5.js", "./packages/server/start-cypress.js", "./packages/server/v8-snapshot-entry.js", "./packages/socket/index.js", @@ -1369,13 +1361,11 @@ "./node_modules/@cypress/request/lib/redirect.js", "./node_modules/@cypress/request/lib/tunnel.js", "./node_modules/@cypress/request/node_modules/form-data/lib/populate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/nil.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/parse.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/regex.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/stringify.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v35.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/validate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/version.js", + "./node_modules/@cypress/request/node_modules/qs/lib/formats.js", + "./node_modules/@cypress/request/node_modules/qs/lib/index.js", + "./node_modules/@cypress/request/node_modules/qs/lib/parse.js", + "./node_modules/@cypress/request/node_modules/qs/lib/stringify.js", + "./node_modules/@cypress/request/node_modules/qs/lib/utils.js", "./node_modules/@electron/fuses/dist/config.js", "./node_modules/@electron/fuses/dist/constants.js", "./node_modules/@electron/fuses/dist/index.js", @@ -2980,11 +2970,6 @@ "./node_modules/pump/index.js", "./node_modules/pumpify/node_modules/pump/index.js", "./node_modules/pupa/index.js", - "./node_modules/qs/lib/formats.js", - "./node_modules/qs/lib/index.js", - "./node_modules/qs/lib/parse.js", - "./node_modules/qs/lib/stringify.js", - "./node_modules/qs/lib/utils.js", "./node_modules/querystringify/index.js", "./node_modules/queue-microtask/index.js", "./node_modules/ramda/src/F.js", @@ -3489,6 +3474,8 @@ "./node_modules/shell-env/node_modules/path-key/index.js", "./node_modules/shell-env/node_modules/strip-ansi/index.js", "./node_modules/shell-quote/index.js", + "./node_modules/shell-quote/parse.js", + "./node_modules/shell-quote/quote.js", "./node_modules/side-channel/index.js", "./node_modules/signal-exit/index.js", "./node_modules/simple-swizzle/index.js", @@ -3578,6 +3565,11 @@ "./node_modules/trash/node_modules/path-type/index.js", "./node_modules/trash/node_modules/pify/index.js", "./node_modules/trash/node_modules/slash/index.js", + "./node_modules/trash/node_modules/uuid/index.js", + "./node_modules/trash/node_modules/uuid/lib/bytesToUuid.js", + "./node_modules/trash/node_modules/uuid/lib/rng.js", + "./node_modules/trash/node_modules/uuid/v1.js", + "./node_modules/trash/node_modules/uuid/v4.js", "./node_modules/tree-kill/index.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", @@ -3691,11 +3683,13 @@ "./node_modules/utf8-stream/index.js", "./node_modules/utf8-stream/node_modules/isarray/index.js", "./node_modules/utils-merge/index.js", - "./node_modules/uuid/index.js", - "./node_modules/uuid/lib/bytesToUuid.js", - "./node_modules/uuid/lib/rng.js", - "./node_modules/uuid/v1.js", - "./node_modules/uuid/v4.js", + "./node_modules/uuid/dist/nil.js", + "./node_modules/uuid/dist/parse.js", + "./node_modules/uuid/dist/regex.js", + "./node_modules/uuid/dist/stringify.js", + "./node_modules/uuid/dist/v35.js", + "./node_modules/uuid/dist/validate.js", + "./node_modules/uuid/dist/version.js", "./node_modules/v8-compile-cache-lib/v8-compile-cache.js", "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", @@ -3705,13 +3699,6 @@ "./node_modules/win-version-info/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", - "./node_modules/ws/lib/event-target.js", - "./node_modules/ws/lib/extension.js", - "./node_modules/ws/lib/limiter.js", - "./node_modules/ws/lib/permessage-deflate.js", - "./node_modules/ws/lib/sender.js", - "./node_modules/ws/lib/stream.js", - "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -4074,6 +4061,13 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", + "./packages/graphql/node_modules/ws/lib/event-target.js", + "./packages/graphql/node_modules/ws/lib/extension.js", + "./packages/graphql/node_modules/ws/lib/limiter.js", + "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", + "./packages/graphql/node_modules/ws/lib/sender.js", + "./packages/graphql/node_modules/ws/lib/stream.js", + "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -4521,13 +4515,6 @@ "./packages/server/node_modules/tough-cookie/lib/pubsuffix-psl.js", "./packages/server/node_modules/tough-cookie/lib/store.js", "./packages/server/node_modules/tough-cookie/lib/version.js", - "./packages/server/node_modules/uuid/dist/nil.js", - "./packages/server/node_modules/uuid/dist/parse.js", - "./packages/server/node_modules/uuid/dist/regex.js", - "./packages/server/node_modules/uuid/dist/stringify.js", - "./packages/server/node_modules/uuid/dist/v35.js", - "./packages/server/node_modules/uuid/dist/validate.js", - "./packages/server/node_modules/uuid/dist/version.js", "./packages/socket/node_modules/engine.io-parser/lib/commons.js", "./packages/socket/node_modules/engine.io-parser/lib/decodePacket.js", "./packages/socket/node_modules/engine.io-parser/lib/encodePacket.js", @@ -4578,5 +4565,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "95c2bc2a705b242a2104d491824dc490988da7881cc459b8a2c8d56797d3c4b4" + "deferredHash": "fd8f13401f7ee49a0913c70200fbed19570423d545bc2ea4a0a398f16e25d314" } \ No newline at end of file From 3520bc471ec16ae126fe0c491fae47dc9ecc8e13 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Sun, 30 Jul 2023 22:46:41 +0000 Subject: [PATCH 12/37] chore: updating v8 snapshot cache --- .../cache/linux/snapshot-meta.json | 97 ++++++++----------- 1 file changed, 42 insertions(+), 55 deletions(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 55441c4c9c66..183f33cfa4c9 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -162,14 +162,6 @@ "./node_modules/@cypress/request/lib/helpers.js", "./node_modules/@cypress/request/lib/querystring.js", "./node_modules/@cypress/request/node_modules/form-data/lib/form_data.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/index.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/md5.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/rng.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/sha1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v3.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v4.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v5.js", "./node_modules/@cypress/request/request.js", "./node_modules/@ffmpeg-installer/ffmpeg/index.js", "./node_modules/@graphql-tools/batch-execute/index.js", @@ -587,14 +579,15 @@ "./node_modules/utf8-stream/node_modules/readable-stream/lib/_stream_writable.js", "./node_modules/utf8-stream/node_modules/readable-stream/transform.js", "./node_modules/util-deprecate/node.js", + "./node_modules/uuid/dist/index.js", + "./node_modules/uuid/dist/md5.js", + "./node_modules/uuid/dist/rng.js", + "./node_modules/uuid/dist/sha1.js", + "./node_modules/uuid/dist/v1.js", + "./node_modules/uuid/dist/v3.js", + "./node_modules/uuid/dist/v4.js", + "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", - "./node_modules/ws/index.js", - "./node_modules/ws/lib/buffer-util.js", - "./node_modules/ws/lib/constants.js", - "./node_modules/ws/lib/receiver.js", - "./node_modules/ws/lib/validation.js", - "./node_modules/ws/lib/websocket-server.js", - "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -687,6 +680,13 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", + "./packages/graphql/node_modules/ws/index.js", + "./packages/graphql/node_modules/ws/lib/buffer-util.js", + "./packages/graphql/node_modules/ws/lib/constants.js", + "./packages/graphql/node_modules/ws/lib/receiver.js", + "./packages/graphql/node_modules/ws/lib/validation.js", + "./packages/graphql/node_modules/ws/lib/websocket-server.js", + "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -814,14 +814,6 @@ "./packages/server/node_modules/send/node_modules/mime/mime.js", "./packages/server/node_modules/signal-exit/signals.js", "./packages/server/node_modules/supports-color/index.js", - "./packages/server/node_modules/uuid/dist/index.js", - "./packages/server/node_modules/uuid/dist/md5.js", - "./packages/server/node_modules/uuid/dist/rng.js", - "./packages/server/node_modules/uuid/dist/sha1.js", - "./packages/server/node_modules/uuid/dist/v1.js", - "./packages/server/node_modules/uuid/dist/v3.js", - "./packages/server/node_modules/uuid/dist/v4.js", - "./packages/server/node_modules/uuid/dist/v5.js", "./packages/server/start-cypress.js", "./packages/server/v8-snapshot-entry.js", "./packages/socket/index.js", @@ -1076,13 +1068,11 @@ "./node_modules/@cypress/request/lib/redirect.js", "./node_modules/@cypress/request/lib/tunnel.js", "./node_modules/@cypress/request/node_modules/form-data/lib/populate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/nil.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/parse.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/regex.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/stringify.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v35.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/validate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/version.js", + "./node_modules/@cypress/request/node_modules/qs/lib/formats.js", + "./node_modules/@cypress/request/node_modules/qs/lib/index.js", + "./node_modules/@cypress/request/node_modules/qs/lib/parse.js", + "./node_modules/@cypress/request/node_modules/qs/lib/stringify.js", + "./node_modules/@cypress/request/node_modules/qs/lib/utils.js", "./node_modules/@electron/fuses/dist/config.js", "./node_modules/@electron/fuses/dist/constants.js", "./node_modules/@electron/fuses/dist/index.js", @@ -2687,11 +2677,6 @@ "./node_modules/pump/index.js", "./node_modules/pumpify/node_modules/pump/index.js", "./node_modules/pupa/index.js", - "./node_modules/qs/lib/formats.js", - "./node_modules/qs/lib/index.js", - "./node_modules/qs/lib/parse.js", - "./node_modules/qs/lib/stringify.js", - "./node_modules/qs/lib/utils.js", "./node_modules/querystringify/index.js", "./node_modules/queue-microtask/index.js", "./node_modules/ramda/src/F.js", @@ -3196,6 +3181,8 @@ "./node_modules/shell-env/node_modules/path-key/index.js", "./node_modules/shell-env/node_modules/strip-ansi/index.js", "./node_modules/shell-quote/index.js", + "./node_modules/shell-quote/parse.js", + "./node_modules/shell-quote/quote.js", "./node_modules/side-channel/index.js", "./node_modules/signal-exit/index.js", "./node_modules/simple-swizzle/index.js", @@ -3285,6 +3272,11 @@ "./node_modules/trash/node_modules/path-type/index.js", "./node_modules/trash/node_modules/pify/index.js", "./node_modules/trash/node_modules/slash/index.js", + "./node_modules/trash/node_modules/uuid/index.js", + "./node_modules/trash/node_modules/uuid/lib/bytesToUuid.js", + "./node_modules/trash/node_modules/uuid/lib/rng.js", + "./node_modules/trash/node_modules/uuid/v1.js", + "./node_modules/trash/node_modules/uuid/v4.js", "./node_modules/tree-kill/index.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", @@ -3398,11 +3390,13 @@ "./node_modules/utf8-stream/index.js", "./node_modules/utf8-stream/node_modules/isarray/index.js", "./node_modules/utils-merge/index.js", - "./node_modules/uuid/index.js", - "./node_modules/uuid/lib/bytesToUuid.js", - "./node_modules/uuid/lib/rng.js", - "./node_modules/uuid/v1.js", - "./node_modules/uuid/v4.js", + "./node_modules/uuid/dist/nil.js", + "./node_modules/uuid/dist/parse.js", + "./node_modules/uuid/dist/regex.js", + "./node_modules/uuid/dist/stringify.js", + "./node_modules/uuid/dist/v35.js", + "./node_modules/uuid/dist/validate.js", + "./node_modules/uuid/dist/version.js", "./node_modules/v8-compile-cache-lib/v8-compile-cache.js", "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", @@ -3412,13 +3406,6 @@ "./node_modules/win-version-info/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", - "./node_modules/ws/lib/event-target.js", - "./node_modules/ws/lib/extension.js", - "./node_modules/ws/lib/limiter.js", - "./node_modules/ws/lib/permessage-deflate.js", - "./node_modules/ws/lib/sender.js", - "./node_modules/ws/lib/stream.js", - "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -3781,6 +3768,13 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", + "./packages/graphql/node_modules/ws/lib/event-target.js", + "./packages/graphql/node_modules/ws/lib/extension.js", + "./packages/graphql/node_modules/ws/lib/limiter.js", + "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", + "./packages/graphql/node_modules/ws/lib/sender.js", + "./packages/graphql/node_modules/ws/lib/stream.js", + "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -4228,13 +4222,6 @@ "./packages/server/node_modules/tough-cookie/lib/pubsuffix-psl.js", "./packages/server/node_modules/tough-cookie/lib/store.js", "./packages/server/node_modules/tough-cookie/lib/version.js", - "./packages/server/node_modules/uuid/dist/nil.js", - "./packages/server/node_modules/uuid/dist/parse.js", - "./packages/server/node_modules/uuid/dist/regex.js", - "./packages/server/node_modules/uuid/dist/stringify.js", - "./packages/server/node_modules/uuid/dist/v35.js", - "./packages/server/node_modules/uuid/dist/validate.js", - "./packages/server/node_modules/uuid/dist/version.js", "./packages/socket/node_modules/engine.io-parser/lib/commons.js", "./packages/socket/node_modules/engine.io-parser/lib/decodePacket.js", "./packages/socket/node_modules/engine.io-parser/lib/encodePacket.js", @@ -4285,5 +4272,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "95c2bc2a705b242a2104d491824dc490988da7881cc459b8a2c8d56797d3c4b4" + "deferredHash": "fd8f13401f7ee49a0913c70200fbed19570423d545bc2ea4a0a398f16e25d314" } \ No newline at end of file From ed6e7808df5f2f8115facf1f6e2007a33a5e4ca7 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 00:32:46 +0000 Subject: [PATCH 13/37] chore: updating v8 snapshot cache --- .../cache/darwin/snapshot-meta.json | 294 +----------------- 1 file changed, 1 insertion(+), 293 deletions(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index a14c070f31f3..43eab8590f72 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -1,10 +1,5 @@ { "norewrite": [ - "../../node_modules/@babel/highlight/node_modules/supports-color/index.js", - "../../node_modules/@babel/traverse/lib/path/comments.js", - "../../node_modules/@babel/traverse/lib/path/conversion.js", - "../../node_modules/@babel/traverse/lib/path/family.js", - "../../node_modules/@babel/traverse/lib/path/introspection.js", "./evil-dns/evil-dns.js", "./get-stream/buffer-stream.js", "./graceful-fs/polyfills.js", @@ -90,79 +85,6 @@ "./ws/lib/websocket.js" ], "deferred": [ - "../../node_modules/@ampproject/remapping/dist/remapping.umd.js", - "../../node_modules/@babel/core/lib/config/config-chain.js", - "../../node_modules/@babel/core/lib/config/config-descriptors.js", - "../../node_modules/@babel/core/lib/config/files/configuration.js", - "../../node_modules/@babel/core/lib/config/files/import-meta-resolve.js", - "../../node_modules/@babel/core/lib/config/files/plugins.js", - "../../node_modules/@babel/core/lib/config/full.js", - "../../node_modules/@babel/core/lib/config/helpers/config-api.js", - "../../node_modules/@babel/core/lib/config/index.js", - "../../node_modules/@babel/core/lib/config/item.js", - "../../node_modules/@babel/core/lib/config/partial.js", - "../../node_modules/@babel/core/lib/config/pattern-to-regex.js", - "../../node_modules/@babel/core/lib/gensync-utils/fs.js", - "../../node_modules/@babel/core/lib/tools/build-external-helpers.js", - "../../node_modules/@babel/core/lib/transformation/file/file.js", - "../../node_modules/@babel/core/lib/transformation/normalize-file.js", - "../../node_modules/@babel/core/node_modules/semver/semver.js", - "../../node_modules/@babel/generator/lib/node/index.js", - "../../node_modules/@babel/generator/lib/node/whitespace.js", - "../../node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping/dist/gen-mapping.umd.js", - "../../node_modules/@babel/helper-compilation-targets/node_modules/semver/semver.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/fields.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/misc.js", - "../../node_modules/@babel/helper-module-transforms/lib/index.js", - "../../node_modules/@babel/highlight/node_modules/chalk/index.js", - "../../node_modules/@babel/traverse/lib/context.js", - "../../node_modules/@babel/traverse/lib/index.js", - "../../node_modules/@babel/traverse/lib/path/ancestry.js", - "../../node_modules/@babel/traverse/lib/path/context.js", - "../../node_modules/@babel/traverse/lib/path/index.js", - "../../node_modules/@babel/traverse/lib/path/lib/removal-hooks.js", - "../../node_modules/@babel/traverse/lib/path/modification.js", - "../../node_modules/@babel/traverse/lib/path/removal.js", - "../../node_modules/@babel/traverse/lib/path/replacement.js", - "../../node_modules/@babel/traverse/lib/traverse-node.js", - "../../node_modules/@babel/types/lib/builders/flow/createFlowUnionType.js", - "../../node_modules/@babel/types/lib/builders/flow/createTypeAnnotationBasedOnTypeof.js", - "../../node_modules/@babel/types/lib/builders/generated/index.js", - "../../node_modules/@babel/types/lib/builders/generated/uppercase.js", - "../../node_modules/@babel/types/lib/builders/react/buildChildren.js", - "../../node_modules/@babel/types/lib/builders/typescript/createTSUnionType.js", - "../../node_modules/@babel/types/lib/builders/validateNode.js", - "../../node_modules/@babel/types/lib/converters/ensureBlock.js", - "../../node_modules/@babel/types/lib/converters/toBlock.js", - "../../node_modules/@babel/types/lib/converters/toComputedKey.js", - "../../node_modules/@babel/types/lib/converters/toSequenceExpression.js", - "../../node_modules/@babel/types/lib/converters/toStatement.js", - "../../node_modules/@babel/types/lib/converters/valueToNode.js", - "../../node_modules/@babel/types/lib/definitions/core.js", - "../../node_modules/@babel/types/lib/definitions/experimental.js", - "../../node_modules/@babel/types/lib/definitions/flow.js", - "../../node_modules/@babel/types/lib/definitions/index.js", - "../../node_modules/@babel/types/lib/definitions/jsx.js", - "../../node_modules/@babel/types/lib/definitions/misc.js", - "../../node_modules/@babel/types/lib/definitions/placeholders.js", - "../../node_modules/@babel/types/lib/definitions/typescript.js", - "../../node_modules/@babel/types/lib/definitions/utils.js", - "../../node_modules/@babel/types/lib/index.js", - "../../node_modules/@babel/types/lib/modifications/appendToMemberExpression.js", - "../../node_modules/@babel/types/lib/modifications/prependToMemberExpression.js", - "../../node_modules/@babel/types/lib/utils/react/cleanJSXElementLiteralChild.js", - "../../node_modules/@babel/types/lib/validators/is.js", - "../../node_modules/@babel/types/lib/validators/isPlaceholderType.js", - "../../node_modules/@babel/types/lib/validators/isType.js", - "../../node_modules/@babel/types/lib/validators/validate.js", - "../../node_modules/@jridgewell/gen-mapping/dist/gen-mapping.umd.js", - "../../node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.umd.js", - "../../node_modules/@jridgewell/trace-mapping/dist/trace-mapping.umd.js", - "../../node_modules/convert-source-map/node_modules/safe-buffer/index.js", - "../../node_modules/debug/src/browser.js", - "../../node_modules/debug/src/index.js", - "../../node_modules/debug/src/node.js", - "../../node_modules/supports-color/index.js", "./node_modules/@ampproject/remapping/dist/remapping.umd.js", "./node_modules/@ampproject/remapping/node_modules/@jridgewell/gen-mapping/dist/gen-mapping.umd.js", "./node_modules/@babel/core/lib/config/config-chain.js", @@ -170,6 +92,7 @@ "./node_modules/@babel/core/lib/config/files/configuration.js", "./node_modules/@babel/core/lib/config/files/import-meta-resolve.js", "./node_modules/@babel/core/lib/config/files/index.js", + "./node_modules/@babel/core/lib/config/files/module-types.js", "./node_modules/@babel/core/lib/config/files/plugins.js", "./node_modules/@babel/core/lib/config/full.js", "./node_modules/@babel/core/lib/config/helpers/config-api.js", @@ -919,220 +842,6 @@ "./tooling/v8-snapshot/dist/setup/v8-snapshot-entry-cy-in-cy.js" ], "healthy": [ - "../../node_modules/@babel/code-frame/lib/index.js", - "../../node_modules/@babel/compat-data/data/native-modules.json", - "../../node_modules/@babel/compat-data/data/plugins.json", - "../../node_modules/@babel/compat-data/native-modules.js", - "../../node_modules/@babel/compat-data/plugins.js", - "../../node_modules/@babel/core/lib/config/cache-contexts.js", - "../../node_modules/@babel/core/lib/config/caching.js", - "../../node_modules/@babel/core/lib/config/files/import.js", - "../../node_modules/@babel/core/lib/config/files/index.js", - "../../node_modules/@babel/core/lib/config/files/module-types.js", - "../../node_modules/@babel/core/lib/config/files/package.js", - "../../node_modules/@babel/core/lib/config/files/utils.js", - "../../node_modules/@babel/core/lib/config/helpers/deep-array.js", - "../../node_modules/@babel/core/lib/config/helpers/environment.js", - "../../node_modules/@babel/core/lib/config/plugin.js", - "../../node_modules/@babel/core/lib/config/printer.js", - "../../node_modules/@babel/core/lib/config/resolve-targets.js", - "../../node_modules/@babel/core/lib/config/util.js", - "../../node_modules/@babel/core/lib/config/validation/option-assertions.js", - "../../node_modules/@babel/core/lib/config/validation/options.js", - "../../node_modules/@babel/core/lib/config/validation/plugins.js", - "../../node_modules/@babel/core/lib/config/validation/removed.js", - "../../node_modules/@babel/core/lib/gensync-utils/async.js", - "../../node_modules/@babel/core/lib/index.js", - "../../node_modules/@babel/core/lib/parse.js", - "../../node_modules/@babel/core/lib/parser/index.js", - "../../node_modules/@babel/core/lib/parser/util/missing-plugin-helper.js", - "../../node_modules/@babel/core/lib/transform-ast.js", - "../../node_modules/@babel/core/lib/transform-file.js", - "../../node_modules/@babel/core/lib/transform.js", - "../../node_modules/@babel/core/lib/transformation/block-hoist-plugin.js", - "../../node_modules/@babel/core/lib/transformation/file/generate.js", - "../../node_modules/@babel/core/lib/transformation/file/merge-map.js", - "../../node_modules/@babel/core/lib/transformation/index.js", - "../../node_modules/@babel/core/lib/transformation/normalize-opts.js", - "../../node_modules/@babel/core/lib/transformation/plugin-pass.js", - "../../node_modules/@babel/core/lib/transformation/util/clone-deep.js", - "../../node_modules/@babel/core/lib/vendor/import-meta-resolve.js", - "../../node_modules/@babel/generator/lib/buffer.js", - "../../node_modules/@babel/generator/lib/generators/base.js", - "../../node_modules/@babel/generator/lib/generators/classes.js", - "../../node_modules/@babel/generator/lib/generators/expressions.js", - "../../node_modules/@babel/generator/lib/generators/flow.js", - "../../node_modules/@babel/generator/lib/generators/index.js", - "../../node_modules/@babel/generator/lib/generators/jsx.js", - "../../node_modules/@babel/generator/lib/generators/methods.js", - "../../node_modules/@babel/generator/lib/generators/modules.js", - "../../node_modules/@babel/generator/lib/generators/statements.js", - "../../node_modules/@babel/generator/lib/generators/template-literals.js", - "../../node_modules/@babel/generator/lib/generators/types.js", - "../../node_modules/@babel/generator/lib/generators/typescript.js", - "../../node_modules/@babel/generator/lib/index.js", - "../../node_modules/@babel/generator/lib/node/parentheses.js", - "../../node_modules/@babel/generator/lib/printer.js", - "../../node_modules/@babel/generator/lib/source-map.js", - "../../node_modules/@babel/helper-annotate-as-pure/lib/index.js", - "../../node_modules/@babel/helper-compilation-targets/lib/debug.js", - "../../node_modules/@babel/helper-compilation-targets/lib/filter-items.js", - "../../node_modules/@babel/helper-compilation-targets/lib/index.js", - "../../node_modules/@babel/helper-compilation-targets/lib/options.js", - "../../node_modules/@babel/helper-compilation-targets/lib/pretty.js", - "../../node_modules/@babel/helper-compilation-targets/lib/targets.js", - "../../node_modules/@babel/helper-compilation-targets/lib/utils.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/decorators.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/features.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/index.js", - "../../node_modules/@babel/helper-create-class-features-plugin/lib/typescript.js", - "../../node_modules/@babel/helper-environment-visitor/lib/index.js", - "../../node_modules/@babel/helper-function-name/lib/index.js", - "../../node_modules/@babel/helper-hoist-variables/lib/index.js", - "../../node_modules/@babel/helper-member-expression-to-functions/lib/index.js", - "../../node_modules/@babel/helper-module-imports/lib/import-builder.js", - "../../node_modules/@babel/helper-module-imports/lib/import-injector.js", - "../../node_modules/@babel/helper-module-imports/lib/index.js", - "../../node_modules/@babel/helper-module-imports/lib/is-module.js", - "../../node_modules/@babel/helper-module-transforms/lib/get-module-name.js", - "../../node_modules/@babel/helper-module-transforms/lib/normalize-and-load-metadata.js", - "../../node_modules/@babel/helper-module-transforms/lib/rewrite-live-references.js", - "../../node_modules/@babel/helper-module-transforms/lib/rewrite-this.js", - "../../node_modules/@babel/helper-optimise-call-expression/lib/index.js", - "../../node_modules/@babel/helper-plugin-utils/lib/index.js", - "../../node_modules/@babel/helper-replace-supers/lib/index.js", - "../../node_modules/@babel/helper-simple-access/lib/index.js", - "../../node_modules/@babel/helper-split-export-declaration/lib/index.js", - "../../node_modules/@babel/helper-validator-identifier/lib/identifier.js", - "../../node_modules/@babel/helper-validator-identifier/lib/index.js", - "../../node_modules/@babel/helper-validator-identifier/lib/keyword.js", - "../../node_modules/@babel/helper-validator-option/lib/find-suggestion.js", - "../../node_modules/@babel/helper-validator-option/lib/index.js", - "../../node_modules/@babel/helper-validator-option/lib/validator.js", - "../../node_modules/@babel/helpers/lib/helpers-generated.js", - "../../node_modules/@babel/helpers/lib/helpers.js", - "../../node_modules/@babel/helpers/lib/index.js", - "../../node_modules/@babel/highlight/lib/index.js", - "../../node_modules/@babel/highlight/node_modules/ansi-styles/index.js", - "../../node_modules/@babel/highlight/node_modules/chalk/templates.js", - "../../node_modules/@babel/highlight/node_modules/color-convert/conversions.js", - "../../node_modules/@babel/highlight/node_modules/color-convert/index.js", - "../../node_modules/@babel/highlight/node_modules/color-convert/route.js", - "../../node_modules/@babel/highlight/node_modules/color-name/index.js", - "../../node_modules/@babel/highlight/node_modules/has-flag/index.js", - "../../node_modules/@babel/parser/lib/index.js", - "../../node_modules/@babel/plugin-syntax-typescript/lib/index.js", - "../../node_modules/@babel/plugin-transform-typescript/lib/const-enum.js", - "../../node_modules/@babel/plugin-transform-typescript/lib/enum.js", - "../../node_modules/@babel/plugin-transform-typescript/lib/index.js", - "../../node_modules/@babel/plugin-transform-typescript/lib/namespace.js", - "../../node_modules/@babel/preset-typescript/lib/index.js", - "../../node_modules/@babel/preset-typescript/package.json", - "../../node_modules/@babel/template/lib/builder.js", - "../../node_modules/@babel/template/lib/formatters.js", - "../../node_modules/@babel/template/lib/index.js", - "../../node_modules/@babel/template/lib/literal.js", - "../../node_modules/@babel/template/lib/options.js", - "../../node_modules/@babel/template/lib/parse.js", - "../../node_modules/@babel/template/lib/populate.js", - "../../node_modules/@babel/template/lib/string.js", - "../../node_modules/@babel/traverse/lib/cache.js", - "../../node_modules/@babel/traverse/lib/hub.js", - "../../node_modules/@babel/traverse/lib/path/evaluation.js", - "../../node_modules/@babel/traverse/lib/path/inference/index.js", - "../../node_modules/@babel/traverse/lib/path/inference/inferer-reference.js", - "../../node_modules/@babel/traverse/lib/path/inference/inferers.js", - "../../node_modules/@babel/traverse/lib/path/lib/hoister.js", - "../../node_modules/@babel/traverse/lib/path/lib/virtual-types.js", - "../../node_modules/@babel/traverse/lib/scope/binding.js", - "../../node_modules/@babel/traverse/lib/scope/index.js", - "../../node_modules/@babel/traverse/lib/scope/lib/renamer.js", - "../../node_modules/@babel/traverse/lib/visitors.js", - "../../node_modules/@babel/types/lib/asserts/assertNode.js", - "../../node_modules/@babel/types/lib/asserts/generated/index.js", - "../../node_modules/@babel/types/lib/ast-types/generated/index.js", - "../../node_modules/@babel/types/lib/clone/clone.js", - "../../node_modules/@babel/types/lib/clone/cloneDeep.js", - "../../node_modules/@babel/types/lib/clone/cloneDeepWithoutLoc.js", - "../../node_modules/@babel/types/lib/clone/cloneNode.js", - "../../node_modules/@babel/types/lib/clone/cloneWithoutLoc.js", - "../../node_modules/@babel/types/lib/comments/addComment.js", - "../../node_modules/@babel/types/lib/comments/addComments.js", - "../../node_modules/@babel/types/lib/comments/inheritInnerComments.js", - "../../node_modules/@babel/types/lib/comments/inheritLeadingComments.js", - "../../node_modules/@babel/types/lib/comments/inheritTrailingComments.js", - "../../node_modules/@babel/types/lib/comments/inheritsComments.js", - "../../node_modules/@babel/types/lib/comments/removeComments.js", - "../../node_modules/@babel/types/lib/constants/generated/index.js", - "../../node_modules/@babel/types/lib/constants/index.js", - "../../node_modules/@babel/types/lib/converters/gatherSequenceExpressions.js", - "../../node_modules/@babel/types/lib/converters/toBindingIdentifierName.js", - "../../node_modules/@babel/types/lib/converters/toExpression.js", - "../../node_modules/@babel/types/lib/converters/toIdentifier.js", - "../../node_modules/@babel/types/lib/converters/toKeyAlias.js", - "../../node_modules/@babel/types/lib/modifications/flow/removeTypeDuplicates.js", - "../../node_modules/@babel/types/lib/modifications/inherits.js", - "../../node_modules/@babel/types/lib/modifications/removeProperties.js", - "../../node_modules/@babel/types/lib/modifications/removePropertiesDeep.js", - "../../node_modules/@babel/types/lib/modifications/typescript/removeTypeDuplicates.js", - "../../node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js", - "../../node_modules/@babel/types/lib/retrievers/getOuterBindingIdentifiers.js", - "../../node_modules/@babel/types/lib/traverse/traverse.js", - "../../node_modules/@babel/types/lib/traverse/traverseFast.js", - "../../node_modules/@babel/types/lib/utils/inherit.js", - "../../node_modules/@babel/types/lib/utils/shallowEqual.js", - "../../node_modules/@babel/types/lib/validators/buildMatchMemberExpression.js", - "../../node_modules/@babel/types/lib/validators/generated/index.js", - "../../node_modules/@babel/types/lib/validators/isBinding.js", - "../../node_modules/@babel/types/lib/validators/isBlockScoped.js", - "../../node_modules/@babel/types/lib/validators/isImmutable.js", - "../../node_modules/@babel/types/lib/validators/isLet.js", - "../../node_modules/@babel/types/lib/validators/isNode.js", - "../../node_modules/@babel/types/lib/validators/isNodesEquivalent.js", - "../../node_modules/@babel/types/lib/validators/isReferenced.js", - "../../node_modules/@babel/types/lib/validators/isScope.js", - "../../node_modules/@babel/types/lib/validators/isSpecifierDefault.js", - "../../node_modules/@babel/types/lib/validators/isValidES3Identifier.js", - "../../node_modules/@babel/types/lib/validators/isValidIdentifier.js", - "../../node_modules/@babel/types/lib/validators/isVar.js", - "../../node_modules/@babel/types/lib/validators/matchesPattern.js", - "../../node_modules/@babel/types/lib/validators/react/isCompatTag.js", - "../../node_modules/@babel/types/lib/validators/react/isReactComponent.js", - "../../node_modules/@jridgewell/resolve-uri/dist/resolve-uri.umd.js", - "../../node_modules/@jridgewell/set-array/dist/set-array.umd.js", - "../../node_modules/browserslist/error.js", - "../../node_modules/browserslist/index.js", - "../../node_modules/browserslist/node.js", - "../../node_modules/browserslist/parse.js", - "../../node_modules/caniuse-lite/data/agents.js", - "../../node_modules/caniuse-lite/data/browserVersions.js", - "../../node_modules/caniuse-lite/data/browsers.js", - "../../node_modules/caniuse-lite/dist/lib/statuses.js", - "../../node_modules/caniuse-lite/dist/lib/supported.js", - "../../node_modules/caniuse-lite/dist/unpacker/agents.js", - "../../node_modules/caniuse-lite/dist/unpacker/browserVersions.js", - "../../node_modules/caniuse-lite/dist/unpacker/browsers.js", - "../../node_modules/caniuse-lite/dist/unpacker/feature.js", - "../../node_modules/caniuse-lite/dist/unpacker/region.js", - "../../node_modules/convert-source-map/index.js", - "../../node_modules/debug/node_modules/ms/index.js", - "../../node_modules/debug/src/common.js", - "../../node_modules/electron-to-chromium/versions.js", - "../../node_modules/escape-string-regexp/index.js", - "../../node_modules/gensync/index.js", - "../../node_modules/globals/globals.json", - "../../node_modules/globals/index.js", - "../../node_modules/has-flag/index.js", - "../../node_modules/js-tokens/index.js", - "../../node_modules/jsesc/jsesc.js", - "../../node_modules/json5/lib/index.js", - "../../node_modules/json5/lib/parse.js", - "../../node_modules/json5/lib/stringify.js", - "../../node_modules/json5/lib/unicode.js", - "../../node_modules/json5/lib/util.js", - "../../node_modules/node-releases/data/processed/envs.json", - "../../node_modules/node-releases/data/release-schedule/release-schedule.json", - "../../node_modules/to-fast-properties/index.js", "./node_modules/@babel/code-frame/lib/index.js", "./node_modules/@babel/compat-data/data/native-modules.json", "./node_modules/@babel/compat-data/data/plugins.json", @@ -1140,7 +849,6 @@ "./node_modules/@babel/compat-data/plugins.js", "./node_modules/@babel/core/lib/config/caching.js", "./node_modules/@babel/core/lib/config/files/import.cjs", - "./node_modules/@babel/core/lib/config/files/module-types.js", "./node_modules/@babel/core/lib/config/files/package.js", "./node_modules/@babel/core/lib/config/files/utils.js", "./node_modules/@babel/core/lib/config/helpers/deep-array.js", From e49fc37d232586fc8ec9754c9551af8f89e244c0 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 02:24:00 +0000 Subject: [PATCH 14/37] chore: updating v8 snapshot cache --- .../cache/win32/snapshot-meta.json | 97 ++++++++----------- 1 file changed, 42 insertions(+), 55 deletions(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 59b508850914..922c443a5fb1 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -164,14 +164,6 @@ "./node_modules/@cypress/request/lib/helpers.js", "./node_modules/@cypress/request/lib/querystring.js", "./node_modules/@cypress/request/node_modules/form-data/lib/form_data.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/index.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/md5.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/rng.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/sha1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v1.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v3.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v4.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v5.js", "./node_modules/@cypress/request/request.js", "./node_modules/@ffmpeg-installer/ffmpeg/index.js", "./node_modules/@graphql-tools/batch-execute/index.js", @@ -591,15 +583,16 @@ "./node_modules/utf8-stream/node_modules/readable-stream/lib/_stream_writable.js", "./node_modules/utf8-stream/node_modules/readable-stream/transform.js", "./node_modules/util-deprecate/node.js", + "./node_modules/uuid/dist/index.js", + "./node_modules/uuid/dist/md5.js", + "./node_modules/uuid/dist/rng.js", + "./node_modules/uuid/dist/sha1.js", + "./node_modules/uuid/dist/v1.js", + "./node_modules/uuid/dist/v3.js", + "./node_modules/uuid/dist/v4.js", + "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", "./node_modules/win-version-info/index.js", - "./node_modules/ws/index.js", - "./node_modules/ws/lib/buffer-util.js", - "./node_modules/ws/lib/constants.js", - "./node_modules/ws/lib/receiver.js", - "./node_modules/ws/lib/validation.js", - "./node_modules/ws/lib/websocket-server.js", - "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -692,6 +685,13 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", + "./packages/graphql/node_modules/ws/index.js", + "./packages/graphql/node_modules/ws/lib/buffer-util.js", + "./packages/graphql/node_modules/ws/lib/constants.js", + "./packages/graphql/node_modules/ws/lib/receiver.js", + "./packages/graphql/node_modules/ws/lib/validation.js", + "./packages/graphql/node_modules/ws/lib/websocket-server.js", + "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -819,14 +819,6 @@ "./packages/server/node_modules/send/node_modules/mime/mime.js", "./packages/server/node_modules/signal-exit/signals.js", "./packages/server/node_modules/supports-color/index.js", - "./packages/server/node_modules/uuid/dist/index.js", - "./packages/server/node_modules/uuid/dist/md5.js", - "./packages/server/node_modules/uuid/dist/rng.js", - "./packages/server/node_modules/uuid/dist/sha1.js", - "./packages/server/node_modules/uuid/dist/v1.js", - "./packages/server/node_modules/uuid/dist/v3.js", - "./packages/server/node_modules/uuid/dist/v4.js", - "./packages/server/node_modules/uuid/dist/v5.js", "./packages/server/start-cypress.js", "./packages/server/v8-snapshot-entry.js", "./packages/socket/index.js", @@ -1079,13 +1071,11 @@ "./node_modules/@cypress/request/lib/redirect.js", "./node_modules/@cypress/request/lib/tunnel.js", "./node_modules/@cypress/request/node_modules/form-data/lib/populate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/nil.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/parse.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/regex.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/stringify.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/v35.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/validate.js", - "./node_modules/@cypress/request/node_modules/uuid/dist/version.js", + "./node_modules/@cypress/request/node_modules/qs/lib/formats.js", + "./node_modules/@cypress/request/node_modules/qs/lib/index.js", + "./node_modules/@cypress/request/node_modules/qs/lib/parse.js", + "./node_modules/@cypress/request/node_modules/qs/lib/stringify.js", + "./node_modules/@cypress/request/node_modules/qs/lib/utils.js", "./node_modules/@electron/fuses/dist/config.js", "./node_modules/@electron/fuses/dist/constants.js", "./node_modules/@electron/fuses/dist/index.js", @@ -2691,11 +2681,6 @@ "./node_modules/pump/index.js", "./node_modules/pumpify/node_modules/pump/index.js", "./node_modules/pupa/index.js", - "./node_modules/qs/lib/formats.js", - "./node_modules/qs/lib/index.js", - "./node_modules/qs/lib/parse.js", - "./node_modules/qs/lib/stringify.js", - "./node_modules/qs/lib/utils.js", "./node_modules/querystringify/index.js", "./node_modules/queue-microtask/index.js", "./node_modules/ramda/src/F.js", @@ -3198,6 +3183,8 @@ "./node_modules/shell-env/node_modules/path-key/index.js", "./node_modules/shell-env/node_modules/strip-ansi/index.js", "./node_modules/shell-quote/index.js", + "./node_modules/shell-quote/parse.js", + "./node_modules/shell-quote/quote.js", "./node_modules/side-channel/index.js", "./node_modules/signal-exit/index.js", "./node_modules/simple-swizzle/index.js", @@ -3286,6 +3273,11 @@ "./node_modules/trash/node_modules/path-type/index.js", "./node_modules/trash/node_modules/pify/index.js", "./node_modules/trash/node_modules/slash/index.js", + "./node_modules/trash/node_modules/uuid/index.js", + "./node_modules/trash/node_modules/uuid/lib/bytesToUuid.js", + "./node_modules/trash/node_modules/uuid/lib/rng.js", + "./node_modules/trash/node_modules/uuid/v1.js", + "./node_modules/trash/node_modules/uuid/v4.js", "./node_modules/tree-kill/index.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", @@ -3399,11 +3391,13 @@ "./node_modules/utf8-stream/index.js", "./node_modules/utf8-stream/node_modules/isarray/index.js", "./node_modules/utils-merge/index.js", - "./node_modules/uuid/index.js", - "./node_modules/uuid/lib/bytesToUuid.js", - "./node_modules/uuid/lib/rng.js", - "./node_modules/uuid/v1.js", - "./node_modules/uuid/v4.js", + "./node_modules/uuid/dist/nil.js", + "./node_modules/uuid/dist/parse.js", + "./node_modules/uuid/dist/regex.js", + "./node_modules/uuid/dist/stringify.js", + "./node_modules/uuid/dist/v35.js", + "./node_modules/uuid/dist/validate.js", + "./node_modules/uuid/dist/version.js", "./node_modules/v8-compile-cache-lib/v8-compile-cache.js", "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", @@ -3412,13 +3406,6 @@ "./node_modules/widest-line/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", - "./node_modules/ws/lib/event-target.js", - "./node_modules/ws/lib/extension.js", - "./node_modules/ws/lib/limiter.js", - "./node_modules/ws/lib/permessage-deflate.js", - "./node_modules/ws/lib/sender.js", - "./node_modules/ws/lib/stream.js", - "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -3781,6 +3768,13 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", + "./packages/graphql/node_modules/ws/lib/event-target.js", + "./packages/graphql/node_modules/ws/lib/extension.js", + "./packages/graphql/node_modules/ws/lib/limiter.js", + "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", + "./packages/graphql/node_modules/ws/lib/sender.js", + "./packages/graphql/node_modules/ws/lib/stream.js", + "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -4228,13 +4222,6 @@ "./packages/server/node_modules/tough-cookie/lib/pubsuffix-psl.js", "./packages/server/node_modules/tough-cookie/lib/store.js", "./packages/server/node_modules/tough-cookie/lib/version.js", - "./packages/server/node_modules/uuid/dist/nil.js", - "./packages/server/node_modules/uuid/dist/parse.js", - "./packages/server/node_modules/uuid/dist/regex.js", - "./packages/server/node_modules/uuid/dist/stringify.js", - "./packages/server/node_modules/uuid/dist/v35.js", - "./packages/server/node_modules/uuid/dist/validate.js", - "./packages/server/node_modules/uuid/dist/version.js", "./packages/socket/node_modules/engine.io-parser/lib/commons.js", "./packages/socket/node_modules/engine.io-parser/lib/decodePacket.js", "./packages/socket/node_modules/engine.io-parser/lib/encodePacket.js", @@ -4285,5 +4272,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "d9cc09f8e3b1ae9cc1ab17847bac531bf15bde3d18d4f75c7de6ce272a4dac20" + "deferredHash": "dea89fb13851e92811e518fa079535c28d176ca41f9240746499dc1fb538abd7" } \ No newline at end of file From b39dae149daaf8e9b475ae6f50b6a37897dba7f4 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 10:27:20 -0400 Subject: [PATCH 15/37] chore: fix the webpack preprocessor not to change promise references under the hood when compiling the first bundle, as it was causing the webpack preprocessor to hang as the reference itself was different --- npm/webpack-preprocessor/index.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/npm/webpack-preprocessor/index.ts b/npm/webpack-preprocessor/index.ts index b6662dd9e2f2..7e5c8af2696d 100644 --- a/npm/webpack-preprocessor/index.ts +++ b/npm/webpack-preprocessor/index.ts @@ -324,10 +324,21 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F // this event is triggered when watching and a file is saved const onCompile = () => { debug('compile', filePath) - const nextBundle = utils.createDeferred() + /** + * Webpack 5 fix: + * If the bundle is the initial bundle, do not create the deferred promise + * as we already have one from above. Creating additional deferments on top of + * the first bundle causes reference issues with the first bundle returned, meaning + * the promise that is resolved/rejected is different from the one that is returned, which + * makes the preprocessor permanently hang + */ + if (!bundles[filePath].initial) { + const nextBundle = utils.createDeferred() + + bundles[filePath].promise = nextBundle.promise + bundles[filePath].deferreds.push(nextBundle) + } - bundles[filePath].promise = nextBundle.promise - bundles[filePath].deferreds.push(nextBundle) bundles[filePath].promise.finally(() => { debug('- compile finished for %s, initial? %s', filePath, bundles[filePath].initial) // when the bundling is finished, emit 'rerun' to let Cypress From 3e9fa7c7c9c71c070f1e4e779852c2b32ef3248b Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 13:43:44 -0400 Subject: [PATCH 16/37] chore: fix issues from readFile that were caused by Webpack 5 using 'path-browserify' --- packages/driver/src/cy/commands/files.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/driver/src/cy/commands/files.ts b/packages/driver/src/cy/commands/files.ts index ec94f6220fda..2d9745c668e4 100644 --- a/packages/driver/src/cy/commands/files.ts +++ b/packages/driver/src/cy/commands/files.ts @@ -110,7 +110,14 @@ export default (Commands, Cypress, cy, state) => { } // Add the filename as a symbol, in case we need it later (such as when storing an alias) - state('current').set('fileName', basename(filePath)) + try { + state('current').set('fileName', basename(filePath)) + } catch (e) { + // as of Webpack 5, the "path-browserify" polyfill requires the "path" + // argument in "basename" to be a string. Otherwise, the function throws. + // when this happens, we want to set the filename to "undefined" as fallback behavior. + state('current').set('fileName', 'undefined') + } consoleProps['File Path'] = filePath consoleProps['Contents'] = contents From d445f61234b31f31631688cd7d3133ef2d822a71 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 13:48:57 -0400 Subject: [PATCH 17/37] chore: update chrome component testing snapshots to match Webpack 5 changes --- system-tests/__snapshots__/component_testing_spec.ts.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system-tests/__snapshots__/component_testing_spec.ts.js b/system-tests/__snapshots__/component_testing_spec.ts.js index b79c7e6f457b..3de8d07c208a 100644 --- a/system-tests/__snapshots__/component_testing_spec.ts.js +++ b/system-tests/__snapshots__/component_testing_spec.ts.js @@ -17,7 +17,7 @@ exports['React major versions with Webpack executes all of the tests for React v ──────────────────────────────────────────────────────────────────────────────────────────────────── Running: App.cy.jsx (1 of 5) - 49 modules + 53 modules ✓ renders hello world @@ -222,7 +222,7 @@ exports['React major versions with Webpack executes all of the tests for React v ──────────────────────────────────────────────────────────────────────────────────────────────────── Running: App.cy.jsx (1 of 5) - 46 modules + 50 modules ✓ renders hello world @@ -834,6 +834,7 @@ exports['experimentalSingleTabRunMode / executes all specs in a single tab'] = ` ──────────────────────────────────────────────────────────────────────────────────────────────────── Running: 1_fails.cy.js (1 of 4) +webpack compiled successfully simple failing spec From d88f42d81cbddebeb79e794a323ed9b31f0e610b Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 13:50:57 -0400 Subject: [PATCH 18/37] chore: fix mismatched snapshots from webpack 5 update --- .../__snapshots__/busted_support_file_spec.js | 14 -------------- system-tests/__snapshots__/es_modules_spec.js | 2 -- system-tests/__snapshots__/record_spec.js | 12 ------------ system-tests/__snapshots__/stdout_spec.js | 1 - .../typescript_spec_support_spec.ts.js | 9 +++++++-- 5 files changed, 7 insertions(+), 31 deletions(-) diff --git a/system-tests/__snapshots__/busted_support_file_spec.js b/system-tests/__snapshots__/busted_support_file_spec.js index a036362edfd9..e1a15ee26a8d 100644 --- a/system-tests/__snapshots__/busted_support_file_spec.js +++ b/system-tests/__snapshots__/busted_support_file_spec.js @@ -23,21 +23,7 @@ Oops...we found an error preparing this test file: The error was: Error: Webpack Compilation Error -./cypress/support/e2e.js Module not found: Error: Can't resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' -Looked for and couldn't find the file at the following paths: -[/foo/bar/.projects/busted-support-file/cypress/support/package.json] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist/package.json] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.mjs] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx] - @ ./cypress/support/e2e.js 3:0-27 - [stack trace lines] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/system-tests/__snapshots__/es_modules_spec.js b/system-tests/__snapshots__/es_modules_spec.js index f09f49d532a5..1e52e4db142f 100644 --- a/system-tests/__snapshots__/es_modules_spec.js +++ b/system-tests/__snapshots__/es_modules_spec.js @@ -85,14 +85,12 @@ Oops...we found an error preparing this test file: The error was: Error: Webpack Compilation Error -./lib/fail.js Module build failed (from [..]): SyntaxError: /foo/bar/.projects/e2e/lib/fail.js: Unexpected token (2:0) 1 | export default { > 2 | | ^ - @ ./cypress/e2e/es_module_import_failing.cy.js 3:0-25 [stack trace lines] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/system-tests/__snapshots__/record_spec.js b/system-tests/__snapshots__/record_spec.js index db89fb7eef14..0638556b8207 100644 --- a/system-tests/__snapshots__/record_spec.js +++ b/system-tests/__snapshots__/record_spec.js @@ -27,19 +27,7 @@ Oops...we found an error preparing this test file: The error was: Error: Webpack Compilation Error -./cypress/e2e/record_error.cy.js Module not found: Error: Can't resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/e2e' -Looked for and couldn't find the file at the following paths: -[/foo/bar/.projects/e2e/cypress/it/does/not/exist] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.mjs] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] - @ ./cypress/e2e/record_error.cy.js 3:0-31 - [stack trace lines] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/system-tests/__snapshots__/stdout_spec.js b/system-tests/__snapshots__/stdout_spec.js index d1e6527ac79a..32f73fa00ecc 100644 --- a/system-tests/__snapshots__/stdout_spec.js +++ b/system-tests/__snapshots__/stdout_spec.js @@ -141,7 +141,6 @@ Oops...we found an error preparing this test file: The error was: Error: Webpack Compilation Error -./cypress/e2e/stdout_exit_early_failing.cy.js Module build failed (from [..]): SyntaxError: /foo/bar/.projects/e2e/cypress/e2e/stdout_exit_early_failing.cy.js: Unexpected token (1:1) diff --git a/system-tests/__snapshots__/typescript_spec_support_spec.ts.js b/system-tests/__snapshots__/typescript_spec_support_spec.ts.js index 2004c386aae1..c2a1aa31d517 100644 --- a/system-tests/__snapshots__/typescript_spec_support_spec.ts.js +++ b/system-tests/__snapshots__/typescript_spec_support_spec.ts.js @@ -86,7 +86,9 @@ Oops...we found an error preparing this test file: The error was: Error: Webpack Compilation Error -./cypress/e2e/typescript_syntax_error.cy.tsXX:XX +[tsl] ERROR in /foo/bar/.projects/e2e/cypress/e2e/typescript_syntax_error.cy.ts(3,19) + TS1109: Expression expected. + Module parse failed: Unexpected token (3:19) File was processed with these loaders: * relative/path/to/webpack-batteries-included-preprocessor/node_modules/ts-loader/index.js @@ -94,7 +96,10 @@ You may need an additional loader to handle the result of these loaders. | // The code below is ignored by eslint | // because it tests failing spec. > describe('fail', - > ); -| +| + +[tsl] ERROR in /foo/bar/.projects/e2e/cypress/e2e/typescript_syntax_error.cy.ts(3,21) + TS1109: Expression expected. [stack trace lines] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: From 6d8400e6f5095f1b9d799289275e2132c85a8235 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 13:59:22 -0400 Subject: [PATCH 19/37] chore: use Cypress.Buffer instead of Buffer for selectFile system test to avoid having to polyfill Buffer from webpack --- .../projects/selectFile/cypress/e2e/index.cy.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/system-tests/projects/selectFile/cypress/e2e/index.cy.js b/system-tests/projects/selectFile/cypress/e2e/index.cy.js index d52357354f26..82cc22d8a3ad 100644 --- a/system-tests/projects/selectFile/cypress/e2e/index.cy.js +++ b/system-tests/projects/selectFile/cypress/e2e/index.cy.js @@ -11,8 +11,8 @@ describe('selectFile', () => { // handler - there's no way for cypress know that a button should trigger // the file input. We have to target the hidden input and `force` it. cy.get('input').first().selectFile([ - { contents: Buffer.from('foo'), fileName: 'bar.txt' }, - { contents: Buffer.from('foo2'), fileName: 'baz.txt' }, + { contents: Cypress.Buffer.from('foo'), fileName: 'bar.txt' }, + { contents: Cypress.Buffer.from('foo2'), fileName: 'baz.txt' }, ], { force: true }) cy.get('#uppy') @@ -24,8 +24,8 @@ describe('selectFile', () => { it('can drop files', () => { cy.get('.uppy-Dashboard-AddFiles').first().selectFile([ - { contents: Buffer.from('foo'), fileName: 'bar.txt' }, - { contents: Buffer.from('foo2'), fileName: 'baz.txt' }, + { contents: Cypress.Buffer.from('foo'), fileName: 'bar.txt' }, + { contents: Cypress.Buffer.from('foo2'), fileName: 'baz.txt' }, ], { action: 'drag-drop' }) cy.get('#uppy') @@ -59,8 +59,8 @@ describe('selectFile', () => { // handler - there's no way for cypress know that a button should trigger // the file input. We have to target the hidden input and `force` it. cy.get('input').first().selectFile([ - { contents: Buffer.from('foo'), fileName: 'bar.txt' }, - { contents: Buffer.from('foo2'), fileName: 'baz.txt' }, + { contents: Cypress.Buffer.from('foo'), fileName: 'bar.txt' }, + { contents: Cypress.Buffer.from('foo2'), fileName: 'baz.txt' }, ], { force: true }) cy.get('.dz-preview') @@ -75,8 +75,8 @@ describe('selectFile', () => { // handler - there's no way for cypress know that a button should trigger // the file input. We have to target the hidden input and `force` it. cy.get('.dropzone').first().selectFile([ - { contents: Buffer.from('foo'), fileName: 'bar.txt' }, - { contents: Buffer.from('foo2'), fileName: 'baz.txt' }, + { contents: Cypress.Buffer.from('foo'), fileName: 'bar.txt' }, + { contents: Cypress.Buffer.from('foo2'), fileName: 'baz.txt' }, ], { action: 'drag-drop' }) cy.get('.dz-preview') From 23a42d094dc088618b913d9b670e49a006162065 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 14:50:46 -0400 Subject: [PATCH 20/37] chore: fix system test webpack path that now includes e2e workspace --- system-tests/test/cy_origin_error_spec.ts | 4 ++-- system-tests/test/stdout_spec.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system-tests/test/cy_origin_error_spec.ts b/system-tests/test/cy_origin_error_spec.ts index 7613a79e0411..ac547e407676 100644 --- a/system-tests/test/cy_origin_error_spec.ts +++ b/system-tests/test/cy_origin_error_spec.ts @@ -43,8 +43,8 @@ describe('e2e cy.origin errors', () => { expect(stdout).to.contain('Timed out retrying after 1ms: Expected to find element: `#doesnotexist`, but never found it.') // check to make sure stack trace contains the 'cy.origin' source - expect(stdout).to.contain('webpack:///./cypress/e2e/cy_origin_error.cy.ts:16:7') - expect(stdout).to.contain('webpack:///./cypress/e2e/cy_origin_error.cy.ts:32:7') + expect(stdout).to.contain('webpack://e2e/./cypress/e2e/cy_origin_error.cy.ts:16:7') + expect(stdout).to.contain('webpack://e2e/./cypress/e2e/cy_origin_error.cy.ts:32:7') }, }) }) diff --git a/system-tests/test/stdout_spec.js b/system-tests/test/stdout_spec.js index 95c513f87ece..20dc3f165f3d 100644 --- a/system-tests/test/stdout_spec.js +++ b/system-tests/test/stdout_spec.js @@ -29,9 +29,9 @@ describe('e2e stdout', () => { expectedExitCode: 3, onStdout: (stdout) => { // assert stack trace line numbers/columns mirror source map - expect(stdout).to.include('Context.eval (webpack:///./cypress/e2e/stdout_failing.cy.js:7:12)') - expect(stdout).to.include('Context.eval (webpack:///./cypress/e2e/stdout_failing.cy.js:15:9)') - expect(stdout).to.include('Context.eval (webpack:///./cypress/e2e/stdout_failing.cy.js:27:9)') + expect(stdout).to.include('Context.eval (webpack://e2e/./cypress/e2e/stdout_failing.cy.js:7:12)') + expect(stdout).to.include('Context.eval (webpack://e2e/./cypress/e2e/stdout_failing.cy.js:15:9)') + expect(stdout).to.include('Context.eval (webpack://e2e/./cypress/e2e/stdout_failing.cy.js:27:9)') }, }) }) From 89e608928b3ee85d26c7934040b0fc77761c357a Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 15:05:50 -0400 Subject: [PATCH 21/37] chore: patch enhanced-resolve to properly discover the pnp api for the yarn_v3.1.1_pnp_spec.ts system test. see https://github.com/webpack/enhanced-resolve/issues/263 for more details --- patches/enhanced-resolve+5.15.0.dev.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 patches/enhanced-resolve+5.15.0.dev.patch diff --git a/patches/enhanced-resolve+5.15.0.dev.patch b/patches/enhanced-resolve+5.15.0.dev.patch new file mode 100644 index 000000000000..a573911b592c --- /dev/null +++ b/patches/enhanced-resolve+5.15.0.dev.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/enhanced-resolve/lib/ResolverFactory.js b/node_modules/enhanced-resolve/lib/ResolverFactory.js +index 037567b..bddd449 100644 +--- a/node_modules/enhanced-resolve/lib/ResolverFactory.js ++++ b/node_modules/enhanced-resolve/lib/ResolverFactory.js +@@ -126,7 +126,7 @@ function processPnpApiOption(option) { + /** @type {NodeJS.ProcessVersions & {pnp: string}} */ versions.pnp + ) { + // @ts-ignore +- return require("pnpapi"); // eslint-disable-line node/no-missing-require ++ require('module').findPnpApi(process.cwd()) // eslint-disable-line node/no-missing-require + } + + return option || null; From 340652512bd7ba8a0cab371d02c8d04e2a386684 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 19:57:14 -0400 Subject: [PATCH 22/37] chore: set stats to 'none' for experimentalSingleTabMode to prevent different webpack compiled terminal formatting in the snapshot between local and CI. --- system-tests/__snapshots__/component_testing_spec.ts.js | 1 - .../projects/experimentalSingleTabRunMode/webpack.config.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system-tests/__snapshots__/component_testing_spec.ts.js b/system-tests/__snapshots__/component_testing_spec.ts.js index 3de8d07c208a..6bfca1291991 100644 --- a/system-tests/__snapshots__/component_testing_spec.ts.js +++ b/system-tests/__snapshots__/component_testing_spec.ts.js @@ -834,7 +834,6 @@ exports['experimentalSingleTabRunMode / executes all specs in a single tab'] = ` ──────────────────────────────────────────────────────────────────────────────────────────────────── Running: 1_fails.cy.js (1 of 4) -webpack compiled successfully simple failing spec diff --git a/system-tests/projects/experimentalSingleTabRunMode/webpack.config.js b/system-tests/projects/experimentalSingleTabRunMode/webpack.config.js index 74edfc0c20e2..19307e1ec1c9 100644 --- a/system-tests/projects/experimentalSingleTabRunMode/webpack.config.js +++ b/system-tests/projects/experimentalSingleTabRunMode/webpack.config.js @@ -1,3 +1,3 @@ module.exports = { - stats: 'errors-warnings', + stats: 'none', } From e62e7dd22687361b677d875afd298cc699c4b804 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 20:33:54 -0400 Subject: [PATCH 23/37] chore: fix node built in tests and configure webpack-batteries-included-preprocessor correctly --- .../index.js | 17 +++++++- .../package.json | 9 +++++ yarn.lock | 39 +++++++++++++++---- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/npm/webpack-batteries-included-preprocessor/index.js b/npm/webpack-batteries-included-preprocessor/index.js index fbe8d41edd12..587e523b1e30 100644 --- a/npm/webpack-batteries-included-preprocessor/index.js +++ b/npm/webpack-batteries-included-preprocessor/index.js @@ -1,4 +1,5 @@ const path = require('path') +const webpack = require('webpack') const webpackPreprocessor = require('@cypress/webpack-preprocessor') const hasTsLoader = (rules) => { @@ -131,9 +132,17 @@ const getDefaultWebpackOptions = () => { loader: require.resolve('coffee-loader'), }], }, + plugins: [ + new webpack.ProvidePlugin({ + Buffer: ['buffer', 'Buffer'], + process: 'process/browser', + }), + ], resolve: { extensions: ['.js', '.json', '.jsx', '.mjs', '.coffee'], fallback: { + assert: require.resolve('assert/'), + buffer: require.resolve('buffer/'), child_process: false, cluster: false, console: false, @@ -142,6 +151,7 @@ const getDefaultWebpackOptions = () => { dgram: false, dns: false, domain: require.resolve('domain-browser'), + events: require.resolve('events/'), fs: false, http: require.resolve('stream-http'), https: require.resolve('https-browserify'), @@ -150,16 +160,21 @@ const getDefaultWebpackOptions = () => { module: false, net: false, os: require.resolve('os-browserify/browser'), - perf_hooks: false, path: require.resolve('path-browserify'), + perf_hooks: false, + punycode: require.resolve('punycode/'), + process: require.resolve('process/browser'), + querystring: require.resolve('querystring-es3'), readline: false, repl: false, stream: require.resolve('stream-browserify'), + string_decoder: require.resolve('string_decoder/'), sys: require.resolve('util/'), timers: require.resolve('timers-browserify'), tls: false, tty: require.resolve('tty-browserify'), url: require.resolve('url/'), + util: require.resolve('util/'), vm: require.resolve('vm-browserify'), zlib: require.resolve('browserify-zlib'), }, diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index 58a8cca1c5b5..db95fb0b0083 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -15,22 +15,31 @@ "@babel/preset-env": "^7.11.0", "@babel/preset-react": "^7.10.4", "@babel/runtime": "^7.11.2", + "assert": "^2.0.0", "babel-loader": "^8.3.0", "babel-plugin-add-module-exports": "^1.0.2", "browserify-zlib": "^0.2.0", + "buffer": "^6.0.3", "coffee-loader": "^1.0.1", "coffeescript": "^1.12.7", "constants-browserify": "^1.0.0", "crypto-browserify": "^3.12.0", "domain-browser": "^4.22.0", + "events": "^3.3.0", "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.1", "pnp-webpack-plugin": "^1.7.0", + "process": "^0.11.10", + "punycode": "^2.3.0", + "querystring-es3": "^0.2.1", "stream-http": "^3.2.0", "timers-browserify": "^2.0.12", "ts-loader": "8.4.0", "tsconfig-package": "npm:tsconfig@^7.0.0", "tsconfig-paths-webpack-plugin": "^3.5.2", "tty-browserify": "^0.0.1", + "url": "^0.11.1", "util": "^0.12.5", "vm-browserify": "^1.1.2", "webpack": "^5.88.2" diff --git a/yarn.lock b/yarn.lock index 2db3367ceebc..44a94c70379e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9132,6 +9132,16 @@ assert@^1.1.1: dependencies: util "0.10.3" +assert@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32" + integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A== + dependencies: + es6-object-assign "^1.1.0" + is-nan "^1.2.1" + object-is "^1.0.1" + util "^0.12.0" + assertion-error@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b" @@ -10184,7 +10194,7 @@ buffer@4.9.2, buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@6.0.3: +buffer@6.0.3, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -13934,6 +13944,11 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw== + es6-promise@^3.0.2: version "3.3.1" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613" @@ -14543,7 +14558,7 @@ events@1.1.1: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= -events@^3.0.0, events@^3.2.0: +events@^3.0.0, events@^3.2.0, events@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== @@ -18229,6 +18244,14 @@ is-my-ip-valid@^1.0.0: resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ== +is-nan@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" + integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -22692,7 +22715,7 @@ object-inspect@^1.11.0, object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-is@^1.1.2, object-is@^1.1.5: +object-is@^1.0.1, object-is@^1.1.2, object-is@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -23579,7 +23602,7 @@ path-browserify@0.0.1: resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== -path-browserify@1.0.1: +path-browserify@1.0.1, path-browserify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== @@ -24597,7 +24620,7 @@ punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== @@ -24666,7 +24689,7 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -querystring-es3@^0.2.0: +querystring-es3@^0.2.0, querystring-es3@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= @@ -29676,7 +29699,7 @@ url@0.10.3: punycode "1.3.2" querystring "0.2.0" -url@0.11.1, url@^0.11.0: +url@0.11.1, url@^0.11.0, url@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32" integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA== @@ -29748,7 +29771,7 @@ util@0.10.3: dependencies: inherits "2.0.1" -"util@>=0.10.3 <1", util@^0.12.5: +"util@>=0.10.3 <1", util@^0.12.0, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== From 044598785fc5196a57b6ee1a7407c677fff60b58 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 11:30:45 -0400 Subject: [PATCH 24/37] chore: fallback to buffer correctly in config, even though there is no impact due to the provide plugin --- packages/web-config/webpack.config.base.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index b323a4d9cdfd..d887aba15627 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -121,7 +121,7 @@ export const getCommonConfig = () => { extensions: ['.ts', '.js', '.jsx', '.tsx', '.scss', '.json'], // see https://gist.github.com/ef4/d2cf5672a93cf241fd47c020b9b3066a for polyfill migration details fallback: { - Buffer: require.resolve('buffer/'), + buffer: require.resolve('buffer/'), child_process: false, fs: false, module: false, @@ -251,7 +251,7 @@ export const getSimpleConfig = () => ({ extensions: ['.js', '.ts', '.json'], // see https://gist.github.com/ef4/d2cf5672a93cf241fd47c020b9b3066a for polyfill migration details fallback: { - Buffer: require.resolve('buffer/'), + buffer: require.resolve('buffer/'), child_process: false, fs: false, module: false, From e05801a483149c99d8ce550902b3efce1830efc5 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 31 Jul 2023 20:47:27 -0500 Subject: [PATCH 25/37] Update binary-cleanup.js to exclude added build dependencies for webpack 5 added by webpack-terser-plugin under the hood --- scripts/binary/binary-cleanup.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/binary/binary-cleanup.js b/scripts/binary/binary-cleanup.js index ce71360a3735..57d8b0958268 100644 --- a/scripts/binary/binary-cleanup.js +++ b/scripts/binary/binary-cleanup.js @@ -87,6 +87,9 @@ const getDependencyPathsToKeep = async (buildAppDir) => { '@swc/core', 'emitter', 'ts-loader', + 'uglify-js', + 'esbuild', + 'enhanced-resolve/lib/createInnerCallback', '@babel/preset-typescript/package.json', './addon/addon-native', ], From 2e39e37953123d8022e89fabca17ba988d66b50c Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Mon, 31 Jul 2023 22:22:40 -0400 Subject: [PATCH 26/37] chore: add stream-browserify to webpack preprocessor batteries included as a dep as its used in the config [run ci] --- npm/webpack-batteries-included-preprocessor/package.json | 1 + yarn.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json index db95fb0b0083..3b1743fbe631 100644 --- a/npm/webpack-batteries-included-preprocessor/package.json +++ b/npm/webpack-batteries-included-preprocessor/package.json @@ -33,6 +33,7 @@ "process": "^0.11.10", "punycode": "^2.3.0", "querystring-es3": "^0.2.1", + "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "timers-browserify": "^2.0.12", "ts-loader": "8.4.0", diff --git a/yarn.lock b/yarn.lock index 44a94c70379e..69cbc891df41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27621,7 +27621,7 @@ stop-only@3.0.1: execa "0.11.0" minimist "1.2.0" -stream-browserify@3.0.0: +stream-browserify@3.0.0, stream-browserify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== From 8ad79594476699c568fd711d00cd6624abdc9726 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 11:01:48 -0400 Subject: [PATCH 27/37] chore: make sure process and buffer are installed in the CLI for webpack provide --- cli/package.json | 1 + cli/test/lib/tasks/dependency_spec.js | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 cli/test/lib/tasks/dependency_spec.js diff --git a/cli/package.json b/cli/package.json index 595f607a4c53..599a71f81ddb 100644 --- a/cli/package.json +++ b/cli/package.json @@ -55,6 +55,7 @@ "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "semver": "^7.5.3", diff --git a/cli/test/lib/tasks/dependency_spec.js b/cli/test/lib/tasks/dependency_spec.js new file mode 100644 index 000000000000..49d00ad99f57 --- /dev/null +++ b/cli/test/lib/tasks/dependency_spec.js @@ -0,0 +1,26 @@ +/** + * as of Webpack 5, dependencies that are polyfilled through the Provide plugin must be defined inside the CLI + * in order to guarantee there is a version of the dependency accessible by the cypress CLI, either in the cypress directory + * or the root of their project. Currently, these two dependencies are 'buffer' and 'process' + */ +describe('dependencies', () => { + it('process dependency exists in package.json and is available', () => { + const { dependencies } = require('../../../package.json') + + expect(dependencies.process).to.be.ok + + const process = require('process') + + expect(typeof process).to.equal('object') + }) + + it('buffer dependency exists in package.json and is available', () => { + const { dependencies } = require('../../../package.json') + + expect(dependencies.buffer).to.be.ok + + const buffer = require('buffer') + + expect(typeof buffer).to.equal('object') + }) +}) From d8ccfc8f740e45e9f7f195db62cde43076c43bd1 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 11:33:54 -0400 Subject: [PATCH 28/37] chore: build cross platform binaries [run ci] --- .circleci/workflows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 6435ecb9bf3b..113e82b2a2c2 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -31,7 +31,7 @@ mainBuildFilters: &mainBuildFilters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - 'chore/update_webpack_deps_to_latest_webpack4_compat' - - 'chore/use_cloud_m1_runners' + - 'chore/update_to_webpack5_minimum_lift' - 'publish-binary' # usually we don't build Mac app - it takes a long time @@ -44,7 +44,7 @@ macWorkflowFilters: &darwin-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - - equal: [ 'chore/use_cloud_m1_runners', << pipeline.git.branch >> ] + - equal: [ 'chore/update_to_webpack5_minimum_lift', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -56,7 +56,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - - equal: [ 'chore/use_cloud_m1_runners', << pipeline.git.branch >> ] + - equal: [ 'chore/update_to_webpack5_minimum_lift', << pipeline.git.branch >> ] - equal: [ 'publish-binary', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ @@ -78,7 +78,7 @@ windowsWorkflowFilters: &windows-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - - equal: [ 'chore/use_cloud_m1_runners', << pipeline.git.branch >> ] + - equal: [ 'chore/update_to_webpack5_minimum_lift', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -148,7 +148,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "chore/update_webpack_deps_to_latest_webpack4_compat" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "chore/update_to_webpack5_minimum_lift" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command From 50dbba232888e6a1ee2817e00af0ea83e297a7bc Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 17:07:56 -0400 Subject: [PATCH 29/37] chore: fix webpack evalDevToolPlugin instantiation [run ci] --- packages/web-config/webpack.config.base.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index d887aba15627..076588804911 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -222,11 +222,12 @@ export const getCommonConfig = () => { // moduleFilenameTemplate: 'cypress://[namespace]/[resource-path]', // fallbackModuleFilenameTemplate: 'cypress://[namespace]/[resourcePath]?[hash]' // })] : - - (env === 'production' - ? new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }) - : evalDevToolPlugin - ), + ...[ + (env === 'production' + ? new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }) + : evalDevToolPlugin + ), + ], // Cypress needs access globally to the buffer and process objects. // These were polyfilled by webpack in v4 and no longer are in v5. // To work around this, we provide the process and buffer and globals into the webpack bundle. From 14118a288f89cb441f1f0321412acc2f2f1fe8af Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 1 Aug 2023 17:27:09 -0400 Subject: [PATCH 30/37] run all binary jobs [run ci] From cb5fb4e2bba64851de9bb3bbc086e18dc12f83d1 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 21:16:13 +0000 Subject: [PATCH 31/37] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/linux/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 183f33cfa4c9..b4a9e0a0519e 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -4272,5 +4272,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "fd8f13401f7ee49a0913c70200fbed19570423d545bc2ea4a0a398f16e25d314" + "deferredHash": "e94dd455aac4e3578c69ccaf117dbbf39cfb90a08c18cb342d571b231ba92a4d" } \ No newline at end of file From 3f0a2d50e4dfc8e075c074dcbd80cc22440f8a21 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 4 Aug 2023 16:54:08 -0500 Subject: [PATCH 32/37] add find-up to the entry points that need to be kept --- scripts/binary/binary-cleanup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/binary/binary-cleanup.js b/scripts/binary/binary-cleanup.js index 57d8b0958268..da2894b85ecd 100644 --- a/scripts/binary/binary-cleanup.js +++ b/scripts/binary/binary-cleanup.js @@ -44,6 +44,7 @@ const getDependencyPathsToKeep = async (buildAppDir) => { 'packages/server/node_modules/ts-loader/index.js', 'packages/rewriter/lib/threads/worker.js', 'npm/webpack-batteries-included-preprocessor/index.js', + 'node_modules/find-up/index.js', 'node_modules/webpack/lib/webpack.js', 'node_modules/webpack-dev-server/lib/Server.js', 'node_modules/html-webpack-plugin-4/index.js', From ef87f976b30b43d6398ceedb4c040d01fc34a5aa Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 23:07:11 +0000 Subject: [PATCH 33/37] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/darwin/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 43eab8590f72..30f37044084a 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -4273,5 +4273,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "fd8f13401f7ee49a0913c70200fbed19570423d545bc2ea4a0a398f16e25d314" + "deferredHash": "e94dd455aac4e3578c69ccaf117dbbf39cfb90a08c18cb342d571b231ba92a4d" } \ No newline at end of file From 77d81c233887a9fd0757a1266142409c2480e6e8 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Sat, 5 Aug 2023 00:58:56 +0000 Subject: [PATCH 34/37] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 922c443a5fb1..628b82bd05d3 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -157,8 +157,6 @@ "./node_modules/@cypress/commit-info/node_modules/semver/semver.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/browser.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/index.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/request-promise/lib/rp.js", "./node_modules/@cypress/request/index.js", "./node_modules/@cypress/request/lib/helpers.js", @@ -4272,5 +4270,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "dea89fb13851e92811e518fa079535c28d176ca41f9240746499dc1fb538abd7" + "deferredHash": "27a22ed8888376dc0359131b664b2fd96d476f2217a2e78900121050493e200b" } \ No newline at end of file From a50ebdca30e7137644c57cea372538e3657e56b5 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Wed, 2 Aug 2023 07:58:42 -0400 Subject: [PATCH 35/37] chore: fix mocha build warnings --- packages/web-config/webpack.config.base.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index 076588804911..e297c613fb19 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -53,7 +53,9 @@ const stats = { timings: true, } -const ignoreWarnings = [/node_modules\/mocha\/lib\/mocha.js/] +const ignoreWarnings = [{ + module: /node_modules\/mocha\/lib\/mocha.js/, +}] function makeSassLoaders ({ modules }: { modules: boolean }) { const exclude = [/node_modules/] From dd78d50d30c2d01bbf5c9a6ae09e0a70233e235a Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Wed, 2 Aug 2023 08:02:01 -0400 Subject: [PATCH 36/37] chore: fix STRIPPED_INTEGRITY_TAG import warnings --- packages/runner/injection/patches/setAttribute.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/runner/injection/patches/setAttribute.ts b/packages/runner/injection/patches/setAttribute.ts index c249f6ed6487..3e6deb0832f0 100644 --- a/packages/runner/injection/patches/setAttribute.ts +++ b/packages/runner/injection/patches/setAttribute.ts @@ -1,11 +1,11 @@ -import { STRIPPED_INTEGRITY_TAG } from '@packages/rewriter/lib/constants.json' +import constants from '@packages/rewriter/lib/constants.json' export const patchElementIntegrity = (window: Window) => { const originalFormElementSetAttribute = window.HTMLScriptElement.prototype.setAttribute window.HTMLScriptElement.prototype.setAttribute = function (qualifiedName, value) { if (qualifiedName === 'integrity') { - qualifiedName = STRIPPED_INTEGRITY_TAG + qualifiedName = constants.STRIPPED_INTEGRITY_TAG } return originalFormElementSetAttribute.apply(this, [qualifiedName, value]) @@ -15,7 +15,7 @@ export const patchElementIntegrity = (window: Window) => { window.HTMLLinkElement.prototype.setAttribute = function (qualifiedName, value) { if (qualifiedName === 'integrity') { - qualifiedName = STRIPPED_INTEGRITY_TAG + qualifiedName = constants.STRIPPED_INTEGRITY_TAG } return originalAnchorElementSetAttribute.apply(this, [qualifiedName, value]) From 721d6a5ffca0e30d21863f27fb1e50f60214fc63 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Sun, 6 Aug 2023 20:14:48 -0400 Subject: [PATCH 37/37] chore: add changelog event --- cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index af0658c5a46b..b1868bc6ce7c 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -7,6 +7,10 @@ _Released 08/15/2023 (PENDING)_ - Fixed an issue where having `cypress.config` in a nested directory would cause problems with locating the `component-index.html` file when using component testing. Fixes [#26400](https://github.com/cypress-io/cypress/issues/26400). +**Dependency Updates:** + +- Upgraded [`webpack`](https://www.npmjs.com/package/webpack) from `v4` to `v5`. This means that we are now bundling your `e2e` tests with webpack 5. We don't anticipate this causing any noticeable changes. However, if you'd like to keep bundling your `e2e` tests with wepback 4 you can use the same process as before by pinning [@cypress/webpack-batteries-included-preprocessor](https://www.npmjs.com/package/@cypress/webpack-batteries-included-preprocessor) to `v2.x.x` and hooking into the [file:preprocessor](https://docs.cypress.io/api/plugins/preprocessors-api#Usage) plugin event. This will restore the previous bundling process. Additionally, if you're using [@cypress/webpack-batteries-included-preprocessor](https://www.npmjs.com/package/@cypress/webpack-batteries-included-preprocessor) already, a new version has been published to support webpack `v5`. + ## 12.17.3 _Released 08/01/2023_