diff --git a/build-tests/hashed-folder-copy-plugin-test/build.js b/build-tests/hashed-folder-copy-plugin-test/build.js deleted file mode 100644 index eef1c23c1a7..00000000000 --- a/build-tests/hashed-folder-copy-plugin-test/build.js +++ /dev/null @@ -1,21 +0,0 @@ -const { FileSystem } = require('@rushstack/node-core-library'); -const child_process = require('child_process'); -const path = require('path'); -const process = require('process'); - -function executeCommand(command) { - console.log('---> ' + command); - child_process.execSync(command, { stdio: 'inherit' }); -} - -// Clean the old build outputs -console.log(`==> Starting build.js for ${path.basename(process.cwd())}`); -FileSystem.ensureEmptyFolder('dist-dev'); -FileSystem.ensureEmptyFolder('dist-prod'); -FileSystem.ensureEmptyFolder('lib'); -FileSystem.ensureEmptyFolder('temp'); - -// Run Webpack -executeCommand('node node_modules/webpack-cli/bin/cli'); - -console.log(`==> Finished build.js for ${path.basename(process.cwd())}`); diff --git a/build-tests/hashed-folder-copy-plugin-test/serve.js b/build-tests/hashed-folder-copy-plugin-test/serve.js deleted file mode 100644 index ffa5c333f00..00000000000 --- a/build-tests/hashed-folder-copy-plugin-test/serve.js +++ /dev/null @@ -1,18 +0,0 @@ -const { FileSystem } = require('@rushstack/node-core-library'); -const child_process = require('child_process'); -const path = require('path'); -const process = require('process'); - -function executeCommand(command) { - console.log('---> ' + command); - child_process.execSync(command, { stdio: 'inherit' }); -} - -// Clean the old build outputs -console.log(`==> Starting build.js for ${path.basename(process.cwd())}`); -FileSystem.ensureEmptyFolder('dist'); -FileSystem.ensureEmptyFolder('lib'); -FileSystem.ensureEmptyFolder('temp'); - -// Run Webpack -executeCommand('node node_modules/webpack-dev-server/bin/webpack-dev-server'); diff --git a/build-tests/hashed-folder-copy-plugin-test/.gitignore b/build-tests/hashed-folder-copy-plugin-webpack4-test/.gitignore similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/.gitignore rename to build-tests/hashed-folder-copy-plugin-webpack4-test/.gitignore diff --git a/build-tests/hashed-folder-copy-plugin-test/assets/blue.png b/build-tests/hashed-folder-copy-plugin-webpack4-test/assets/blue.png similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/assets/blue.png rename to build-tests/hashed-folder-copy-plugin-webpack4-test/assets/blue.png diff --git a/build-tests/hashed-folder-copy-plugin-test/assets/green.png b/build-tests/hashed-folder-copy-plugin-webpack4-test/assets/green.png similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/assets/green.png rename to build-tests/hashed-folder-copy-plugin-webpack4-test/assets/green.png diff --git a/build-tests/hashed-folder-copy-plugin-test/assets/red.png b/build-tests/hashed-folder-copy-plugin-webpack4-test/assets/red.png similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/assets/red.png rename to build-tests/hashed-folder-copy-plugin-webpack4-test/assets/red.png diff --git a/build-tests/hashed-folder-copy-plugin-webpack4-test/config/heft.json b/build-tests/hashed-folder-copy-plugin-webpack4-test/config/heft.json new file mode 100644 index 00000000000..383dde20f99 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack4-test/config/heft.json @@ -0,0 +1,51 @@ +/** + * Defines configuration used by core Heft. + */ +{ + "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", + + "eventActions": [ + { + /** + * The kind of built-in operation that should be performed. + * The "deleteGlobs" action deletes files or folders that match the + * specified glob patterns. + */ + "actionKind": "deleteGlobs", + + /** + * The stage of the Heft run during which this action should occur. Note that actions specified in heft.json + * occur at the end of the stage of the Heft run. + */ + "heftEvent": "clean", + + /** + * A user-defined tag whose purpose is to allow configs to replace/delete handlers that were added by other + * configs. + */ + "actionId": "defaultClean", + + /** + * Glob patterns to be deleted. The paths are resolved relative to the project folder. + */ + "globsToDelete": ["lib", "dist-dev", "dist-prod"] + } + ], + + /** + * The list of Heft plugins to be loaded. + */ + "heftPlugins": [ + { + /** + * The path to the plugin package. + */ + "plugin": "@rushstack/heft-webpack4-plugin" + + /** + * An optional object that provides additional settings that may be defined by the plugin. + */ + // "options": { } + } + ] +} diff --git a/build-tests/hashed-folder-copy-plugin-test/config/rush-project.json b/build-tests/hashed-folder-copy-plugin-webpack4-test/config/rush-project.json similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/config/rush-project.json rename to build-tests/hashed-folder-copy-plugin-webpack4-test/config/rush-project.json diff --git a/build-tests/hashed-folder-copy-plugin-test/package.json b/build-tests/hashed-folder-copy-plugin-webpack4-test/package.json similarity index 56% rename from build-tests/hashed-folder-copy-plugin-test/package.json rename to build-tests/hashed-folder-copy-plugin-webpack4-test/package.json index c4c08ac7836..b1aea4718d9 100644 --- a/build-tests/hashed-folder-copy-plugin-test/package.json +++ b/build-tests/hashed-folder-copy-plugin-webpack4-test/package.json @@ -1,25 +1,23 @@ { - "name": "hashed-folder-copy-plugin-test", - "description": "Building this project exercises @rushstack/hashed-folder-copy-plugin.", + "name": "hashed-folder-copy-plugin-webpack4-test", + "description": "Building this project exercises @rushstack/hashed-folder-copy-plugin with Webpack 4.", "version": "0.0.0", "private": true, "scripts": { - "build": "node build.js", - "serve": "node serve.js", - "_phase:build": "node build.js" + "build": "heft build --clean", + "serve": "heft start --clean", + "_phase:build": "heft build --clean" }, - "dependencies": { + "devDependencies": { "@rushstack/hashed-folder-copy-plugin": "workspace:*", + "@rushstack/heft-webpack4-plugin": "workspace:*", + "@rushstack/heft": "workspace:*", "@rushstack/module-minifier-plugin": "workspace:*", - "@rushstack/node-core-library": "workspace:*", "@rushstack/set-webpack-public-path-plugin": "workspace:*", "@types/webpack-env": "1.13.0", "html-webpack-plugin": "~4.5.2", - "ts-loader": "6.0.0", "typescript": "~4.6.3", - "webpack": "~4.44.2", "webpack-bundle-analyzer": "~4.5.0", - "webpack-cli": "~3.3.2", - "webpack-dev-server": "~3.11.0" + "webpack": "~4.44.2" } } diff --git a/build-tests/hashed-folder-copy-plugin-test/src/index.ts b/build-tests/hashed-folder-copy-plugin-webpack4-test/src/index.ts similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/src/index.ts rename to build-tests/hashed-folder-copy-plugin-webpack4-test/src/index.ts diff --git a/build-tests/hashed-folder-copy-plugin-test/src/submodule.ts b/build-tests/hashed-folder-copy-plugin-webpack4-test/src/submodule.ts similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/src/submodule.ts rename to build-tests/hashed-folder-copy-plugin-webpack4-test/src/submodule.ts diff --git a/build-tests/hashed-folder-copy-plugin-test/tsconfig.json b/build-tests/hashed-folder-copy-plugin-webpack4-test/tsconfig.json similarity index 100% rename from build-tests/hashed-folder-copy-plugin-test/tsconfig.json rename to build-tests/hashed-folder-copy-plugin-webpack4-test/tsconfig.json diff --git a/build-tests/hashed-folder-copy-plugin-test/webpack.config.js b/build-tests/hashed-folder-copy-plugin-webpack4-test/webpack.config.js similarity index 76% rename from build-tests/hashed-folder-copy-plugin-test/webpack.config.js rename to build-tests/hashed-folder-copy-plugin-webpack4-test/webpack.config.js index 5fd9b5aae25..0e769c165c3 100644 --- a/build-tests/hashed-folder-copy-plugin-test/webpack.config.js +++ b/build-tests/hashed-folder-copy-plugin-webpack4-test/webpack.config.js @@ -12,25 +12,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); function generateConfiguration(mode, outputFolderName) { return { mode: mode, - module: { - rules: [ - { - test: /\.tsx?$/, - loader: require.resolve('ts-loader'), - exclude: /(node_modules)/, - options: { - compiler: require.resolve('typescript'), - logLevel: 'ERROR', - configFile: path.resolve(__dirname, 'tsconfig.json') - } - } - ] - }, - resolve: { - extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'] - }, entry: { - test: path.join(__dirname, 'src', 'index.ts') + test: path.join(__dirname, 'lib', 'index.js') }, output: { path: path.join(__dirname, outputFolderName), diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/.gitignore b/build-tests/hashed-folder-copy-plugin-webpack5-test/.gitignore new file mode 100644 index 00000000000..84b7166ac70 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/.gitignore @@ -0,0 +1 @@ +dist-* \ No newline at end of file diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/blue.png b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/blue.png new file mode 100644 index 00000000000..d9119489cb1 Binary files /dev/null and b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/blue.png differ diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/green.png b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/green.png new file mode 100644 index 00000000000..8ba4f25579b Binary files /dev/null and b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/green.png differ diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/red.png b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/red.png new file mode 100644 index 00000000000..b4e46a0538a Binary files /dev/null and b/build-tests/hashed-folder-copy-plugin-webpack5-test/assets/red.png differ diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/config/heft.json b/build-tests/hashed-folder-copy-plugin-webpack5-test/config/heft.json new file mode 100644 index 00000000000..d429c9f93ba --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/config/heft.json @@ -0,0 +1,51 @@ +/** + * Defines configuration used by core Heft. + */ +{ + "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", + + "eventActions": [ + { + /** + * The kind of built-in operation that should be performed. + * The "deleteGlobs" action deletes files or folders that match the + * specified glob patterns. + */ + "actionKind": "deleteGlobs", + + /** + * The stage of the Heft run during which this action should occur. Note that actions specified in heft.json + * occur at the end of the stage of the Heft run. + */ + "heftEvent": "clean", + + /** + * A user-defined tag whose purpose is to allow configs to replace/delete handlers that were added by other + * configs. + */ + "actionId": "defaultClean", + + /** + * Glob patterns to be deleted. The paths are resolved relative to the project folder. + */ + "globsToDelete": ["lib", "dist-dev", "dist-prod"] + } + ], + + /** + * The list of Heft plugins to be loaded. + */ + "heftPlugins": [ + { + /** + * The path to the plugin package. + */ + "plugin": "@rushstack/heft-webpack5-plugin" + + /** + * An optional object that provides additional settings that may be defined by the plugin. + */ + // "options": { } + } + ] +} diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/config/rush-project.json b/build-tests/hashed-folder-copy-plugin-webpack5-test/config/rush-project.json new file mode 100644 index 00000000000..c861eda9bd6 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist-dev", "dist-prod"] + } + ] +} diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/package.json b/build-tests/hashed-folder-copy-plugin-webpack5-test/package.json new file mode 100644 index 00000000000..44bcfe692e6 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/package.json @@ -0,0 +1,21 @@ +{ + "name": "hashed-folder-copy-plugin-webpack5-test", + "description": "Building this project exercises @rushstack/hashed-folder-copy-plugin with Webpack 5. NOTE - THIS TEST IS CURRENTLY EXPECTED TO BE BROKEN", + "version": "0.0.0", + "private": true, + "scripts": { + "build": "heft build --clean", + "serve": "heft start --clean", + "_phase:build": "heft build --clean" + }, + "devDependencies": { + "@rushstack/hashed-folder-copy-plugin": "workspace:*", + "@rushstack/heft-webpack5-plugin": "workspace:*", + "@rushstack/heft": "workspace:*", + "@types/webpack-env": "1.13.0", + "html-webpack-plugin": "~4.5.2", + "typescript": "~4.6.3", + "webpack-bundle-analyzer": "~4.5.0", + "webpack": "~5.68.0" + } +} diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/src/index.ts b/build-tests/hashed-folder-copy-plugin-webpack5-test/src/index.ts new file mode 100644 index 00000000000..db303a4aaa3 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/src/index.ts @@ -0,0 +1,25 @@ +import { ASSETS_BASE_URL2 } from './submodule'; + +const ASSETS_BASE_URL: string = requireFolder({ + outputFolder: 'assets_[hash]', + sources: [ + { + globsBase: '../assets', + globPatterns: ['**/*'] + } + ] +}); + +function appendImageToBody(url: string): void { + const image: HTMLImageElement = document.createElement('img'); + image.src = url; + document.body.appendChild(image); +} + +appendImageToBody(`${ASSETS_BASE_URL}/red.png`); +appendImageToBody(`${ASSETS_BASE_URL}/green.png`); +appendImageToBody(`${ASSETS_BASE_URL}/blue.png`); + +appendImageToBody(`${ASSETS_BASE_URL2}/red.png`); +appendImageToBody(`${ASSETS_BASE_URL2}/green.png`); +appendImageToBody(`${ASSETS_BASE_URL2}/blue.png`); diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/src/submodule.ts b/build-tests/hashed-folder-copy-plugin-webpack5-test/src/submodule.ts new file mode 100644 index 00000000000..d9a6e6fa8b0 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/src/submodule.ts @@ -0,0 +1,9 @@ +export const ASSETS_BASE_URL2: string = requireFolder({ + outputFolder: 'assets2_[hash]', + sources: [ + { + globsBase: '../assets', + globPatterns: ['**/*'] + } + ] +}); diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/tsconfig.json b/build-tests/hashed-folder-copy-plugin-webpack5-test/tsconfig.json new file mode 100644 index 00000000000..0c287924501 --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "experimentalDecorators": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": true, + "jsx": "react", + "lib": ["es5", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"], + "module": "esnext", + "moduleResolution": "node", + "noUnusedLocals": true, + "sourceMap": true, + "strictNullChecks": true, + "target": "es5", + "types": ["webpack-env", "@rushstack/hashed-folder-copy-plugin/ambientTypes"], + + "outDir": "lib", + "rootDir": "src", + "rootDirs": ["src", "temp/loc-json-ts"] + }, + "include": ["src/**/*.ts", "src/**/*.tsx"] +} diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/webpack.config.js b/build-tests/hashed-folder-copy-plugin-webpack5-test/webpack.config.js new file mode 100644 index 00000000000..ebce51bfc9b --- /dev/null +++ b/build-tests/hashed-folder-copy-plugin-webpack5-test/webpack.config.js @@ -0,0 +1,40 @@ +'use strict'; + +const path = require('path'); +const webpack = require('webpack'); + +const { HashedFolderCopyPlugin } = require('@rushstack/hashed-folder-copy-plugin'); +const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); + +function generateConfiguration(mode, outputFolderName) { + return { + mode: mode, + entry: { + test: path.join(__dirname, 'lib', 'index.js') + }, + output: { + path: path.join(__dirname, outputFolderName), + filename: '[name]_[contenthash].js', + chunkFilename: '[id].[name]_[contenthash].js' + }, + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new HashedFolderCopyPlugin(), + new BundleAnalyzerPlugin({ + openAnalyzer: false, + analyzerMode: 'static', + reportFilename: path.resolve(__dirname, 'temp', 'stats.html'), + generateStatsFile: true, + statsFilename: path.resolve(__dirname, 'temp', 'stats.json'), + logLevel: 'error' + }), + new HtmlWebpackPlugin() + ] + }; +} + +module.exports = [ + generateConfiguration('development', 'dist-dev'), + generateConfiguration('production', 'dist-prod') +]; diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 00747325cbb..2cf97f09919 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -643,33 +643,49 @@ importers: eslint: 7.30.0 typescript: 4.6.3 - ../../build-tests/hashed-folder-copy-plugin-test: + ../../build-tests/hashed-folder-copy-plugin-webpack4-test: specifiers: '@rushstack/hashed-folder-copy-plugin': workspace:* + '@rushstack/heft': workspace:* + '@rushstack/heft-webpack4-plugin': workspace:* '@rushstack/module-minifier-plugin': workspace:* - '@rushstack/node-core-library': workspace:* '@rushstack/set-webpack-public-path-plugin': workspace:* '@types/webpack-env': 1.13.0 html-webpack-plugin: ~4.5.2 - ts-loader: 6.0.0 typescript: ~4.6.3 webpack: ~4.44.2 webpack-bundle-analyzer: ~4.5.0 - webpack-cli: ~3.3.2 - webpack-dev-server: ~3.11.0 - dependencies: + devDependencies: '@rushstack/hashed-folder-copy-plugin': link:../../webpack/hashed-folder-copy-plugin + '@rushstack/heft': link:../../apps/heft + '@rushstack/heft-webpack4-plugin': link:../../heft-plugins/heft-webpack4-plugin '@rushstack/module-minifier-plugin': link:../../webpack/module-minifier-plugin - '@rushstack/node-core-library': link:../../libraries/node-core-library '@rushstack/set-webpack-public-path-plugin': link:../../webpack/set-webpack-public-path-plugin '@types/webpack-env': 1.13.0 html-webpack-plugin: 4.5.2_webpack@4.44.2 - ts-loader: 6.0.0_typescript@4.6.3 typescript: 4.6.3 - webpack: 4.44.2_webpack-cli@3.3.12 + webpack: 4.44.2 + webpack-bundle-analyzer: 4.5.0 + + ../../build-tests/hashed-folder-copy-plugin-webpack5-test: + specifiers: + '@rushstack/hashed-folder-copy-plugin': workspace:* + '@rushstack/heft': workspace:* + '@rushstack/heft-webpack5-plugin': workspace:* + '@types/webpack-env': 1.13.0 + html-webpack-plugin: ~4.5.2 + typescript: ~4.6.3 + webpack: ~5.68.0 + webpack-bundle-analyzer: ~4.5.0 + devDependencies: + '@rushstack/hashed-folder-copy-plugin': link:../../webpack/hashed-folder-copy-plugin + '@rushstack/heft': link:../../apps/heft + '@rushstack/heft-webpack5-plugin': link:../../heft-plugins/heft-webpack5-plugin + '@types/webpack-env': 1.13.0 + html-webpack-plugin: 4.5.2_webpack@5.68.0 + typescript: 4.6.3 + webpack: 5.68.0 webpack-bundle-analyzer: 4.5.0 - webpack-cli: 3.3.12_webpack@4.44.2 - webpack-dev-server: 3.11.3_93ca2875a658e9d1552850624e6b91c7 ../../build-tests/heft-action-plugin: specifiers: @@ -5764,7 +5780,6 @@ packages: /@polka/url/1.0.0-next.21: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} - dev: false /@popperjs/core/2.11.4: resolution: {integrity: sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==} @@ -5981,7 +5996,6 @@ packages: transitivePeerDependencies: - bufferutil - constructs - - encoding - supports-color - utf-8-validate dev: true @@ -6019,7 +6033,6 @@ packages: xstate: 4.26.1 zod: 3.14.3 transitivePeerDependencies: - - encoding - supports-color dev: true @@ -6043,7 +6056,6 @@ packages: graphql: 15.8.0 zip-local: 0.3.5 transitivePeerDependencies: - - encoding - supports-color dev: true @@ -10079,7 +10091,6 @@ packages: /commander/7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} - dev: false /commander/8.3.0: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} @@ -13254,7 +13265,6 @@ packages: engines: {node: '>=10'} dependencies: duplexer: 0.1.2 - dev: false /handle-thing/2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} @@ -13574,6 +13584,24 @@ packages: util.promisify: 1.0.0 webpack: 4.44.2 + /html-webpack-plugin/4.5.2_webpack@5.68.0: + resolution: {integrity: sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==} + engines: {node: '>=6.9'} + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + dependencies: + '@types/html-minifier-terser': 5.1.2 + '@types/tapable': 1.0.6 + '@types/webpack': 4.41.24 + html-minifier-terser: 5.1.1 + loader-utils: 1.4.0 + lodash: 4.17.21 + pretty-error: 2.1.2 + tapable: 1.1.3 + util.promisify: 1.0.0 + webpack: 5.68.0 + dev: true + /html-webpack-plugin/5.5.0_webpack@5.68.0: resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==} engines: {node: '>=10.13.0'} @@ -16226,7 +16254,6 @@ packages: /mrmime/1.0.0: resolution: {integrity: sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==} engines: {node: '>=10'} - dev: false /ms/2.0.0: resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} @@ -16829,7 +16856,6 @@ packages: /opener/1.5.2: resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==} hasBin: true - dev: false /opn/5.5.0: resolution: {integrity: sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==} @@ -19453,7 +19479,6 @@ packages: '@polka/url': 1.0.0-next.21 mrmime: 1.0.0 totalist: 1.1.0 - dev: false /sisteransi/1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -20510,7 +20535,6 @@ packages: /totalist/1.1.0: resolution: {integrity: sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==} engines: {node: '>=6'} - dev: false /tough-cookie/2.5.0: resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==} @@ -21276,7 +21300,6 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: false /webpack-cli/3.3.12_webpack@4.44.2: resolution: {integrity: sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==} diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json index bfc98304aa8..814d3a36e4b 100644 --- a/common/config/rush/repo-state.json +++ b/common/config/rush/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "47cf63b7f2d0fa3dbfe15c84f2cd566e6f70d3a6", + "pnpmShrinkwrapHash": "c44d3c1a3e859952634c510e077dc39ed9bdbe64", "preferredVersionsHash": "d2a5d015a5e5f4861bc36581c3c08cb789ed7fab" } diff --git a/rush.json b/rush.json index 2378f3e26cb..54a4a7f21ac 100644 --- a/rush.json +++ b/rush.json @@ -751,12 +751,17 @@ "shouldPublish": false }, { - "packageName": "hashed-folder-copy-plugin-test", - "projectFolder": "build-tests/hashed-folder-copy-plugin-test", + "packageName": "hashed-folder-copy-plugin-webpack4-test", + "projectFolder": "build-tests/hashed-folder-copy-plugin-webpack4-test", + "reviewCategory": "tests", + "shouldPublish": false + }, + { + "packageName": "hashed-folder-copy-plugin-webpack5-test", + "projectFolder": "build-tests/hashed-folder-copy-plugin-webpack5-test", "reviewCategory": "tests", "shouldPublish": false }, - { "packageName": "install-test-workspace", "projectFolder": "build-tests/install-test-workspace",