diff --git a/internals/common/src/models.ts b/internals/common/src/models.ts index f2694b808..bffc3938e 100644 --- a/internals/common/src/models.ts +++ b/internals/common/src/models.ts @@ -60,7 +60,12 @@ const getAllAvailableModels = async (packageName: string): Promise k[0] !== '.').map(([key, value]) => { + return packageJSONExports.filter(k => { + if (packageJSONExports.length > 1) { + return k[0] !== '.'; + } + return true; + }).map(([key, value]) => { const umdName = umdNames[key]; if (umdName === undefined) { throw new Error(`No UMD name defined for ${packageName}/umd-names.json for ${key}`); diff --git a/internals/test-runner/src/ClientsideTestRunner.ts b/internals/test-runner/src/ClientsideTestRunner.ts index ac9e40326..b16487ed5 100644 --- a/internals/test-runner/src/ClientsideTestRunner.ts +++ b/internals/test-runner/src/ClientsideTestRunner.ts @@ -148,11 +148,11 @@ export class ClientsideTestRunner { * Utility methods */ - private _getLogMessage (msg: string) { + private _getLogMessage(msg: string) { return [msg, this._name].filter(Boolean).join(' | '); } - private _warn (msg: string) { + private _warn(msg: string) { if (this.showWarnings) { console.warn(this._getLogMessage(msg));// skipcq: JS-0002 } @@ -219,9 +219,16 @@ export class ClientsideTestRunner { } public async startBrowser() { + // launch handles launching an instance and then connecting to it this.browser = await launch({ headless: 'new', + protocolTimeout: 180_000 * 2, }); + + // connect is for connecting to an already running instance + // this.browser = await connect({ + + // }); } private _attachLogger() { @@ -240,9 +247,9 @@ export class ClientsideTestRunner { console.log(`[PAGE][response][${status}] ${response.url()}`); } }) - .on('requestfailed', request => { - console.log(`[PAGE][requestfailed][${request.failure()?.errorText}] ${request.url()}`); - }) + .on('requestfailed', request => { + console.log(`[PAGE][requestfailed][${request.failure()?.errorText}] ${request.url()}`); + }) } } diff --git a/package.json b/package.json index 5bca6f5ad..179ba0e03 100644 --- a/package.json +++ b/package.json @@ -289,8 +289,8 @@ "./packages/upscalerjs:build:browser", "build:models:esm", "build:models:umd", - "bundle:esbuild", "bundle:webpack", + "bundle:esbuild", "bundle:umd" ] }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 21bdbecaf..192c57602 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -842,12 +842,9 @@ importers: specifier: workspace:* version: link:../upscalerjs - tmp/bundlers/node: + tmp/bundlers/esbuild: dependencies: - '@tensorflow/tfjs-node': - specifier: ~4.11.0 - version: 4.11.0(seedrandom@3.0.5) - '@tensorflow/tfjs-node-gpu': + '@tensorflow/tfjs': specifier: ~4.11.0 version: 4.11.0(seedrandom@3.0.5) '@upscalerjs/default-model': @@ -872,12 +869,15 @@ importers: specifier: workspace:* version: link:../../../packages/upscalerjs devDependencies: + '@babel/plugin-transform-modules-commonjs': + specifier: 7.22.5 + version: 7.22.5(@babel/core@7.23.2) + '@babel/preset-typescript': + specifier: 7.22.5 + version: 7.22.5(@babel/core@7.23.2) seedrandom: specifier: 3.0.5 version: 3.0.5 - tslib: - specifier: 2.6.1 - version: 2.6.1 packages: @@ -1349,6 +1349,16 @@ packages: '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-transform-optional-chaining': 7.23.3(@babel/core@7.23.2) + /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3(@babel/core@7.23.2): + resolution: {integrity: sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.23.2 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-proposal-object-rest-spread@7.12.1(@babel/core@7.12.9): resolution: {integrity: sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==} peerDependencies: @@ -1785,6 +1795,18 @@ packages: '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.2) '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.23.2): + resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.2 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.2) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + dev: true + /@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.23.2): resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==} engines: {node: '>=6.9.0'} @@ -1796,6 +1818,17 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-simple-access': 7.22.5 + /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.2): + resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.2 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.2) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.2): resolution: {integrity: sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==} engines: {node: '>=6.9.0'} @@ -2221,6 +2254,97 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color + dev: true + + /@babel/preset-env@7.23.3(@babel/core@7.23.2): + resolution: {integrity: sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.23.3 + '@babel/core': 7.23.2 + '@babel/helper-compilation-targets': 7.22.15 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-option': 7.22.15 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.2) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.2) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.2) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.2) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.2) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.2) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.2) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.2) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.2) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.2) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.2) + '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-async-generator-functions': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-block-scoping': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-class-static-block': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-classes': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-dynamic-import': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-export-namespace-from': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-for-of': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-json-strings': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-logical-assignment-operators': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.2) + '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-nullish-coalescing-operator': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-numeric-separator': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-object-rest-spread': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-optional-catch-binding': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-optional-chaining': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-private-property-in-object': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.2) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.2) + babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.23.2) + babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.23.2) + babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.23.2) + core-js-compat: 3.33.2 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.2): resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} @@ -2246,6 +2370,20 @@ packages: '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.2) '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.2) + /@babel/preset-typescript@7.22.5(@babel/core@7.23.2): + resolution: {integrity: sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.2 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-option': 7.22.15 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.2) + '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.2) + '@babel/plugin-transform-typescript': 7.23.3(@babel/core@7.23.2) + dev: true + /@babel/preset-typescript@7.23.2(@babel/core@7.23.2): resolution: {integrity: sha512-u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA==} engines: {node: '>=6.9.0'} @@ -2432,7 +2570,7 @@ packages: '@babel/generator': 7.23.3 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.2) '@babel/plugin-transform-runtime': 7.23.3(@babel/core@7.23.2) - '@babel/preset-env': 7.23.2(@babel/core@7.23.2) + '@babel/preset-env': 7.23.3(@babel/core@7.23.2) '@babel/preset-react': 7.23.3(@babel/core@7.23.2) '@babel/preset-typescript': 7.23.2(@babel/core@7.23.2) '@babel/runtime': 7.23.2 @@ -2448,7 +2586,7 @@ packages: '@slorber/static-site-generator-webpack-plugin': 4.0.7 '@svgr/webpack': 6.5.1 autoprefixer: 10.4.16(postcss@8.4.31) - babel-loader: 8.3.0(@babel/core@7.23.2)(webpack@5.89.0) + babel-loader: 8.3.0(@babel/core@7.23.2)(webpack@5.88.2) babel-plugin-dynamic-import-node: 2.3.3 boxen: 6.2.1 chalk: 4.1.2 @@ -2457,33 +2595,33 @@ packages: cli-table3: 0.6.3 combine-promises: 1.2.0 commander: 5.1.0 - copy-webpack-plugin: 11.0.0(webpack@5.89.0) + copy-webpack-plugin: 11.0.0(webpack@5.88.2) core-js: 3.29.1 - css-loader: 6.8.1(webpack@5.89.0) - css-minimizer-webpack-plugin: 4.2.2(clean-css@5.3.2)(esbuild@0.19.2)(webpack@5.89.0) + css-loader: 6.8.1(webpack@5.88.2) + css-minimizer-webpack-plugin: 4.2.2(clean-css@5.3.2)(esbuild@0.19.2)(webpack@5.88.2) cssnano: 5.1.15(postcss@8.4.31) del: 6.1.1 detect-port: 1.5.1 escape-html: 1.0.3 eta: 2.2.0 - file-loader: 6.2.0(webpack@5.89.0) + file-loader: 6.2.0(webpack@5.88.2) fs-extra: 10.1.0 html-minifier-terser: 6.1.0 html-tags: 3.3.1 - html-webpack-plugin: 5.5.3(webpack@5.89.0) + html-webpack-plugin: 5.5.3(webpack@5.88.2) import-fresh: 3.3.0 leven: 3.1.0 lodash: 4.17.21 - mini-css-extract-plugin: 2.7.6(webpack@5.89.0) + mini-css-extract-plugin: 2.7.6(webpack@5.88.2) postcss: 8.4.31 - postcss-loader: 7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.89.0) + postcss-loader: 7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.88.2) prompts: 2.4.2 react: 18.2.0 - react-dev-utils: 12.0.1(eslint@8.47.0)(typescript@5.2.2)(webpack@5.89.0) + react-dev-utils: 12.0.1(eslint@8.47.0)(typescript@5.2.2)(webpack@5.88.2) react-dom: 18.2.0(react@18.2.0) react-helmet-async: 1.3.0(react-dom@18.2.0)(react@18.2.0) react-loadable: /@docusaurus/react-loadable@5.5.2(react@18.2.0) - react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@5.5.2)(webpack@5.89.0) + react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@5.5.2)(webpack@5.88.2) react-router: 5.3.4(react@18.2.0) react-router-config: 5.1.1(react-router@5.3.4)(react@18.2.0) react-router-dom: 5.3.4(react@18.2.0) @@ -2491,16 +2629,16 @@ packages: semver: 7.5.4 serve-handler: 6.1.5 shelljs: 0.8.5 - terser-webpack-plugin: 5.3.9(esbuild@0.19.2)(uglify-js@3.17.4)(webpack@5.89.0) + terser-webpack-plugin: 5.3.9(esbuild@0.19.2)(uglify-js@3.17.4)(webpack@5.88.2) tslib: 2.6.1 update-notifier: 5.1.0 - url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.89.0) + url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.88.2) wait-on: 6.0.1 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) webpack-bundle-analyzer: 4.10.0 - webpack-dev-server: 4.15.1(webpack@5.89.0) + webpack-dev-server: 4.15.1(webpack@5.88.2) webpack-merge: 5.10.0 - webpackbar: 5.0.2(webpack@5.89.0) + webpackbar: 5.0.2(webpack@5.88.2) transitivePeerDependencies: - '@docusaurus/types' - '@parcel/css' @@ -2548,7 +2686,7 @@ packages: '@docusaurus/utils': 2.4.3(@docusaurus/types@2.4.3)(esbuild@0.19.2)(uglify-js@3.17.4) '@mdx-js/mdx': 1.6.22 escape-html: 1.0.3 - file-loader: 6.2.0(webpack@5.89.0) + file-loader: 6.2.0(webpack@5.88.2) fs-extra: 10.1.0 image-size: 1.0.2 mdast-util-to-string: 2.0.0 @@ -2559,8 +2697,8 @@ packages: tslib: 2.6.1 unified: 9.2.2 unist-util-visit: 2.0.3 - url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.89.0) - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.88.2) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - '@docusaurus/types' - '@swc/core' @@ -2615,7 +2753,7 @@ packages: tslib: 2.6.1 unist-util-visit: 2.0.3 utility-types: 3.10.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -2658,7 +2796,7 @@ packages: react-dom: 18.2.0(react@18.2.0) tslib: 2.6.1 utility-types: 3.10.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -2693,7 +2831,7 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) tslib: 2.6.1 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -3094,7 +3232,7 @@ packages: react-dom: 18.2.0(react@18.2.0) react-helmet-async: 1.3.0(react-dom@18.2.0)(react@18.2.0) utility-types: 3.10.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) webpack-merge: 5.10.0 transitivePeerDependencies: - '@swc/core' @@ -3144,7 +3282,7 @@ packages: '@docusaurus/types': 2.4.3(esbuild@0.19.2)(react-dom@18.2.0)(react@18.2.0)(uglify-js@3.17.4) '@svgr/webpack': 6.5.1 escape-string-regexp: 4.0.0 - file-loader: 6.2.0(webpack@5.89.0) + file-loader: 6.2.0(webpack@5.88.2) fs-extra: 10.1.0 github-slugger: 1.5.0 globby: 11.1.0 @@ -3155,8 +3293,8 @@ packages: resolve-pathname: 3.0.0 shelljs: 0.8.5 tslib: 2.6.1 - url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.89.0) - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.88.2) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - '@swc/core' - esbuild @@ -4707,7 +4845,7 @@ packages: dependencies: '@babel/core': 7.23.2 '@babel/plugin-transform-react-constant-elements': 7.23.3(@babel/core@7.23.2) - '@babel/preset-env': 7.23.2(@babel/core@7.23.2) + '@babel/preset-env': 7.23.3(@babel/core@7.23.2) '@babel/preset-react': 7.23.3(@babel/core@7.23.2) '@babel/preset-typescript': 7.23.2(@babel/core@7.23.2) '@svgr/core': 6.5.1 @@ -4821,6 +4959,7 @@ packages: - encoding - seedrandom - supports-color + dev: true /@tensorflow/tfjs@4.11.0(seedrandom@3.0.5): resolution: {integrity: sha512-s6Vbz3IvMz2zNbH8/VptpRXzkwVjmuzT48esYLXJxMKtTcob4m5Srdxo7B+eJSDrWYkutXruiivaWmihFmu5rA==} @@ -6125,7 +6264,7 @@ packages: - supports-color dev: true - /babel-loader@8.3.0(@babel/core@7.23.2)(webpack@5.89.0): + /babel-loader@8.3.0(@babel/core@7.23.2)(webpack@5.88.2): resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: @@ -6137,7 +6276,7 @@ packages: loader-utils: 2.0.4 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /babel-plugin-add-module-exports@1.0.4: resolution: {integrity: sha512-g+8yxHUZ60RcyaUpfNzy56OtWW+x9cyEe9j+CranqLiqbju2yf/Cy6ZtYK40EZxtrdHllzlVZgLmcOUCTlJ7Jg==} @@ -7099,7 +7238,7 @@ packages: engines: {node: '>=12'} dev: false - /copy-webpack-plugin@11.0.0(webpack@5.89.0): + /copy-webpack-plugin@11.0.0(webpack@5.88.2): resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -7111,7 +7250,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.1 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /core-js-compat@3.33.2: resolution: {integrity: sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==} @@ -7309,7 +7448,7 @@ packages: dependencies: postcss: 8.4.31 - /css-loader@6.8.1(webpack@5.89.0): + /css-loader@6.8.1(webpack@5.88.2): resolution: {integrity: sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -7323,9 +7462,9 @@ packages: postcss-modules-values: 4.0.0(postcss@8.4.31) postcss-value-parser: 4.2.0 semver: 7.5.4 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) - /css-minimizer-webpack-plugin@4.2.2(clean-css@5.3.2)(esbuild@0.19.2)(webpack@5.89.0): + /css-minimizer-webpack-plugin@4.2.2(clean-css@5.3.2)(esbuild@0.19.2)(webpack@5.88.2): resolution: {integrity: sha512-s3Of/4jKfw1Hj9CxEO1E5oXhQAxlayuHO2y/ML+C6I9sQ7FdzfEV6QgMLN3vI+qFsjJGIAFLKtQK7t8BOXAIyA==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -7358,7 +7497,7 @@ packages: schema-utils: 4.2.0 serialize-javascript: 6.0.1 source-map: 0.6.1 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} @@ -8546,7 +8685,7 @@ packages: dependencies: flat-cache: 3.2.0 - /file-loader@6.2.0(webpack@5.89.0): + /file-loader@6.2.0(webpack@5.88.2): resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -8554,7 +8693,7 @@ packages: dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /file-selector@0.6.0: resolution: {integrity: sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==} @@ -8677,7 +8816,7 @@ packages: signal-exit: 4.1.0 dev: true - /fork-ts-checker-webpack-plugin@6.5.3(eslint@8.47.0)(typescript@5.2.2)(webpack@5.89.0): + /fork-ts-checker-webpack-plugin@6.5.3(eslint@8.47.0)(typescript@5.2.2)(webpack@5.88.2): resolution: {integrity: sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: @@ -8706,7 +8845,7 @@ packages: semver: 7.5.4 tapable: 1.1.3 typescript: 5.2.2 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /form-data@4.0.0: resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} @@ -9255,6 +9394,19 @@ packages: /html-void-elements@1.0.5: resolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==} + /html-webpack-plugin@5.5.3(webpack@5.88.2): + resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} + engines: {node: '>=10.13.0'} + peerDependencies: + webpack: ^5.20.0 + dependencies: + '@types/html-minifier-terser': 6.1.0 + html-minifier-terser: 6.1.0 + lodash: 4.17.21 + pretty-error: 4.0.0 + tapable: 2.2.1 + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) + /html-webpack-plugin@5.5.3(webpack@5.89.0): resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} engines: {node: '>=10.13.0'} @@ -9267,6 +9419,7 @@ packages: pretty-error: 4.0.0 tapable: 2.2.1 webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + dev: false /htmlparser2@6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} @@ -11140,14 +11293,14 @@ packages: resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==} engines: {node: '>=4'} - /mini-css-extract-plugin@2.7.6(webpack@5.89.0): + /mini-css-extract-plugin@2.7.6(webpack@5.88.2): resolution: {integrity: sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: schema-utils: 4.2.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /miniflare@3.20231025.0: resolution: {integrity: sha512-pFcr2BRaGIQ26UfdDo8BMJ6kkd/Jo/FkQ/4K7UG/eORlDepsLrR/sTJddcSSIGl07MA+MGjhzopFTPpFskkS+g==} @@ -11246,14 +11399,12 @@ packages: /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} - hasBin: true dependencies: minimist: 1.2.8 /mkdirp@1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} - hasBin: true /mlly@1.4.2: resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} @@ -11437,7 +11588,6 @@ packages: /nopt@1.0.10: resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} - hasBin: true dependencies: abbrev: 1.1.1 dev: true @@ -11445,7 +11595,6 @@ packages: /nopt@5.0.0: resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} engines: {node: '>=6'} - hasBin: true dependencies: abbrev: 1.1.1 @@ -12077,7 +12226,7 @@ packages: postcss: 8.4.31 postcss-selector-parser: 6.0.13 - /postcss-loader@7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.89.0): + /postcss-loader@7.3.3(postcss@8.4.31)(typescript@5.2.2)(webpack@5.88.2): resolution: {integrity: sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -12088,7 +12237,7 @@ packages: jiti: 1.21.0 postcss: 8.4.31 semver: 7.5.4 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - typescript @@ -12669,7 +12818,7 @@ packages: react: 18.2.0 dev: false - /react-dev-utils@12.0.1(eslint@8.47.0)(typescript@5.2.2)(webpack@5.89.0): + /react-dev-utils@12.0.1(eslint@8.47.0)(typescript@5.2.2)(webpack@5.88.2): resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} peerDependencies: @@ -12688,7 +12837,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(eslint@8.47.0)(typescript@5.2.2)(webpack@5.89.0) + fork-ts-checker-webpack-plugin: 6.5.3(eslint@8.47.0)(typescript@5.2.2)(webpack@5.88.2) global-modules: 2.0.0 globby: 11.1.0 gzip-size: 6.0.0 @@ -12704,7 +12853,7 @@ packages: strip-ansi: 6.0.1 text-table: 0.2.0 typescript: 5.2.2 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) transitivePeerDependencies: - eslint - supports-color @@ -12795,7 +12944,7 @@ packages: resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==} dev: false - /react-loadable-ssr-addon-v5-slorber@1.0.1(@docusaurus/react-loadable@5.5.2)(webpack@5.89.0): + /react-loadable-ssr-addon-v5-slorber@1.0.1(@docusaurus/react-loadable@5.5.2)(webpack@5.88.2): resolution: {integrity: sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==} engines: {node: '>=10.13.0'} peerDependencies: @@ -12804,7 +12953,7 @@ packages: dependencies: '@babel/runtime': 7.23.2 react-loadable: /@docusaurus/react-loadable@5.5.2(react@18.2.0) - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /react-loading@2.0.3(prop-types@15.8.1)(react@18.2.0): resolution: {integrity: sha512-Vdqy79zq+bpeWJqC+xjltUjuGApyoItPgL0vgVfcJHhqwU7bAMKzysfGW/ADu6i0z0JiOCRJjo+IkFNkRNbA3A==} @@ -13205,7 +13354,6 @@ packages: /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} - hasBin: true dependencies: glob: 7.2.3 @@ -14096,6 +14244,31 @@ packages: unique-string: 3.0.0 dev: true + /terser-webpack-plugin@5.3.9(esbuild@0.19.2)(uglify-js@3.17.4)(webpack@5.88.2): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.20 + esbuild: 0.19.2 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.24.0 + uglify-js: 3.17.4 + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) + /terser-webpack-plugin@5.3.9(esbuild@0.19.2)(uglify-js@3.17.4)(webpack@5.89.0): resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} engines: {node: '>= 10.13.0'} @@ -14742,7 +14915,7 @@ packages: dependencies: punycode: 2.3.1 - /url-loader@4.1.1(file-loader@6.2.0)(webpack@5.89.0): + /url-loader@4.1.1(file-loader@6.2.0)(webpack@5.88.2): resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -14752,11 +14925,11 @@ packages: file-loader: optional: true dependencies: - file-loader: 6.2.0(webpack@5.89.0) + file-loader: 6.2.0(webpack@5.88.2) loader-utils: 2.0.4 mime-types: 2.1.35 schema-utils: 3.3.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /url-parse-lax@3.0.0: resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==} @@ -15122,7 +15295,7 @@ packages: - bufferutil - utf-8-validate - /webpack-dev-middleware@5.3.3(webpack@5.89.0): + /webpack-dev-middleware@5.3.3(webpack@5.88.2): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -15133,9 +15306,9 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) - /webpack-dev-server@4.15.1(webpack@5.89.0): + /webpack-dev-server@4.15.1(webpack@5.88.2): resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -15175,8 +15348,8 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) - webpack-dev-middleware: 5.3.3(webpack@5.89.0) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) + webpack-dev-middleware: 5.3.3(webpack@5.88.2) ws: 8.14.2 transitivePeerDependencies: - bufferutil @@ -15203,6 +15376,44 @@ packages: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} + /webpack@5.88.2(esbuild@0.19.2)(uglify-js@3.17.4): + resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} + engines: {node: '>=10.13.0'} + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.7 + '@types/estree': 1.0.5 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.11.2 + acorn-import-assertions: 1.9.0(acorn@8.11.2) + browserslist: 4.22.1 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.4.1 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(esbuild@0.19.2)(uglify-js@3.17.4)(webpack@5.88.2) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + /webpack@5.89.0(esbuild@0.19.2)(uglify-js@3.17.4): resolution: {integrity: sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==} engines: {node: '>=10.13.0'} @@ -15241,7 +15452,7 @@ packages: - esbuild - uglify-js - /webpackbar@5.0.2(webpack@5.89.0): + /webpackbar@5.0.2(webpack@5.88.2): resolution: {integrity: sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==} engines: {node: '>=12'} peerDependencies: @@ -15251,7 +15462,7 @@ packages: consola: 2.15.3 pretty-time: 1.1.0 std-env: 3.5.0 - webpack: 5.89.0(esbuild@0.19.2)(uglify-js@3.17.4) + webpack: 5.88.2(esbuild@0.19.2)(uglify-js@3.17.4) /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} diff --git a/test/integration/model/tests/all-models.clientside.mts b/test/integration/model/tests/all-models.clientside.mts index e02fbed71..e7d4703f8 100644 --- a/test/integration/model/tests/all-models.clientside.mts +++ b/test/integration/model/tests/all-models.clientside.mts @@ -8,7 +8,7 @@ import path from 'path'; import { MODELS_DIR } from '@internals/common/constants'; import { ClientsideTestRunner } from '@internals/test-runner/clientside'; import { getPackagesAndModelsForEnvironment, getUMDNames } from '@internals/common/models'; -import { PackageJSONExport, getPackageJSON } from '@internals/common/package-json'; +import { getPackageJSON } from '@internals/common/package-json'; const getEnv = (key: string): string => { const value = process.env[key]; @@ -99,7 +99,9 @@ describe('Clientside model integration tests', () => { }); const packagesWithModels = getPackagesAndModelsForEnvironment('clientside'); - const modelsWithMainUMDs = await Promise.all((await packagesWithModels).map(async ({ packageDirectoryName, modelName, ...rest }) => { + const modelsWithMainUMDs = await Promise.all((await packagesWithModels).filter(m => { + return m.modelName !== '.'; + }).map(async ({ packageDirectoryName, modelName, ...rest }) => { const [ packageJSON, umdNames, @@ -108,7 +110,7 @@ describe('Clientside model integration tests', () => { getUMDNames(path.resolve(MODELS_DIR, packageDirectoryName)), ]); const umdModelDefinition = umdNames[modelName]; - if (typeof umdModelDefinition === 'string') { + if (typeof umdModelDefinition === 'string' && modelName !== '.') { throw new Error(`Expected umdModelDefinition to be an object for ${packageDirectoryName}/${modelName}`) } return { @@ -121,12 +123,11 @@ describe('Clientside model integration tests', () => { modelUMDScriptPath: packageJSON['exports'][modelName].umd, modelUMDIndexName: umdModelDefinition.index, - modelUMDDirectName: umdModelDefinition.direct, ...rest } })); - test.each(modelsWithMainUMDs)('%s (from index)', async ({ packageDirectoryName, modelName, mainUMDName, mainUMDScriptPath, modelUMDIndexName, modelUMDDirectName, ...rest }) => { + test.each(modelsWithMainUMDs)('%s (from index)', async ({ packageDirectoryName, modelName, mainUMDName, mainUMDScriptPath, modelUMDIndexName, }) => { const fixturePath = `${await testRunner.getFixturesServerURL()}/${packageDirectoryName}/test/__fixtures__/fixture.png`; const modelScriptPath = `${await testRunner.getFixturesServerURL()}/${packageDirectoryName}/${mainUMDScriptPath}`; await testRunner.page.evaluate(async ({ modelScriptPath, mainUMDName, modelUMDIndexName }) => { @@ -150,19 +151,44 @@ describe('Clientside model integration tests', () => { expect(result).toMatchImage(FIXTURE_PATH); }); - test.each(modelsWithMainUMDs)('%s (direct)', async ({ modelUMDScriptPath, packageDirectoryName, modelName, mainUMDName, mainUMDScriptPath, modelUMDIndexName, modelUMDDirectName, ...rest }) => { + + const directModels = await Promise.all((await packagesWithModels).filter(m => { + return m; + }).map(async ({ packageDirectoryName, modelName, ...rest }) => { + const [ + packageJSON, + umdNames, + ] = await Promise.all([ + getPackageJSON(path.resolve(MODELS_DIR, packageDirectoryName)), + getUMDNames(path.resolve(MODELS_DIR, packageDirectoryName)), + ]); + const umdModelDefinition = umdNames[modelName]; + if (typeof umdModelDefinition === 'string' && modelName !== '.') { + throw new Error(`Expected umdModelDefinition to be an object for ${packageDirectoryName}/${modelName}`) + } + return { + packageDirectoryName, + // packageJSON, + modelName, + + modelUMDScriptPath: packageJSON['exports'][modelName].umd, + modelUMDDirectName: typeof umdModelDefinition === 'string' ? umdModelDefinition : umdModelDefinition.direct, + ...rest + } + })); + test.each(directModels)('%s (direct)', async ({ modelUMDScriptPath, packageDirectoryName, modelName, modelUMDDirectName, ...rest }) => { const fixturePath = `${await testRunner.getFixturesServerURL()}/${packageDirectoryName}/test/__fixtures__/fixture.png`; const modelScriptPath = `${await testRunner.getFixturesServerURL()}/${packageDirectoryName}/${modelUMDScriptPath}`; - /* await new Promise((resolve) => setTimeout(resolve, 1000)); */ - await testRunner.page.evaluate(async ({ modelScriptPath, fixturePath, modelUMDDirectName, modelName }) => { + // await new Promise((resolve) => setTimeout(resolve, 1000 * 60)); + await testRunner.page.evaluate(async ({ modelScriptPath, modelUMDDirectName }) => { await window['loadScript'](modelScriptPath); const model = window[modelUMDDirectName]; if (!model) { throw new Error(`No model for ${modelUMDDirectName}`); } window['model'] = model; - }, { modelScriptPath, fixturePath, modelUMDDirectName, modelName }); - const result = await testRunner.page.evaluate(async ({ modelScriptPath, fixturePath, modelUMDDirectName, modelName }) => { + }, { modelScriptPath, modelUMDDirectName }); + const result = await testRunner.page.evaluate(async ({ fixturePath, }) => { const upscaler = new window['Upscaler']({ model: window['model'], }); @@ -170,7 +196,7 @@ describe('Clientside model integration tests', () => { patchSize: 64, padding: 2, }); - }, { modelScriptPath, fixturePath, modelUMDDirectName, modelName }); + }, { fixturePath, }); const FIXTURE_PATH = path.resolve(MODELS_DIR, packageDirectoryName, `test/__fixtures__${modelName === 'index' ? '' : `/${modelName}`}`, 'result.png'); expect(result).toMatchImage(FIXTURE_PATH); });