diff --git a/.pnp.cjs b/.pnp.cjs index 35494fc9b..02e28a572 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -7814,6 +7814,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@swc/core-android-arm64", "npm:1.3.11"],\ ["@syuilo/aiscript", "npm:0.11.1"],\ ["@tensorflow/tfjs", "npm:4.9.0"],\ + ["@tensorflow/tfjs-backend-webgl", "virtual:99af600b5f993391adb48d4b9c27bfd77e64414400b06f57d48f61f2c8b7b1d8e4a6f9d9e027097e8dcc1a397c244d6d04544fe28c4d03aa7a307b289e973cd3#npm:4.9.0"],\ + ["@tensorflow/tfjs-core", "npm:4.9.0"],\ ["@tensorflow/tfjs-node", "npm:3.21.1"],\ ["@types/adm-zip", "npm:0.5.0"],\ ["@types/bcryptjs", "npm:2.4.2"],\ diff --git a/.yarnrc.yml b/.yarnrc.yml index 86a0b7e44..c7e9d8329 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,3 +1,6 @@ +nodeLinker: pnp +pnpMode: loose + plugins: - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs spec: "@yarnpkg/plugin-workspace-tools" diff --git a/packages/backend/package.json b/packages/backend/package.json index fe21678f5..8f52e033f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -38,6 +38,8 @@ "@sinonjs/fake-timers": "9.1.2", "@syuilo/aiscript": "0.11.1", "@tensorflow/tfjs": "^4.2.0", + "@tensorflow/tfjs-backend-webgl": "^4.2.0", + "@tensorflow/tfjs-core": "^4.2.0", "adm-zip": "^0.5.10", "ajv": "8.12.0", "archiver": "5.3.1", diff --git a/packages/backend/src/mfm/from-html.ts b/packages/backend/src/mfm/from-html.ts index 7c956e905..f5d6d26df 100644 --- a/packages/backend/src/mfm/from-html.ts +++ b/packages/backend/src/mfm/from-html.ts @@ -1,8 +1,6 @@ import { URL } from "node:url"; import * as parse5 from "parse5"; -import * as TreeAdapter from "../../node_modules/parse5/dist/tree-adapters/default.js"; - -const treeAdapter = TreeAdapter.defaultTreeAdapter; +import { defaultTreeAdapter as treeAdapter } from "parse5"; const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/; const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/; diff --git a/yarn.lock b/yarn.lock index e0dea8b93..5447f0618 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2750,7 +2750,7 @@ __metadata: languageName: node linkType: hard -"@tensorflow/tfjs-backend-webgl@npm:4.9.0": +"@tensorflow/tfjs-backend-webgl@npm:4.9.0, @tensorflow/tfjs-backend-webgl@npm:^4.2.0": version: 4.9.0 resolution: "@tensorflow/tfjs-backend-webgl@npm:4.9.0" dependencies: @@ -2799,7 +2799,7 @@ __metadata: languageName: node linkType: hard -"@tensorflow/tfjs-core@npm:4.9.0": +"@tensorflow/tfjs-core@npm:4.9.0, @tensorflow/tfjs-core@npm:^4.2.0": version: 4.9.0 resolution: "@tensorflow/tfjs-core@npm:4.9.0" dependencies: @@ -5845,6 +5845,8 @@ __metadata: "@swc/core-android-arm64": 1.3.11 "@syuilo/aiscript": 0.11.1 "@tensorflow/tfjs": ^4.2.0 + "@tensorflow/tfjs-backend-webgl": ^4.2.0 + "@tensorflow/tfjs-core": ^4.2.0 "@tensorflow/tfjs-node": 3.21.1 "@types/adm-zip": ^0.5.0 "@types/bcryptjs": 2.4.2