diff --git a/.changeset/pretty-eels-shout.md b/.changeset/pretty-eels-shout.md new file mode 100644 index 000000000..cedb7b1df --- /dev/null +++ b/.changeset/pretty-eels-shout.md @@ -0,0 +1,5 @@ +--- +'@ice/app': patch +--- + +fix: refactor error handling diff --git a/.changeset/rich-beans-unite.md b/.changeset/rich-beans-unite.md new file mode 100644 index 000000000..cb01948e1 --- /dev/null +++ b/.changeset/rich-beans-unite.md @@ -0,0 +1,5 @@ +--- +'@ice/webpack-config': patch +--- + +fix: refactor error handling diff --git a/.changeset/rich-pears-learn.md b/.changeset/rich-pears-learn.md new file mode 100644 index 000000000..d28951afb --- /dev/null +++ b/.changeset/rich-pears-learn.md @@ -0,0 +1,5 @@ +--- +'@ice/bundles': patch +--- + +fix: bump webpack(5.84.1) and webpack-dev-server(4.15.0) diff --git a/examples/app-config/package.json b/examples/app-config/package.json index 81bfa6fa5..96c90da49 100644 --- a/examples/app-config/package.json +++ b/examples/app-config/package.json @@ -24,6 +24,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/basic-project/package.json b/examples/basic-project/package.json index 8bc050ebb..d11b939ea 100644 --- a/examples/basic-project/package.json +++ b/examples/basic-project/package.json @@ -23,6 +23,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/csr-project/package.json b/examples/csr-project/package.json index 9514f0a90..405fcee04 100644 --- a/examples/csr-project/package.json +++ b/examples/csr-project/package.json @@ -21,6 +21,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/disable-data-loader/package.json b/examples/disable-data-loader/package.json index 71308c77a..dd8a05ae2 100644 --- a/examples/disable-data-loader/package.json +++ b/examples/disable-data-loader/package.json @@ -24,6 +24,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/miniapp-project/package.json b/examples/miniapp-project/package.json index 8a8326fe1..e10920e5f 100644 --- a/examples/miniapp-project/package.json +++ b/examples/miniapp-project/package.json @@ -28,6 +28,6 @@ "@types/react-dom": "^18.0.2", "browserslist": "^4.19.3", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/rax-inline-style/package.json b/examples/rax-inline-style/package.json index 256152208..5a8c2e303 100644 --- a/examples/rax-inline-style/package.json +++ b/examples/rax-inline-style/package.json @@ -24,6 +24,6 @@ "devDependencies": { "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/rax-project/package.json b/examples/rax-project/package.json index c100f9abc..4f5cbabb6 100644 --- a/examples/rax-project/package.json +++ b/examples/rax-project/package.json @@ -26,6 +26,6 @@ "devDependencies": { "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/with-entry-type/package.json b/examples/with-entry-type/package.json index 808fe5503..b76bac3d7 100644 --- a/examples/with-entry-type/package.json +++ b/examples/with-entry-type/package.json @@ -19,6 +19,6 @@ "fs-extra": "^10.0.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", - "webpack": "^5.73.0" + "webpack": "^5.84.1" } } diff --git a/examples/with-nested-routes/package.json b/examples/with-nested-routes/package.json index fd131cccc..b212eab19 100644 --- a/examples/with-nested-routes/package.json +++ b/examples/with-nested-routes/package.json @@ -19,6 +19,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "speed-measure-webpack-plugin": "^1.5.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/examples/with-pha/package.json b/examples/with-pha/package.json index 6d00b82e6..c9727465c 100644 --- a/examples/with-pha/package.json +++ b/examples/with-pha/package.json @@ -19,6 +19,6 @@ "devDependencies": { "@types/react": "^18.0.0", "@types/react-dom": "^18.0.2", - "webpack": "^5.80.0" + "webpack": "^5.84.1" } } diff --git a/packages/bundles/package.json b/packages/bundles/package.json index 298e59a80..892062ae2 100644 --- a/packages/bundles/package.json +++ b/packages/bundles/package.json @@ -65,9 +65,9 @@ "terser-webpack-plugin": "5.3.5", "typescript": "^4.6.4", "trusted-cert": "1.1.3", - "webpack": "5.80.0", + "webpack": "5.84.1", "webpack-bundle-analyzer": "4.5.0", - "webpack-dev-server": "4.11.1", + "webpack-dev-server": "4.15.0", "unplugin": "0.9.5", "bonjour-service": "^1.0.13", "colorette": "^2.0.10", diff --git a/packages/ice/package.json b/packages/ice/package.json index c5f89d1d9..725295f2a 100644 --- a/packages/ice/package.json +++ b/packages/ice/package.json @@ -82,7 +82,7 @@ "react-router": "6.11.2", "sass": "^1.50.0", "unplugin": "^0.9.0", - "webpack": "^5.80.0", + "webpack": "^5.84.1", "webpack-dev-server": "^4.7.4" }, "peerDependencies": { diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts index 9563bdb34..0018b0f2f 100644 --- a/packages/ice/src/createService.ts +++ b/packages/ice/src/createService.ts @@ -145,9 +145,9 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt delete require.cache[serverEntry]; return await dynamicImport(serverEntry, true); } - } catch (err) { + } catch (error) { // make error clearly, notice typeof err === 'string' - logger.error('Excute server entry error:', err); + logger.error('Execute server entry error:', error); return; } } @@ -397,9 +397,9 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt spinner: buildSpinner, }); } - } catch (err) { + } catch (error) { buildSpinner.stop(); - throw err; + throw error; } }, }; diff --git a/packages/ice/src/esbuild/scan.ts b/packages/ice/src/esbuild/scan.ts index 57aa531bd..e5c5b95f2 100644 --- a/packages/ice/src/esbuild/scan.ts +++ b/packages/ice/src/esbuild/scan.ts @@ -64,7 +64,9 @@ const scanPlugin = (options: Options): Plugin => { pkgNameCache.set(resolved, result); return result; } catch (err) { - logger.error(`cant resolve package of path: ${resolved}`, err); + logger.error(`Can't resolve package of path: ${resolved}`); + // Scan error doesn't affect the build process. + logger.error(err); } }; @@ -162,4 +164,4 @@ const scanPlugin = (options: Options): Plugin => { }; }; -export default scanPlugin; \ No newline at end of file +export default scanPlugin; diff --git a/packages/ice/src/esbuild/transformImport.ts b/packages/ice/src/esbuild/transformImport.ts index 68587af66..301bebaa4 100644 --- a/packages/ice/src/esbuild/transformImport.ts +++ b/packages/ice/src/esbuild/transformImport.ts @@ -1,6 +1,4 @@ import path from 'path'; -import type { TransformOptions } from 'esbuild'; -import { esbuild } from '@ice/bundles'; import MagicString from '@ice/bundles/compiled/magic-string/index.js'; import esModuleLexer from '@ice/bundles/compiled/es-module-lexer/index.js'; import type { ImportSpecifier } from '@ice/bundles/compiled/es-module-lexer/index.js'; @@ -29,17 +27,10 @@ const transformImportPlugin = (preBundleDepsMetadata: PreBundleDepsMetaData, ser transformInclude(id: string) { return /\.(js|jsx|ts|tsx)$/.test(id); }, - async transform(source: string, id: string) { + async transform(source: string) { await init; let imports: readonly ImportSpecifier[] = []; - // es-module-lexer do not support parse jsx syntax, so we first transform the source by esbuild. - const transformed = await transformWithESBuild( - source, - id, - ); - source = transformed.code; - - imports = parse(transformed.code)[0]; + imports = parse(source)[0]; const str = new MagicString(source); for (let index = 0; index < imports.length; index++) { const { @@ -61,30 +52,4 @@ const transformImportPlugin = (preBundleDepsMetadata: PreBundleDepsMetaData, ser }; }; -// Fork from https://github.com/vitejs/vite/blob/d98c8a710b8f0804120c05e5bd3eb403f17e7b30/packages/vite/src/node/plugins/esbuild.ts#L60 -async function transformWithESBuild( - input: string, - filePath: string, - options: TransformOptions = {}, -) { - let loader = options?.loader as TransformOptions['loader']; - if (!loader) { - const extname = path.extname(filePath).slice(1); - if (extname === 'mjs' || extname === 'cjs' || extname === 'js') { - loader = 'jsx'; - } else { - loader = extname as TransformOptions['loader']; - } - } - - const transformOptions = { - sourcemap: true, - sourcefile: filePath, - ...options, - loader, - } as TransformOptions; - - return await esbuild.transform(input, transformOptions); -} - export default transformImportPlugin; diff --git a/packages/ice/src/esbuild/transformPipe.ts b/packages/ice/src/esbuild/transformPipe.ts index 5ed98113f..3cbacf1e0 100644 --- a/packages/ice/src/esbuild/transformPipe.ts +++ b/packages/ice/src/esbuild/transformPipe.ts @@ -36,19 +36,17 @@ function guessLoader(id: string): Loader { * but esbuild needs them, we fix the two methods. */ export function fixSourceMap(map: any) { - if (!('toString' in map)) { - Object.defineProperty(map, 'toString', { - enumerable: false, - value: function toString() { - return JSON.stringify(this); - }, - }); - } + Object.defineProperty(map, 'toMapString', { + enumerable: false, + value: function toString() { + return JSON.stringify(this); + }, + }); if (!('toUrl' in map)) { Object.defineProperty(map, 'toUrl', { enumerable: false, value: function toUrl() { - return `data:application/json;charset=utf-8;base64,${Buffer.from(this.toString()).toString('base64')}`; + return `data:application/json;charset=utf-8;base64,${Buffer.from(this.toMapString()).toString('base64')}`; }, }); } @@ -135,13 +133,15 @@ const transformPipe = (options: PluginOptions = {}): Plugin => { sourceCode = result; } else if (typeof result === 'object' && result !== null) { sourceCode = result.code; - sourceMap = result.map; + sourceMap = typeof result.map === 'string' ? JSON.parse(result.map) : result.map; } } if (sourceMap && typeof sourceMap !== 'string') { if (!sourceMap.sourcesContent || sourceMap.sourcesContent.length === 0) { sourceMap.sourcesContent = [sourceCode]; } + // Use relative path to make sure the source map is correct. + sourceMap.sources = [path.relative(resolveDir, id)]; sourceMap = fixSourceMap(sourceMap); sourceCode += `\n//# sourceMappingURL=${sourceMap.toUrl()}`; } @@ -158,4 +158,4 @@ const transformPipe = (options: PluginOptions = {}): Plugin => { }; }; -export default transformPipe; \ No newline at end of file +export default transformPipe; diff --git a/packages/ice/src/middlewares/mock/createMiddleware.ts b/packages/ice/src/middlewares/mock/createMiddleware.ts index eceffd2e8..fe41e7341 100644 --- a/packages/ice/src/middlewares/mock/createMiddleware.ts +++ b/packages/ice/src/middlewares/mock/createMiddleware.ts @@ -83,12 +83,12 @@ function decodeParam(val: any) { } try { return decodeURIComponent(val); - } catch (err) { - if (err instanceof URIError) { - err.message = `Failed to decode param ' ${val} '`; - (err as any).status = 400; - (err as any).statusCode = 400; + } catch (error) { + if (error instanceof URIError) { + error.message = `Failed to decode param ' ${val} '`; + (error as any).status = 400; + (error as any).statusCode = 400; } - throw err; + throw error; } } diff --git a/packages/ice/src/middlewares/mock/getConfigs.ts b/packages/ice/src/middlewares/mock/getConfigs.ts index 0ba7032b8..5a953cd51 100644 --- a/packages/ice/src/middlewares/mock/getConfigs.ts +++ b/packages/ice/src/middlewares/mock/getConfigs.ts @@ -47,7 +47,8 @@ export default function getConfigs(rootDir: string, exclude: string[] = []): Moc try { mockModule = require(mockFile); } catch (error) { - logger.error(`Failed to parse mock file ${mockFile}.\n${error.message}`); + logger.error(`Failed to parse mock file ${mockFile}`); + logger.error(error); return; } const config = mockModule.default || mockModule || {}; diff --git a/packages/ice/src/service/analyze.ts b/packages/ice/src/service/analyze.ts index 195bdbc74..d918597ca 100644 --- a/packages/ice/src/service/analyze.ts +++ b/packages/ice/src/service/analyze.ts @@ -135,7 +135,7 @@ export async function analyzeImports(files: string[], options: Options) { })(); })); } catch (err) { - logger.error('[ERROR]', `optimize runtime failed when analyze ${filePath}`); + logger.briefError(`Optimize runtime failed when analyze ${filePath}`); logger.debug(err); throw err; } @@ -151,8 +151,7 @@ export async function analyzeImports(files: string[], options: Options) { })); } return importSet; - } catch (err) { - logger.debug(err); + } catch (_) { return false; } } @@ -199,8 +198,8 @@ export async function scanImports(entries: string[], options?: ScanOptions) { ); logger.debug(`Scan completed in ${(performance.now() - start).toFixed(2)}ms:`, deps); } catch (error) { - logger.error('Failed to scan module imports.', `\n${error.message}`); - logger.debug(error.stack); + logger.briefError('Failed to scan module imports.'); + logger.debug(error); } return orderedDependencies(deps); } @@ -256,8 +255,8 @@ export async function getFileExports(options: FileOptions): Promise { transformInclude: (id) => id.includes('src/app') || id.includes('.ice'), getOutfile, needRecompile: async (entry, keepExports) => { - let cached = null; const cachedKey = `app_${keepExports.join('_')}_${process.env.__ICE_VERSION__}`; - try { - cached = await getCache(rootDir, cachedKey); - } catch (err) { } + const cached = await getCache(rootDir, cachedKey); const fileHash = await getFileHash(appEntry); if (!cached || fileHash !== cached) { await setCache(rootDir, cachedKey, fileHash); @@ -153,8 +150,8 @@ export const getAppExportConfig = (rootDir: string) => { try { return (await config.getConfig(exportNames || ['default', 'defineAppConfig'])) || {}; } catch (error) { - logger.warn('Failed to get app config.', `\n${error.message}`); - logger.debug(error.stack); + logger.briefError('Failed to get app config.'); + logger.debug(error); } }; @@ -163,8 +160,8 @@ export const getAppExportConfig = (rootDir: string) => { try { config.setCompiler(serverCompiler); } catch (error) { - logger.error('Failed to compile app config.', `\n${error.message}`); - logger.debug(error.stack); + logger.briefError('Failed to compile app config.'); + logger.debug(error); } }, getAppConfig, @@ -203,15 +200,12 @@ export const getRouteExportConfig = (rootDir: string) => { rootDir, getOutfile: getRouteConfigOutfile, needRecompile: async (entry) => { - let cached = false; - try { - cached = await getCache(rootDir, cachedKey); - } catch (err) { } + const cached = await getCache(rootDir, cachedKey); if (cached) { // Always use cached file path while `routes-config` trigger re-compile by webpack plugin. return entry; } else { - setCache(rootDir, cachedKey, 'true'); + await setCache(rootDir, cachedKey, 'true'); return false; } }, @@ -222,16 +216,13 @@ export const getRouteExportConfig = (rootDir: string) => { rootDir, getOutfile: getdataLoadersConfigOutfile, needRecompile: async (entry) => { - let cached = false; const cachedKey = `loader_config_file_${process.env.__ICE_VERSION__}`; - try { - cached = await getCache(rootDir, cachedKey); - } catch (err) { } + const cached = await getCache(rootDir, cachedKey); if (cached) { // Always use cached file path while `routes-config` trigger re-compile by webpack plugin. return entry; } else { - setCache(rootDir, cachedKey, 'true'); + await setCache(rootDir, cachedKey, 'true'); return false; } }, @@ -259,7 +250,7 @@ export const getRouteExportConfig = (rootDir: string) => { const ensureRoutesConfig = async () => { const configFile = await routeConfig.getConfigFile(['pageConfig']); if (!configFile) { - setCache(rootDir, cachedKey, ''); + await setCache(rootDir, cachedKey, ''); } }; @@ -269,14 +260,14 @@ export const getRouteExportConfig = (rootDir: string) => { try { routeConfig.setCompiler(serverCompiler); } catch (error) { - routeConfigLogger.error('Failed to get route config.', `\n${error.message}`); - routeConfigLogger.debug(error.stack); + routeConfigLogger.briefError('Failed to get route config.'); + routeConfigLogger.debug(error); } try { dataloaderConfig.setCompiler(serverCompiler); } catch (error) { - dataLoaderConfigLogger.error('Failed to get dataLoader config.', `\n${error.message}`); - dataLoaderConfigLogger.debug(error.stack); + dataLoaderConfigLogger.briefError('Failed to get dataLoader config.'); + dataLoaderConfigLogger.debug(error); } }, getRoutesConfig, diff --git a/packages/ice/src/service/preBundleDeps.ts b/packages/ice/src/service/preBundleDeps.ts index 253d64da9..e7789408c 100644 --- a/packages/ice/src/service/preBundleDeps.ts +++ b/packages/ice/src/service/preBundleDeps.ts @@ -111,7 +111,7 @@ export default async function preBundleDeps( metadata, }; } catch (error) { - logger.error('Failed to bundle dependencies.'); + logger.briefError('Failed to bundle dependencies.'); logger.debug(error); return {}; } diff --git a/packages/ice/src/service/serverCompiler.ts b/packages/ice/src/service/serverCompiler.ts index 713f8ba6c..ff320a7ab 100644 --- a/packages/ice/src/service/serverCompiler.ts +++ b/packages/ice/src/service/serverCompiler.ts @@ -128,8 +128,7 @@ export function createServerCompiler(options: Options) { return (source: string, id: string) => { return { ...getConfig(source, id), - // Force inline when use swc as a transformer. - sourceMaps: sourceMap && 'inline', + sourceMaps: !!sourceMap, }; }; } @@ -254,13 +253,11 @@ export function createServerCompiler(options: Options) { serverEntry, }; } catch (error) { - logger.error( + logger.briefError( 'Server compiled with errors.', `\nEntryPoints: ${JSON.stringify(buildOptions.entryPoints)}`, `\n${error.message}`, ); - // TODO: Log esbuild options with namespace. - // logger.debug('esbuild options: ', buildOptions); logger.debug(error.stack); return { error: error as Error, diff --git a/packages/ice/src/service/webpackCompiler.ts b/packages/ice/src/service/webpackCompiler.ts index 9b1d8bba6..297c0b655 100644 --- a/packages/ice/src/service/webpackCompiler.ts +++ b/packages/ice/src/service/webpackCompiler.ts @@ -136,7 +136,7 @@ async function webpackCompiler(options: { const firstWebpackConfig = webpackConfigs[0]; firstWebpackConfig.plugins.push((compiler: webpack.Compiler) => { compiler.hooks.beforeCompile.tap('spinner', () => { - spinner.text = 'compiling...\n'; + spinner.text = 'Compiling...\n'; }); compiler.hooks.afterEmit.tap('spinner', () => { spinner.stop(); @@ -146,9 +146,9 @@ async function webpackCompiler(options: { try { // @ts-ignore compiler = webpackBundler(webpackConfigs); - } catch (err) { + } catch (error) { logger.error('Webpack compile error.'); - logger.error(err.message || err); + logger.error(error); } let isFirstCompile = true; diff --git a/packages/ice/src/utils/generateEntry.ts b/packages/ice/src/utils/generateEntry.ts index c009c0ffa..87f802799 100644 --- a/packages/ice/src/utils/generateEntry.ts +++ b/packages/ice/src/utils/generateEntry.ts @@ -39,9 +39,9 @@ export default async function generateEntry(options: Options): Promise; - +> & { briefError?: (message: ConsolaLogObject | any, ...args: any[]) => void }; export type CreateLogger = (namespace?: ICELogNamespace) => CreateLoggerReturnType; export const createLogger: CreateLogger = (namespace) => { + function briefError(message: ConsolaLogObject | any, ...args: any[]) { + consola.error(message, ...args); + if (!DEBUG_TAG) { + // eslint-disable-next-line camelcase + consola.log(`run \`DEBUG_TAG=${namespace || '*'} npm run ${npm_lifecycle_event || 'start'}\` to view error details`); + } + } + function extendLoggerInstance(instance: Consola): CreateLoggerReturnType { + const logger = {} as CreateLoggerReturnType; + ['fatal', 'error', 'warn', 'log', 'info', 'start', 'success', 'ready', 'debug', 'trace'].forEach((method) => { + logger[method] = instance[method]; + }); + logger.briefError = briefError; + return logger; + } + if (DEBUG_TAG) { consola.level = 4; } if (!namespace) { - return consola; + return extendLoggerInstance(consola); } if (DEBUG_TAG) { if (enabled(namespace)) { - return consola.withTag(namespace); + return extendLoggerInstance(consola.withTag(namespace)); } else { return { fatal() { }, @@ -80,10 +96,11 @@ export const createLogger: CreateLogger = (namespace) => { ready() { }, debug() { }, trace() { }, + briefError() {}, }; } } else { - return consola.withTag(namespace); + return extendLoggerInstance(consola.withTag(namespace)); } }; diff --git a/packages/ice/src/utils/openBrowser.ts b/packages/ice/src/utils/openBrowser.ts index df964f364..3b517b36c 100644 --- a/packages/ice/src/utils/openBrowser.ts +++ b/packages/ice/src/utils/openBrowser.ts @@ -154,4 +154,4 @@ function openBrowser(url) { } } -export default openBrowser; \ No newline at end of file +export default openBrowser; diff --git a/packages/ice/src/utils/persistentCache.ts b/packages/ice/src/utils/persistentCache.ts index 832143995..d75d488f9 100644 --- a/packages/ice/src/utils/persistentCache.ts +++ b/packages/ice/src/utils/persistentCache.ts @@ -3,12 +3,18 @@ import cacache from '@ice/bundles/compiled/cacache/index.js'; const CACHE_PATH = 'node_modules/.cache/route'; -export function getCache(rootDir: string, id: string) { +export async function getCache(rootDir: string, id: string) { const cachePath = path.join(rootDir, CACHE_PATH); - return cacache.get(cachePath, id).then((cache) => JSON.parse(cache.data.toString('utf-8'))); + try { + return await cacache.get(cachePath, id) + .then((cache) => JSON.parse(cache.data.toString('utf-8'))); + } catch (_) { + // Ignore get cache error. + return null; + } } -export function setCache(rootDir: string, id: string, data: any) { +export async function setCache(rootDir: string, id: string, data: any) { const cachePath = path.join(rootDir, CACHE_PATH); - return cacache.put(cachePath, id, JSON.stringify(data)); + return await cacache.put(cachePath, id, JSON.stringify(data)); } diff --git a/packages/ice/tests/fixtures/scan/import.js b/packages/ice/tests/fixtures/scan/import.js new file mode 100644 index 000000000..aae882526 --- /dev/null +++ b/packages/ice/tests/fixtures/scan/import.js @@ -0,0 +1,5 @@ +import { defineAppConfig } from '@ice/runtime'; +import { getAppConfig } from '@ice/runtime/client'; + +console.log(getAppConfig); +export default defineAppConfig({}); diff --git a/packages/ice/tests/transformImport.test.ts b/packages/ice/tests/transformImport.test.ts index 16b064fcc..bdcfbdfa2 100644 --- a/packages/ice/tests/transformImport.test.ts +++ b/packages/ice/tests/transformImport.test.ts @@ -13,7 +13,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)); const alias = { '@': path.join(__dirname, './fixtures/scan') }; const rootDir = path.join(__dirname, './fixtures/scan'); const cacheDir = path.join(rootDir, '.cache'); -const appEntry = path.join(__dirname, './fixtures/scan/app.ts'); +const appEntry = path.join(__dirname, './fixtures/scan/import.js'); const outdir = path.join(rootDir, 'build'); it('transform module import', async () => { @@ -35,7 +35,7 @@ it('transform module import', async () => { transformImportPlugin(), ], }); - const buildContent = await fse.readFile(path.join(outdir, 'app.js')); + const buildContent = await fse.readFile(path.join(outdir, 'import.js'), 'utf-8'); expect(buildContent.includes('../../.cache/deps/@ice_runtime_client.mjs')).toBeTruthy(); expect(buildContent.includes('../../.cache/deps/@ice_runtime.mjs')).toBeTruthy(); }); diff --git a/packages/miniapp-loader/package.json b/packages/miniapp-loader/package.json index 8f82521c9..8dda9f9a0 100644 --- a/packages/miniapp-loader/package.json +++ b/packages/miniapp-loader/package.json @@ -21,7 +21,7 @@ "@ice/bundles": "^0.1.10" }, "devDependencies": { - "webpack": "^5.80.0" + "webpack": "^5.84.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-miniapp/package.json b/packages/plugin-miniapp/package.json index 04444c135..de5d5f8f6 100644 --- a/packages/plugin-miniapp/package.json +++ b/packages/plugin-miniapp/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@ice/app": "^3.2.0", "@ice/runtime": "^1.2.0", - "webpack": "^5.80.0" + "webpack": "^5.84.1" }, "repository": { "type": "http", diff --git a/packages/plugin-pha/package.json b/packages/plugin-pha/package.json index 9f562e228..1c96f0767 100644 --- a/packages/plugin-pha/package.json +++ b/packages/plugin-pha/package.json @@ -28,7 +28,7 @@ "@ice/app": "^3.2.0", "build-scripts": "^2.1.1-0", "esbuild": "^0.17.16", - "webpack": "^5.80.0", + "webpack": "^5.84.1", "webpack-dev-server": "^4.9.2" }, "repository": { diff --git a/packages/plugin-pha/src/generateManifest.ts b/packages/plugin-pha/src/generateManifest.ts index 45feb1e2b..b69b5b8ae 100644 --- a/packages/plugin-pha/src/generateManifest.ts +++ b/packages/plugin-pha/src/generateManifest.ts @@ -62,7 +62,7 @@ export default async function generateManifest({ // dataLoader may have side effect code. dataloaderConfig = await getDataloaderConfig(); } catch (err) { - logger.debug('GetDataloaderConfig failed.'); + logger.briefError('GetDataloaderConfig failed.'); logger.debug(err); } diff --git a/packages/plugin-pha/src/phaMiddleware.ts b/packages/plugin-pha/src/phaMiddleware.ts index 05b69ac6a..9c9194316 100644 --- a/packages/plugin-pha/src/phaMiddleware.ts +++ b/packages/plugin-pha/src/phaMiddleware.ts @@ -38,7 +38,7 @@ const createPHAMiddleware = ({ // dataLoader may have side effect code. dataloaderConfig = await getDataloaderConfig(); } catch (err) { - logger.debug('GetDataloaderConfig failed.'); + logger.briefError('GetDataloaderConfig failed.'); logger.debug(err); } diff --git a/packages/plugin-rax-compat/package.json b/packages/plugin-rax-compat/package.json index 9729aa836..0654b19bd 100644 --- a/packages/plugin-rax-compat/package.json +++ b/packages/plugin-rax-compat/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@ice/app": "^3.2.1", - "webpack": "^5.80.0" + "webpack": "^5.84.1" }, "repository": { "type": "http", diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json index 878fd6a09..686e81c72 100644 --- a/packages/webpack-config/package.json +++ b/packages/webpack-config/package.json @@ -26,7 +26,7 @@ "devDependencies": { "esbuild": "^0.17.16", "postcss": "^8.4.18", - "webpack": "^5.80.0", + "webpack": "^5.84.1", "webpack-dev-server": "^4.7.4" }, "scripts": { diff --git a/packages/webpack-config/src/unPlugins/redirectImport.ts b/packages/webpack-config/src/unPlugins/redirectImport.ts index c353051ad..f04c1c380 100644 --- a/packages/webpack-config/src/unPlugins/redirectImport.ts +++ b/packages/webpack-config/src/unPlugins/redirectImport.ts @@ -94,8 +94,9 @@ export async function redirectImport(code: string, options: Options): Promise= 10.13'} peerDependencies: @@ -6223,8 +6223,8 @@ packages: react-refresh: 0.14.0 schema-utils: 3.1.1 source-map: 0.7.4 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru - webpack-dev-server: 4.11.1_webpack@5.80.0 + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru + webpack-dev-server: 4.15.0_webpack@5.84.1 dev: true /@polka/url/1.0.0-next.21: @@ -7155,7 +7155,7 @@ packages: /@types/bonjour/3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 18.14.6 + '@types/node': 17.0.45 /@types/braces/3.0.1: resolution: {integrity: sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ==} @@ -7175,7 +7175,7 @@ packages: resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==} dependencies: '@types/express-serve-static-core': 4.17.33 - '@types/node': 18.14.6 + '@types/node': 17.0.45 /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} @@ -7552,7 +7552,7 @@ packages: /@types/sockjs/0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 18.14.6 + '@types/node': 17.0.45 /@types/stack-utils/2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} @@ -7588,7 +7588,7 @@ packages: dependencies: '@types/node': 18.14.6 tapable: 2.2.1 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru transitivePeerDependencies: - '@swc/core' - esbuild @@ -7952,8 +7952,8 @@ packages: acorn-walk: 8.2.0 dev: true - /acorn-import-assertions/1.8.0_acorn@8.8.2: - resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==} + /acorn-import-assertions/1.9.0_acorn@8.8.2: + resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} peerDependencies: acorn: ^8 dependencies: @@ -8631,7 +8631,7 @@ packages: - supports-color dev: true - /babel-loader/8.3.0_dszs7l5a7qyiwxmokuf77nntfe: + /babel-loader/8.3.0_kxgq3veuhty4yfwihkfdud53ra: resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: @@ -8643,7 +8643,7 @@ packages: loader-utils: 2.0.4 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.80.0 + webpack: 5.84.1 /babel-plugin-apply-mdx-type-prop/1.6.22_@babel+core@7.12.9: resolution: {integrity: sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==} @@ -9703,7 +9703,7 @@ packages: toggle-selection: 1.0.6 dev: false - /copy-webpack-plugin/10.2.4_webpack@5.80.0: + /copy-webpack-plugin/10.2.4_webpack@5.84.1: resolution: {integrity: sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==} engines: {node: '>= 12.20.0'} peerDependencies: @@ -9715,10 +9715,10 @@ packages: normalize-path: 3.0.0 schema-utils: 4.0.0 serialize-javascript: 6.0.1 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /copy-webpack-plugin/11.0.0_webpack@5.80.0: + /copy-webpack-plugin/11.0.0_webpack@5.84.1: resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -9730,7 +9730,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.0.0 serialize-javascript: 6.0.1 - webpack: 5.80.0 + webpack: 5.84.1 /core-js-compat/3.29.0: resolution: {integrity: sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==} @@ -9886,7 +9886,7 @@ packages: postcss-selector-parser: 6.0.11 dev: true - /css-loader/6.7.1_webpack@5.80.0: + /css-loader/6.7.1_webpack@5.84.1: resolution: {integrity: sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -9900,10 +9900,10 @@ packages: postcss-modules-values: 4.0.0_postcss@8.4.21 postcss-value-parser: 4.2.0 semver: 7.3.8 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /css-loader/6.7.3_webpack@5.80.0: + /css-loader/6.7.3_webpack@5.84.1: resolution: {integrity: sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -9917,9 +9917,9 @@ packages: postcss-modules-values: 4.0.0_postcss@8.4.21 postcss-value-parser: 4.2.0 semver: 7.4.0 - webpack: 5.80.0 + webpack: 5.84.1 - /css-minimizer-webpack-plugin/3.4.1_qo4emlfatbstozv5cog53p7ftu: + /css-minimizer-webpack-plugin/3.4.1_phbgr5tcaivbu7bfktl2bxlyea: resolution: {integrity: sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -9945,10 +9945,10 @@ packages: schema-utils: 4.0.0 serialize-javascript: 6.0.1 source-map: 0.6.1 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /css-minimizer-webpack-plugin/4.2.2_qnt3h6ipxx6o7czlqpct2splbm: + /css-minimizer-webpack-plugin/4.2.2_dfya3cexsomhuocolxv3inh6km: resolution: {integrity: sha512-s3Of/4jKfw1Hj9CxEO1E5oXhQAxlayuHO2y/ML+C6I9sQ7FdzfEV6QgMLN3vI+qFsjJGIAFLKtQK7t8BOXAIyA==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -9980,7 +9980,7 @@ packages: schema-utils: 4.0.0 serialize-javascript: 6.0.1 source-map: 0.6.1 - webpack: 5.80.0 + webpack: 5.84.1 /css-prefers-color-scheme/6.0.3_postcss@8.4.12: resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==} @@ -10763,8 +10763,8 @@ packages: dependencies: once: 1.4.0 - /enhanced-resolve/5.13.0: - resolution: {integrity: sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==} + /enhanced-resolve/5.14.1: + resolution: {integrity: sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==} engines: {node: '>=10.13.0'} dependencies: graceful-fs: 4.2.10 @@ -11626,7 +11626,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint-webpack-plugin/3.1.1_n3c5vnxccweitediyknzonmque: + /eslint-webpack-plugin/3.1.1_gh6dvy6iqgmdzfkobkjs4ylj4m: resolution: {integrity: sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -11639,7 +11639,7 @@ packages: micromatch: 4.0.5 normalize-path: 3.0.0 schema-utils: 3.1.1 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true /eslint/8.35.0: @@ -12020,7 +12020,7 @@ packages: flat-cache: 3.0.4 dev: true - /file-loader/6.2.0_webpack@5.80.0: + /file-loader/6.2.0_webpack@5.84.1: resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -12028,7 +12028,7 @@ packages: dependencies: loader-utils: 2.0.4 schema-utils: 3.1.1 - webpack: 5.80.0 + webpack: 5.84.1 /file-type/8.1.0: resolution: {integrity: sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==} @@ -12167,7 +12167,7 @@ packages: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} dev: false - /fork-ts-checker-webpack-plugin/6.5.3_lj5zgxrzaejsnoobor62tojvse: + /fork-ts-checker-webpack-plugin/6.5.3_45cgbvggwmemoiuyekq6eperya: resolution: {integrity: sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: @@ -12195,9 +12195,9 @@ packages: semver: 7.4.0 tapable: 1.1.3 typescript: 4.9.5 - webpack: 5.80.0 + webpack: 5.84.1 - /fork-ts-checker-webpack-plugin/7.2.6_lj5zgxrzaejsnoobor62tojvse: + /fork-ts-checker-webpack-plugin/7.2.6_45cgbvggwmemoiuyekq6eperya: resolution: {integrity: sha512-q5rdvy7CaqEWyK3ly/AjSMQ+e3DGkjuqP0pkTwJcg+PHLhQfTJXqkmRIeA2y0TPfX4U00Et+AxS2ObAsVcm0hQ==} engines: {node: '>=12.13.0', yarn: '>=1.0.0'} peerDependencies: @@ -12220,7 +12220,7 @@ packages: semver: 7.3.8 tapable: 2.2.1 typescript: 4.9.5 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true /form-data/2.3.3: @@ -12857,7 +12857,7 @@ packages: /html-void-elements/1.0.5: resolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==} - /html-webpack-plugin/5.5.0_webpack@5.80.0: + /html-webpack-plugin/5.5.0_webpack@5.84.1: resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==} engines: {node: '>=10.13.0'} peerDependencies: @@ -12868,7 +12868,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.80.0 + webpack: 5.84.1 /htmlparser2/6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} @@ -14601,7 +14601,7 @@ packages: resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 18.14.6 + '@types/node': 17.0.45 jest-util: 29.5.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -14878,7 +14878,7 @@ packages: picocolors: 1.0.0 shell-quote: 1.8.0 - /less-loader/10.2.0_less@4.1.2+webpack@5.80.0: + /less-loader/10.2.0_less@4.1.2+webpack@5.84.1: resolution: {integrity: sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -14887,7 +14887,7 @@ packages: dependencies: klona: 2.0.6 less: 4.1.2 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true /less/4.1.2: @@ -15406,24 +15406,24 @@ packages: engines: {node: '>=4'} dev: true - /mini-css-extract-plugin/2.6.1_webpack@5.80.0: + /mini-css-extract-plugin/2.6.1_webpack@5.84.1: resolution: {integrity: sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: schema-utils: 4.0.0 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /mini-css-extract-plugin/2.7.2_webpack@5.80.0: + /mini-css-extract-plugin/2.7.2_webpack@5.84.1: resolution: {integrity: sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: schema-utils: 4.0.0 - webpack: 5.80.0 + webpack: 5.84.1 /mini-svg-data-uri/1.4.4: resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} @@ -16574,7 +16574,7 @@ packages: yaml: 1.10.2 dev: true - /postcss-loader/6.2.1_swzgonjsdqktiiuid5wizzwo3q: + /postcss-loader/6.2.1_3dfy4xrunltrmvdqxe43bb5n5i: resolution: {integrity: sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -16585,10 +16585,10 @@ packages: klona: 2.0.6 postcss: 8.4.12 semver: 7.3.8 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /postcss-loader/7.0.2_s3hlmk3dolibrgzfaoz6qln5l4: + /postcss-loader/7.0.2_fbnjvln7r6fglmt2eqk4kryvee: resolution: {integrity: sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -16599,7 +16599,7 @@ packages: klona: 2.0.6 postcss: 8.4.21 semver: 7.4.0 - webpack: 5.80.0 + webpack: 5.84.1 /postcss-logical/5.0.4_postcss@8.4.12: resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} @@ -18659,7 +18659,7 @@ packages: pure-color: 1.3.0 dev: false - /react-dev-utils/12.0.1_lj5zgxrzaejsnoobor62tojvse: + /react-dev-utils/12.0.1_45cgbvggwmemoiuyekq6eperya: resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} peerDependencies: @@ -18678,7 +18678,7 @@ packages: escape-string-regexp: 4.0.0 filesize: 8.0.7 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.5.3_lj5zgxrzaejsnoobor62tojvse + fork-ts-checker-webpack-plugin: 6.5.3_45cgbvggwmemoiuyekq6eperya global-modules: 2.0.0 globby: 11.1.0 gzip-size: 6.0.0 @@ -18694,7 +18694,7 @@ packages: strip-ansi: 6.0.1 text-table: 0.2.0 typescript: 4.9.5 - webpack: 5.80.0 + webpack: 5.84.1 transitivePeerDependencies: - eslint - supports-color @@ -18792,7 +18792,7 @@ packages: resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==} dev: false - /react-loadable-ssr-addon-v5-slorber/1.0.1_ywamrxzlf7acy6xiopf7dviihu: + /react-loadable-ssr-addon-v5-slorber/1.0.1_2ugo6np7pd3c6frrae7xat3oye: resolution: {integrity: sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==} engines: {node: '>=10.13.0'} peerDependencies: @@ -18801,7 +18801,7 @@ packages: dependencies: '@babel/runtime': 7.21.0 react-loadable: /@docusaurus/react-loadable/5.5.2_react@17.0.2 - webpack: 5.80.0 + webpack: 5.84.1 /react-reconciler/0.27.0_react@18.2.0: resolution: {integrity: sha512-HmMDKciQjYmBRGuuhIaKA1ba/7a+UsM5FzOZsMO2JYHt9Jh8reCb7j1eDC95NOyUlKM9KRyvdx0flBuDvYSBoA==} @@ -19523,7 +19523,7 @@ packages: /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - /sass-loader/12.6.0_sass@1.50.0+webpack@5.80.0: + /sass-loader/12.6.0_sass@1.50.0+webpack@5.84.1: resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -19545,7 +19545,7 @@ packages: klona: 2.0.6 neo-async: 2.6.2 sass: 1.50.0 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true /sass/1.50.0: @@ -20025,14 +20025,14 @@ packages: transitivePeerDependencies: - supports-color - /speed-measure-webpack-plugin/1.5.0_webpack@5.80.0: + /speed-measure-webpack-plugin/1.5.0_webpack@5.84.1: resolution: {integrity: sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==} engines: {node: '>=6.0.0'} peerDependencies: webpack: ^1 || ^2 || ^3 || ^4 || ^5 dependencies: chalk: 4.1.2 - webpack: 5.80.0 + webpack: 5.84.1 dev: true /split-on-first/1.1.0: @@ -20584,7 +20584,7 @@ packages: supports-hyperlinks: 2.3.0 dev: true - /terser-webpack-plugin/5.3.5_fv3yzmivxd7tymwkolgidnil2y: + /terser-webpack-plugin/5.3.5_7cdromi7vlvbcgznwedalnlgea: resolution: {integrity: sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20607,10 +20607,10 @@ packages: schema-utils: 3.1.1 serialize-javascript: 6.0.1 terser: 5.14.2 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru dev: true - /terser-webpack-plugin/5.3.6_webpack@5.80.0: + /terser-webpack-plugin/5.3.6_webpack@5.84.1: resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20628,12 +20628,12 @@ packages: dependencies: '@jridgewell/trace-mapping': 0.3.17 jest-worker: 27.5.1 - schema-utils: 3.1.1 + schema-utils: 3.1.2 serialize-javascript: 6.0.1 terser: 5.16.5 - webpack: 5.80.0 + webpack: 5.84.1 - /terser-webpack-plugin/5.3.7_fv3yzmivxd7tymwkolgidnil2y: + /terser-webpack-plugin/5.3.7_7cdromi7vlvbcgznwedalnlgea: resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20656,9 +20656,9 @@ packages: schema-utils: 3.1.2 serialize-javascript: 6.0.1 terser: 5.16.5 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru - /terser-webpack-plugin/5.3.7_qo4emlfatbstozv5cog53p7ftu: + /terser-webpack-plugin/5.3.7_phbgr5tcaivbu7bfktl2bxlyea: resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20680,10 +20680,10 @@ packages: schema-utils: 3.1.2 serialize-javascript: 6.0.1 terser: 5.16.5 - webpack: 5.80.0_esbuild@0.17.16 + webpack: 5.84.1_esbuild@0.17.16 dev: true - /terser-webpack-plugin/5.3.7_webpack@5.80.0: + /terser-webpack-plugin/5.3.7_webpack@5.84.1: resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20704,7 +20704,7 @@ packages: schema-utils: 3.1.2 serialize-javascript: 6.0.1 terser: 5.16.5 - webpack: 5.80.0 + webpack: 5.84.1 /terser/5.14.2: resolution: {integrity: sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==} @@ -21285,7 +21285,7 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - /unplugin/0.9.5_qo4emlfatbstozv5cog53p7ftu: + /unplugin/0.9.5_phbgr5tcaivbu7bfktl2bxlyea: resolution: {integrity: sha512-luraheyfxwtvkvHpsOvMNv7IjLdORTWKZp0gWYNHGLi2ImON3iIZOj464qEyyEwLA/EMt12fC415HW9zRpOfTg==} peerDependencies: esbuild: '>=0.13' @@ -21305,7 +21305,7 @@ packages: acorn: 8.8.2 chokidar: 3.5.3 esbuild: 0.17.16 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.6 dev: true @@ -21365,7 +21365,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: false - /url-loader/4.1.1_7bg3ggibzh37grw2cvdpkymkue: + /url-loader/4.1.1_n75qkb3chalwy3a2cntr7jzsaq: resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -21375,11 +21375,11 @@ packages: file-loader: optional: true dependencies: - file-loader: 6.2.0_webpack@5.80.0 + file-loader: 6.2.0_webpack@5.84.1 loader-utils: 2.0.4 mime-types: 2.1.35 schema-utils: 3.1.1 - webpack: 5.80.0 + webpack: 5.84.1 /url-parse-lax/3.0.0: resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==} @@ -21871,7 +21871,7 @@ packages: schema-utils: 4.0.0 dev: true - /webpack-dev-middleware/5.3.3_webpack@5.80.0: + /webpack-dev-middleware/5.3.3_webpack@5.84.1: resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -21882,9 +21882,9 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.0.0 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru - /webpack-dev-server/4.11.1_webpack@5.80.0: + /webpack-dev-server/4.11.1_webpack@5.84.1: resolution: {integrity: sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==} engines: {node: '>= 12.13.0'} hasBin: true @@ -21922,8 +21922,8 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.80.0_w34or7orauknzckzea4nxxqrru - webpack-dev-middleware: 5.3.3_webpack@5.80.0 + webpack: 5.84.1_esbuild@0.17.16 + webpack-dev-middleware: 5.3.3_webpack@5.84.1 ws: 8.12.1 transitivePeerDependencies: - bufferutil @@ -21982,8 +21982,8 @@ packages: - utf-8-validate dev: true - /webpack-dev-server/4.13.2_debug@4.3.4+webpack@5.80.0: - resolution: {integrity: sha512-5i6TrGBRxG4vnfDpB6qSQGfnB6skGBXNL5/542w2uRGLimX6qeE5BQMLrzIC3JYV/xlGOv+s+hTleI9AZKUQNw==} + /webpack-dev-server/4.15.0_debug@4.3.4+webpack@5.84.1: + resolution: {integrity: sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==} engines: {node: '>= 12.13.0'} hasBin: true peerDependencies: @@ -22023,8 +22023,8 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.80.0 - webpack-dev-middleware: 5.3.3_webpack@5.80.0 + webpack: 5.84.1 + webpack-dev-middleware: 5.3.3_webpack@5.84.1 ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -22033,8 +22033,8 @@ packages: - utf-8-validate dev: false - /webpack-dev-server/4.13.2_webpack@5.80.0: - resolution: {integrity: sha512-5i6TrGBRxG4vnfDpB6qSQGfnB6skGBXNL5/542w2uRGLimX6qeE5BQMLrzIC3JYV/xlGOv+s+hTleI9AZKUQNw==} + /webpack-dev-server/4.15.0_webpack@5.84.1: + resolution: {integrity: sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==} engines: {node: '>= 12.13.0'} hasBin: true peerDependencies: @@ -22074,8 +22074,8 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.80.0 - webpack-dev-middleware: 5.3.3_webpack@5.80.0 + webpack: 5.84.1_w34or7orauknzckzea4nxxqrru + webpack-dev-middleware: 5.3.3_webpack@5.84.1 ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -22106,8 +22106,8 @@ packages: resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==} dev: true - /webpack/5.80.0: - resolution: {integrity: sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==} + /webpack/5.84.1: + resolution: {integrity: sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -22122,10 +22122,10 @@ packages: '@webassemblyjs/wasm-edit': 1.11.5 '@webassemblyjs/wasm-parser': 1.11.5 acorn: 8.8.2 - acorn-import-assertions: 1.8.0_acorn@8.8.2 + acorn-import-assertions: 1.9.0_acorn@8.8.2 browserslist: 4.21.5 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.13.0 + enhanced-resolve: 5.14.1 es-module-lexer: 1.2.1 eslint-scope: 5.1.1 events: 3.3.0 @@ -22137,7 +22137,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.7_webpack@5.80.0 + terser-webpack-plugin: 5.3.7_webpack@5.84.1 watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -22145,8 +22145,8 @@ packages: - esbuild - uglify-js - /webpack/5.80.0_esbuild@0.17.16: - resolution: {integrity: sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==} + /webpack/5.84.1_esbuild@0.17.16: + resolution: {integrity: sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -22161,10 +22161,10 @@ packages: '@webassemblyjs/wasm-edit': 1.11.5 '@webassemblyjs/wasm-parser': 1.11.5 acorn: 8.8.2 - acorn-import-assertions: 1.8.0_acorn@8.8.2 + acorn-import-assertions: 1.9.0_acorn@8.8.2 browserslist: 4.21.5 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.13.0 + enhanced-resolve: 5.14.1 es-module-lexer: 1.2.1 eslint-scope: 5.1.1 events: 3.3.0 @@ -22176,7 +22176,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.7_qo4emlfatbstozv5cog53p7ftu + terser-webpack-plugin: 5.3.7_phbgr5tcaivbu7bfktl2bxlyea watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -22185,8 +22185,8 @@ packages: - uglify-js dev: true - /webpack/5.80.0_w34or7orauknzckzea4nxxqrru: - resolution: {integrity: sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==} + /webpack/5.84.1_w34or7orauknzckzea4nxxqrru: + resolution: {integrity: sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -22201,10 +22201,10 @@ packages: '@webassemblyjs/wasm-edit': 1.11.5 '@webassemblyjs/wasm-parser': 1.11.5 acorn: 8.8.2 - acorn-import-assertions: 1.8.0_acorn@8.8.2 + acorn-import-assertions: 1.9.0_acorn@8.8.2 browserslist: 4.21.5 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.13.0 + enhanced-resolve: 5.14.1 es-module-lexer: 1.2.1 eslint-scope: 5.1.1 events: 3.3.0 @@ -22216,7 +22216,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.7_fv3yzmivxd7tymwkolgidnil2y + terser-webpack-plugin: 5.3.7_7cdromi7vlvbcgznwedalnlgea watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -22224,7 +22224,7 @@ packages: - esbuild - uglify-js - /webpackbar/5.0.2_webpack@5.80.0: + /webpackbar/5.0.2_webpack@5.84.1: resolution: {integrity: sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==} engines: {node: '>=12'} peerDependencies: @@ -22234,7 +22234,7 @@ packages: consola: 2.15.3 pretty-time: 1.1.0 std-env: 3.3.2 - webpack: 5.80.0 + webpack: 5.84.1 /websocket-driver/0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} diff --git a/website/package.json b/website/package.json index 66ea80dd6..33c46783b 100644 --- a/website/package.json +++ b/website/package.json @@ -36,7 +36,7 @@ "glob": "^7.2.3", "gray-matter": "^4.0.3", "typescript": "^4.9.5", - "webpack": "^5.80.0" + "webpack": "^5.84.1" }, "browserslist": { "production": [