Drop using memex-url-utils submodule

WorldBrain · Feb 26, 2024 · 270f8e2 · 270f8e2
1 parent 62071f5
commit 270f8e2
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 14 deletions.
diff --git 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 = [email protected]:WorldBrain/memex-common.git

diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/external/@worldbrain/memex-url-utils b/external/@worldbrain/memex-url-utils
diff --git 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
@@ -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
@@ -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
@@ -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",