Merge branch 'feature/new-sidebar-state-final' into develop

WorldBrain · Feb 6, 2023 · 1b7ce6d · 1b7ce6d
2 parents 2ad3dd9 + 1c74aa2
commit 1b7ce6d
Show file tree

Hide file tree

Showing 516 changed files with 14,229 additions and 14,873 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,7 @@ local-backup
 *-debug.log
 private/
 .env
-OldVersions/
+OldVersions/
+extension.zip
+
+.yarn
diff --git a/__mocks__/lodash/fp/difference.js b/__mocks__/lodash/fp/difference.js
@@ -1,3 +1,3 @@
-import { difference } from 'lodash'
+import difference from 'lodash/difference'
 
 export default difference
diff --git a/__mocks__/lodash/fp/flatten.js b/__mocks__/lodash/fp/flatten.js
@@ -1,3 +1,3 @@
-import { flatten } from 'lodash'
+import flatten from 'lodash/flatten'
 
 export default flatten
diff --git a/__mocks__/lodash/fp/intersection.js b/__mocks__/lodash/fp/intersection.js
@@ -1,3 +1,3 @@
-import { intersection } from 'lodash'
+import intersection from 'lodash/intersection'
 
 export default intersection
diff --git a/build/loaders.js b/build/loaders.js
@@ -90,7 +90,7 @@ export default ({ mode, context, isCI = false, injectStyles = false }) => {
     const styleLoader = injectStyles ? injectStylesLoader : extractStylesLoader
 
     const main = {
-        test: /\.(j|t)sx?$/,
+        test: /\.c?(j|t)sx?$/,
         include: [
             path.resolve(context, './src'),
             ...Object.values(externalTsModules).map((mod) =>

diff --git a/build/plugins.js b/build/plugins.js
@@ -78,7 +78,7 @@ export default function ({
         new IgnorePlugin(/^\.\/locale$/, /moment$/),
     ]
 
-    if (mode === 'development') {
+    if (mode === 'development' && process.env.NO_CACHE !== 'true') {
         plugins.push(
             new HardSourcePlugin({
                 environmentHash: {

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/external/@worldbrain/storex-backend-sql b/external/@worldbrain/storex-backend-sql
diff --git a/external/@worldbrain/storex-sync b/external/@worldbrain/storex-sync
diff --git a/img/3dots.svg b/img/3dots.svg
diff --git a/img/add.svg b/img/add.svg
diff --git a/img/annotationIllustration.svg b/img/annotationIllustration.svg
diff --git a/img/arrow-up.svg b/img/arrow-up.svg
diff --git a/img/arrow.svg b/img/arrow.svg
diff --git a/img/arrowDown.svg b/img/arrowDown.svg
diff --git a/img/arrowLeft.svg b/img/arrowLeft.svg
diff --git a/img/arrowRight.svg b/img/arrowRight.svg
diff --git a/img/arrowUp.svg b/img/arrowUp.svg
diff --git a/img/atSign.svg b/img/atSign.svg
diff --git a/img/back.svg b/img/back.svg
diff --git a/img/backup.svg b/img/backup.svg
diff --git a/img/blacklist.svg b/img/blacklist.svg
diff --git a/img/blacklist_green.svg b/img/blacklist_green.svg
diff --git a/img/blacklist_red.svg b/img/blacklist_red.svg
diff --git a/img/block.svg b/img/block.svg
diff --git a/img/blockActive.svg b/img/blockActive.svg
diff --git a/img/blueRoundCheck.svg b/img/blueRoundCheck.svg
diff --git a/img/book.svg b/img/book.svg
diff --git a/img/bookmarkRibbon.svg b/img/bookmarkRibbon.svg