Merge branch 'master' into replace-yomichan

yomidevs · Nov 12, 2023 · 784dcd9 · 784dcd9
2 parents 9ab8f27 + f263e99
commit 784dcd9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,6 @@
         "source.fixAll.eslint": true,
     },
     "eslint.format.enable": true,
+    "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
     "javascript.preferences.importModuleSpecifierEnding": "js",
 }
diff --git a/dev/lib/dexie-export-import.js b/dev/lib/dexie-export-import.js
diff --git a/dev/lib/dexie.js b/dev/lib/dexie.js
@@ -14,4 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-export * from 'dexie';
+import Dexie from 'dexie';
+import 'dexie-export-import';
+
+export {Dexie};
diff --git a/ext/js/pages/settings/backup-controller.js b/ext/js/pages/settings/backup-controller.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as Dexie from '../../../lib/dexie.js';
+import {Dexie} from '../../../lib/dexie.js';
 import {isObject, log} from '../../core.js';
 import {OptionsUtil} from '../../data/options-util.js';
 import {ArrayBufferUtil} from '../../data/sandbox/array-buffer-util.js';

diff --git a/ext/js/script/dynamic-loader-sentinel.js b/ext/js/script/dynamic-loader-sentinel.js
@@ -18,4 +18,5 @@
 
 import {yomitan} from '../yomitan.js';
 
-yomitan.trigger('dynamicLoaderSentinel', {script: document.currentScript});
+
+yomitan.trigger('dynamicLoaderSentinel', {script: import.meta.url});
diff --git a/ext/js/script/dynamic-loader.js b/ext/js/script/dynamic-loader.js
@@ -126,6 +126,7 @@ export const dynamicLoader = (() => {
                 if (node !== null) { continue; }
 
                 const script = document.createElement('script');
+                script.type = 'module';
                 script.async = false;
                 script.src = url;
                 parent.appendChild(script);
@@ -140,7 +141,7 @@ export const dynamicLoader = (() => {
 
         const sentinelEventName = 'dynamicLoaderSentinel';
         const sentinelEventCallback = (e) => {
-            if (e.script !== script) { return; }
+            if (e.script !== script.src) { return; }
             yomitan.off(sentinelEventName, sentinelEventCallback);
             parent.removeChild(script);
             resolve();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,5 @@

		import {yomitan} from '../yomitan.js';

		yomitan.trigger('dynamicLoaderSentinel', {script: document.currentScript});

		yomitan.trigger('dynamicLoaderSentinel', {script: import.meta.url});