diff --git a/.gitmodules b/.gitmodules index 516708a65e..2caf1b0f35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "external/@worldbrain/storex-backend-firestore"] path = external/@worldbrain/storex-backend-firestore url = https://github.com/WorldBrain/storex-backend-firestore.git -[submodule "external/@worldbrain/memex-url-utils"] - path = external/@worldbrain/memex-url-utils - url = https://github.com/WorldBrain/memex-url-utils.git [submodule "external/@worldbrain/memex-common"] path = external/@worldbrain/memex-common url = git@github.com:WorldBrain/memex-common.git diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common index 9ff3c891b3..8fda24c381 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit 9ff3c891b3373b670651b6e681c77105f444bc7c +Subproject commit 8fda24c381793ea3e18d5667c561b7edfe05986f diff --git a/external/@worldbrain/memex-url-utils b/external/@worldbrain/memex-url-utils deleted file mode 160000 index 04cc46d06c..0000000000 --- a/external/@worldbrain/memex-url-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04cc46d06c8f0a8e4a8c6b767d00d3bcbf95ecee diff --git a/src/background-script/index.ts b/src/background-script/index.ts index cff64487fe..1ffe72e6aa 100644 --- a/src/background-script/index.ts +++ b/src/background-script/index.ts @@ -1,6 +1,6 @@ import type Storex from '@worldbrain/storex' import type { Runtime, Storage, Tabs } from 'webextension-polyfill' -import type { URLNormalizer } from '@worldbrain/memex-url-utils' +import type { URLNormalizer } from '@worldbrain/memex-common/lib/url-utils/normalize/types' import * as utils from './utils' import { makeRemotelyCallable, runInTab } from '../util/webextensionRPC' diff --git a/src/background-script/quick-and-dirty-migrations/index.ts b/src/background-script/quick-and-dirty-migrations/index.ts index d1ad72e6d1..d75b365af4 100644 --- a/src/background-script/quick-and-dirty-migrations/index.ts +++ b/src/background-script/quick-and-dirty-migrations/index.ts @@ -1,7 +1,7 @@ import type Dexie from 'dexie' import type Storex from '@worldbrain/storex' import type { Storage } from 'webextension-polyfill' -import type { URLNormalizer } from '@worldbrain/memex-url-utils' +import type { URLNormalizer } from '@worldbrain/memex-common/lib/url-utils/normalize/types' import { SPECIAL_LIST_NAMES, SPECIAL_LIST_IDS, diff --git a/tsconfig.json b/tsconfig.json index 156e0645b1..b587537cf8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -88,12 +88,6 @@ "@worldbrain/storex-sync/lib/*": [ "external/@worldbrain/storex-sync/ts/*" ], - "@worldbrain/memex-url-utils": [ - "external/@worldbrain/memex-url-utils/ts" - ], - "@worldbrain/memex-url-utils/lib/*": [ - "external/@worldbrain/memex-url-utils/ts/*" - ], "user-logic": ["external/user-logic/ts"], "user-logic/lib/*": ["external/user-logic/ts/*"], "ui-logic-core": ["external/ui-logic/packages/ui-logic-core/ts"], diff --git a/tslint.json b/tslint.json index b3f5de2acd..3a1479cb23 100644 --- a/tslint.json +++ b/tslint.json @@ -45,7 +45,6 @@ "@worldbrain/storex-pattern-modules", "@worldbrain/storex-middleware-change-watcher", "@worldbrain/storex-hub", - "@worldbrain/memex-url-utils", "@worldbrain/memex-stemmer", "@worldbrain/memex-storage", "@worldbrain/memex-common",