fix: ts tests

This commit is contained in:
Ben Irvin 2023-11-14 14:42:26 +01:00
parent d077922b77
commit 28d0d5434a
3 changed files with 48 additions and 33 deletions

View File

@ -1,18 +1,23 @@
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
import browserslistToEsbuild from 'browserslist-to-esbuild';
import { ESBuildMinifyPlugin } from 'esbuild-loader';
import ForkTsCheckerPlugin from 'fork-ts-checker-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import ForkTsCheckerPlugin from 'fork-ts-checker-webpack-plugin';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import crypto from 'node:crypto';
import path from 'node:path';
import { Configuration, DefinePlugin, HotModuleReplacementPlugin } from 'webpack';
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
import {
Configuration,
DefinePlugin,
HotModuleReplacementPlugin,
WebpackPluginInstance,
} from 'webpack';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import { getAliases } from './aliases';
import { loadFile } from '../core/files';
import { loadStrapiMonorepo } from '../core/monorepo';
import type { BuildContext } from '../createBuildContext';
import { loadFile } from '../core/files';
import { getAliases } from './aliases';
const resolveBaseConfig = async (ctx: BuildContext) => {
const monorepo = await loadStrapiMonorepo(ctx.cwd);
@ -192,7 +197,7 @@ const resolveProductionConfig = async (ctx: BuildContext): Promise<Configuration
ignoreOrder: true,
}),
ctx.options.stats && new BundleAnalyzerPlugin(),
].filter(Boolean),
].filter(Boolean) as WebpackPluginInstance[], // TODO: find out if this is an actual issue or just a ts bug
};
};
@ -235,4 +240,4 @@ const mergeConfigWithUserConfig = async (config: Configuration, ctx: BuildContex
return config;
};
export { resolveProductionConfig, resolveDevelopmentConfig, mergeConfigWithUserConfig };
export { mergeConfigWithUserConfig, resolveDevelopmentConfig, resolveProductionConfig };

View File

@ -166,7 +166,7 @@
"styled-components": "5.3.3",
"typescript": "5.2.2",
"webpack": "^5.88.1",
"webpack-bundle-analyzer": "^4.9.0",
"webpack-bundle-analyzer": "4.10.0",
"webpack-dev-middleware": "6.1.1",
"webpack-hot-middleware": "2.25.4",
"yup": "0.32.9"
@ -183,7 +183,7 @@
"@types/js-cookie": "3.0.5",
"@types/pluralize": "0.0.32",
"@types/prettier": "2.7.3",
"@types/webpack-bundle-analyzer": "4.6.2",
"@types/webpack-bundle-analyzer": "4.6.3",
"@types/webpack-hot-middleware": "2.25.8",
"msw": "1.3.0",
"vite": "4.4.9"

View File

@ -8879,7 +8879,7 @@ __metadata:
"@types/js-cookie": "npm:3.0.5"
"@types/pluralize": "npm:0.0.32"
"@types/prettier": "npm:2.7.3"
"@types/webpack-bundle-analyzer": "npm:4.6.2"
"@types/webpack-bundle-analyzer": "npm:4.6.3"
"@types/webpack-hot-middleware": "npm:2.25.8"
axios: "npm:1.6.0"
bcryptjs: "npm:2.4.3"
@ -8965,7 +8965,7 @@ __metadata:
typescript: "npm:5.2.2"
vite: "npm:4.4.9"
webpack: "npm:^5.88.1"
webpack-bundle-analyzer: "npm:^4.9.0"
webpack-bundle-analyzer: "npm:4.10.0"
webpack-dev-middleware: "npm:6.1.1"
webpack-hot-middleware: "npm:2.25.4"
yup: "npm:0.32.9"
@ -11468,14 +11468,14 @@ __metadata:
languageName: node
linkType: hard
"@types/webpack-bundle-analyzer@npm:4.6.2":
version: 4.6.2
resolution: "@types/webpack-bundle-analyzer@npm:4.6.2"
"@types/webpack-bundle-analyzer@npm:4.6.3":
version: 4.6.3
resolution: "@types/webpack-bundle-analyzer@npm:4.6.3"
dependencies:
"@types/node": "npm:*"
tapable: "npm:^2.2.0"
webpack: "npm:^5"
checksum: ac92adc2b1b128119fd867f31bbadf0a0f5f159a2c551665def34bbb8265ecd46bfa28c39683d043eac6e7e8499182e25eb5f57690b9772e5f42aa76948ebc37
checksum: 646b78aa5e06094b9558d49826fcecff6d7c67ab5e02120b9567a4cec904aaebb820ffac5f57963aada98a0603ae56c8aebfd9b54e8bb0597540e6687da063ac
languageName: node
linkType: hard
@ -15713,6 +15713,13 @@ __metadata:
languageName: node
linkType: hard
"debounce@npm:^1.2.1":
version: 1.2.1
resolution: "debounce@npm:1.2.1"
checksum: 0b95b2a9d80ed69117d890f8dab8c0f2d6066f8d20edd1d810ae51f8f366a6d4c8b1d56e97dcb9304e93d57de4d5db440d34a03def7dad50403fc3f22bf16808
languageName: node
linkType: hard
"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.9":
version: 2.6.9
resolution: "debug@npm:2.6.9"
@ -20212,7 +20219,7 @@ __metadata:
languageName: node
linkType: hard
"html-escaper@npm:^2.0.0":
"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
version: 2.0.2
resolution: "html-escaper@npm:2.0.2"
checksum: 034d74029dcca544a34fb6135e98d427acd73019796ffc17383eaa3ec2fe1c0471dcbbc8f8ed39e46e86d43ccd753a160631615e4048285e313569609b66d5b7
@ -30054,14 +30061,14 @@ __metadata:
languageName: node
linkType: hard
"sirv@npm:^1.0.7":
version: 1.0.19
resolution: "sirv@npm:1.0.19"
"sirv@npm:^2.0.3":
version: 2.0.3
resolution: "sirv@npm:2.0.3"
dependencies:
"@polka/url": "npm:^1.0.0-next.20"
mrmime: "npm:^1.0.0"
totalist: "npm:^1.0.0"
checksum: b6833ab4d41f5e449ffcb4d89caac45d97de4b246f984f9b9fa86a0107689562c22d24788b533a58a10cf2cfcebb7e6c678ffa84ac7d3392fca9d18b1bd7ee05
totalist: "npm:^3.0.0"
checksum: dbfbff7355c1433df4f18683b5efe3b22eebac745e7ae30e38ba9d2bf468765a8a81993b78198dfd9bc809330fce85c67e74bccd262ca5871ecb92046fcf4560
languageName: node
linkType: hard
@ -31635,10 +31642,10 @@ __metadata:
languageName: node
linkType: hard
"totalist@npm:^1.0.0":
version: 1.1.0
resolution: "totalist@npm:1.1.0"
checksum: dfab80c7104a1d170adc8c18782d6c04b7df08352dec452191208c66395f7ef2af7537ddfa2cf1decbdcfab1a47afbbf0dec6543ea191da98c1c6e1599f86adc
"totalist@npm:^3.0.0":
version: 3.0.1
resolution: "totalist@npm:3.0.1"
checksum: 5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a
languageName: node
linkType: hard
@ -32937,23 +32944,26 @@ __metadata:
languageName: node
linkType: hard
"webpack-bundle-analyzer@npm:^4.9.0":
version: 4.9.0
resolution: "webpack-bundle-analyzer@npm:4.9.0"
"webpack-bundle-analyzer@npm:4.10.0":
version: 4.10.0
resolution: "webpack-bundle-analyzer@npm:4.10.0"
dependencies:
"@discoveryjs/json-ext": "npm:0.5.7"
acorn: "npm:^8.0.4"
acorn-walk: "npm:^8.0.0"
chalk: "npm:^4.1.0"
commander: "npm:^7.2.0"
debounce: "npm:^1.2.1"
escape-string-regexp: "npm:^4.0.0"
gzip-size: "npm:^6.0.0"
lodash: "npm:^4.17.20"
html-escaper: "npm:^2.0.2"
is-plain-object: "npm:^5.0.0"
opener: "npm:^1.5.2"
sirv: "npm:^1.0.7"
picocolors: "npm:^1.0.0"
sirv: "npm:^2.0.3"
ws: "npm:^7.3.1"
bin:
webpack-bundle-analyzer: lib/bin/analyzer.js
checksum: bd1a7b431b6cf0e8c7582531ad340eb299d93fe3268d980d040df92f9383fe4fe0820032334390941e8deccd370a023a96abb393808e39c7e0855efb5b4987c8
checksum: f7f58050987b72df22c89ee521e027c659c098bd42768ac31e2bbb11000a8e1e0d20acfdcd5d11a45610dc37a8619fcd9b9e8cb8eb803e38e033a9f4e59ae7e3
languageName: node
linkType: hard