diff --git a/packages/app-admin-ui/package.json b/packages/app-admin-ui/package.json index 6688701b0d..39a31e894e 100644 --- a/packages/app-admin-ui/package.json +++ b/packages/app-admin-ui/package.json @@ -57,7 +57,7 @@ "falsey": "^1.0.0", "file-loader": "^6.2.0", "graphql": "^16.10.0", - "html-webpack-plugin": "^4.5.2", + "html-webpack-plugin": "^5.6.3", "lodash.debounce": "^4.0.8", "lodash.set": "^4.3.2", "lodash.throttle": "^4.1.1", diff --git a/packages/app-admin-ui/server/getWebpackConfig.js b/packages/app-admin-ui/server/getWebpackConfig.js index 1420944c6b..de907e412b 100644 --- a/packages/app-admin-ui/server/getWebpackConfig.js +++ b/packages/app-admin-ui/server/getWebpackConfig.js @@ -65,7 +65,7 @@ module.exports = function ({ adminMeta, adminViews, entry, outputPath }) { mode === 'production' ? entryPath : [entryPath, 'webpack-hot-middleware/client?reload=true'], output: { path: outputPath, - filename: 'js/[name].[hash].bundle.js', + filename: 'js/[name].[fullhash].bundle.js', publicPath: adminMeta.adminPath + '/', }, // TODO: We should pay attention to our bundle size at some point, but diff --git a/tests/test-projects/access-control/multi-reporter-config.json b/tests/test-projects/access-control/multi-reporter-config.json index 5897266cfd..351679fe7b 100644 --- a/tests/test-projects/access-control/multi-reporter-config.json +++ b/tests/test-projects/access-control/multi-reporter-config.json @@ -1,6 +1,6 @@ { "reporterEnabled": "dot,mocha-junit-reporter", "mochaJunitReporterReporterOptions": { - "mochaFile": "cypress/reports/report-[hash].xml" + "mochaFile": "cypress/reports/report-[fullhash].xml" } } diff --git a/tests/test-projects/basic/multi-reporter-config.json b/tests/test-projects/basic/multi-reporter-config.json index 5897266cfd..351679fe7b 100644 --- a/tests/test-projects/basic/multi-reporter-config.json +++ b/tests/test-projects/basic/multi-reporter-config.json @@ -1,6 +1,6 @@ { "reporterEnabled": "dot,mocha-junit-reporter", "mochaJunitReporterReporterOptions": { - "mochaFile": "cypress/reports/report-[hash].xml" + "mochaFile": "cypress/reports/report-[fullhash].xml" } } diff --git a/tests/test-projects/client-validation/multi-reporter-config.json b/tests/test-projects/client-validation/multi-reporter-config.json index 5897266cfd..351679fe7b 100644 --- a/tests/test-projects/client-validation/multi-reporter-config.json +++ b/tests/test-projects/client-validation/multi-reporter-config.json @@ -1,6 +1,6 @@ { "reporterEnabled": "dot,mocha-junit-reporter", "mochaJunitReporterReporterOptions": { - "mochaFile": "cypress/reports/report-[hash].xml" + "mochaFile": "cypress/reports/report-[fullhash].xml" } } diff --git a/tests/test-projects/login/multi-reporter-config.json b/tests/test-projects/login/multi-reporter-config.json index 5897266cfd..351679fe7b 100644 --- a/tests/test-projects/login/multi-reporter-config.json +++ b/tests/test-projects/login/multi-reporter-config.json @@ -1,6 +1,6 @@ { "reporterEnabled": "dot,mocha-junit-reporter", "mochaJunitReporterReporterOptions": { - "mochaFile": "cypress/reports/report-[hash].xml" + "mochaFile": "cypress/reports/report-[fullhash].xml" } } diff --git a/yarn.lock b/yarn.lock index a61da39c02..db7ad03e07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5966,7 +5966,7 @@ __metadata: falsey: ^1.0.0 file-loader: ^6.2.0 graphql: ^16.10.0 - html-webpack-plugin: ^4.5.2 + html-webpack-plugin: ^5.6.3 lodash.debounce: ^4.0.8 lodash.set: ^4.3.2 lodash.throttle: ^4.1.1 @@ -8045,6 +8045,13 @@ __metadata: languageName: node linkType: hard +"@types/html-minifier-terser@npm:^6.0.0": + version: 6.1.0 + resolution: "@types/html-minifier-terser@npm:6.1.0" + checksum: eb843f6a8d662d44fb18ec61041117734c6aae77aa38df1be3b4712e8e50ffaa35f1e1c92fdd0fde14a5675fecf457abcd0d15a01fae7506c91926176967f452 + languageName: node + linkType: hard + "@types/http-cache-semantics@npm:*": version: 4.0.4 resolution: "@types/http-cache-semantics@npm:4.0.4" @@ -12705,7 +12712,7 @@ __metadata: languageName: node linkType: hard -"clean-css@npm:~5.3.2": +"clean-css@npm:^5.2.2, clean-css@npm:~5.3.2": version: 5.3.3 resolution: "clean-css@npm:5.3.3" dependencies: @@ -13235,7 +13242,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^8.0.0": +"commander@npm:^8.0.0, commander@npm:^8.3.0": version: 8.3.0 resolution: "commander@npm:8.3.0" checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 @@ -20695,6 +20702,23 @@ __metadata: languageName: node linkType: hard +"html-minifier-terser@npm:^6.0.2": + version: 6.1.0 + resolution: "html-minifier-terser@npm:6.1.0" + dependencies: + camel-case: ^4.1.2 + clean-css: ^5.2.2 + commander: ^8.3.0 + he: ^1.2.0 + param-case: ^3.0.4 + relateurl: ^0.2.7 + terser: ^5.10.0 + bin: + html-minifier-terser: cli.js + checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93 + languageName: node + linkType: hard + "html-minifier-terser@npm:^7.2.0": version: 7.2.0 resolution: "html-minifier-terser@npm:7.2.0" @@ -20764,7 +20788,7 @@ __metadata: languageName: node linkType: hard -"html-webpack-plugin@npm:^4.5.1, html-webpack-plugin@npm:^4.5.2": +"html-webpack-plugin@npm:^4.5.1": version: 4.5.2 resolution: "html-webpack-plugin@npm:4.5.2" dependencies: @@ -20783,6 +20807,27 @@ __metadata: languageName: node linkType: hard +"html-webpack-plugin@npm:^5.6.3": + version: 5.6.3 + resolution: "html-webpack-plugin@npm:5.6.3" + dependencies: + "@types/html-minifier-terser": ^6.0.0 + html-minifier-terser: ^6.0.2 + lodash: ^4.17.21 + pretty-error: ^4.0.0 + tapable: ^2.0.0 + peerDependencies: + "@rspack/core": 0.x || 1.x + webpack: ^5.20.0 + peerDependenciesMeta: + "@rspack/core": + optional: true + webpack: + optional: true + checksum: 59e7d971b0cfd9ba34c7acaa3c161e43c62596474dd8cd35d7b690498ff5891f21296de0aa1d2e7810348caa657e938461267155dda47913b5eeca7124406270 + languageName: node + linkType: hard + "htmlparser2@npm:^3.9.1, htmlparser2@npm:^3.9.2": version: 3.10.1 resolution: "htmlparser2@npm:3.10.1" @@ -31043,6 +31088,16 @@ __metadata: languageName: node linkType: hard +"pretty-error@npm:^4.0.0": + version: 4.0.0 + resolution: "pretty-error@npm:4.0.0" + dependencies: + lodash: ^4.17.20 + renderkid: ^3.0.0 + checksum: a5b9137365690104ded6947dca2e33360bf55e62a4acd91b1b0d7baa3970e43754c628cc9e16eafbdd4e8f8bcb260a5865475d4fc17c3106ff2d61db4e72cdf3 + languageName: node + linkType: hard + "pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0": version: 29.7.0 resolution: "pretty-format@npm:29.7.0" @@ -33255,6 +33310,19 @@ __metadata: languageName: node linkType: hard +"renderkid@npm:^3.0.0": + version: 3.0.0 + resolution: "renderkid@npm:3.0.0" + dependencies: + css-select: ^4.1.3 + dom-converter: ^0.2.0 + htmlparser2: ^6.1.0 + lodash: ^4.17.21 + strip-ansi: ^6.0.1 + checksum: 77162b62d6f33ab81f337c39efce0439ff0d1f6d441e29c35183151f83041c7850774fb904da163d6c844264d440d10557714e6daa0b19e4561a5cd4ef305d41 + languageName: node + linkType: hard + "repeat-element@npm:^1.1.2": version: 1.1.4 resolution: "repeat-element@npm:1.1.4" @@ -36301,7 +36369,7 @@ __metadata: languageName: node linkType: hard -"tapable@npm:^2.1.1, tapable@npm:^2.2.0": +"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0": version: 2.2.2 resolution: "tapable@npm:2.2.2" checksum: 781b3666f4454eb506fd2bcd985c1994f2b93884ea88a7a2a5be956cad8337b31128a7591e771f7aab8e247993b2a0887d360a2d4f54382902ed89994c102740 @@ -36572,6 +36640,20 @@ __metadata: languageName: node linkType: hard +"terser@npm:^5.10.0": + version: 5.43.1 + resolution: "terser@npm:5.43.1" + dependencies: + "@jridgewell/source-map": ^0.3.3 + acorn: ^8.14.0 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: 1d51747f4540a0842139c2f2617e88d68a26da42d7571cda8955e1bd8febac6e60bc514c258781334e1724aeeccfbd511473eb9d8d831435e4e5fad1ce7f6e8b + languageName: node + linkType: hard + "terser@npm:^5.15.1, terser@npm:^5.16.8, terser@npm:^5.3.4": version: 5.39.0 resolution: "terser@npm:5.39.0"