From 4fe881d68d4c1182bee2e78a559c2064aaf48b0d Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 4 Mar 2024 07:43:31 -0500 Subject: [PATCH] Move sandbox files (#731) * Move sandbox files * Update order --- .eslintrc.json | 22 +++++++++---------- dev/jsconfig.json | 4 ++-- docs/templates.md | 2 +- ext/js/background/backend.js | 2 +- ext/js/background/offscreen-proxy.js | 2 +- ext/js/background/offscreen.js | 2 +- ext/js/data/anki-note-builder.js | 4 ++-- .../{sandbox => }/anki-note-data-creator.js | 4 ++-- .../data/{sandbox => }/array-buffer-util.js | 0 ext/js/data/{sandbox => }/string-util.js | 0 ext/js/display/display-content-manager.js | 2 +- ext/js/display/display-generator.js | 4 ++-- .../{sandbox => }/pronunciation-generator.js | 2 +- .../structured-content-generator.js | 6 ++--- ext/js/dom/{sandbox => }/css-style-applier.js | 2 +- ext/js/dom/dom-text-scanner.js | 2 +- ext/js/dom/text-source-element.js | 2 +- ext/js/media/audio-downloader.js | 2 +- ext/js/pages/settings/backup-controller.js | 2 +- .../anki-template-renderer-content-manager.js | 0 .../{sandbox => }/anki-template-renderer.js | 14 ++++++------ .../template-renderer-frame-api.js | 4 ++-- .../template-renderer-frame-main.js | 0 .../template-renderer-media-provider.js | 2 +- .../{sandbox => }/template-renderer.js | 4 ++-- ext/template-renderer.html | 2 +- test/eslint-config.test.js | 2 +- test/fixtures/anki-template-renderer-test.js | 2 +- test/utilities/anki.js | 4 ++-- 29 files changed, 50 insertions(+), 50 deletions(-) rename ext/js/data/{sandbox => }/anki-note-data-creator.js (99%) rename ext/js/data/{sandbox => }/array-buffer-util.js (100%) rename ext/js/data/{sandbox => }/string-util.js (100%) rename ext/js/display/{sandbox => }/pronunciation-generator.js (98%) rename ext/js/display/{sandbox => }/structured-content-generator.js (97%) rename ext/js/dom/{sandbox => }/css-style-applier.js (99%) rename ext/js/templates/{sandbox => }/anki-template-renderer-content-manager.js (100%) rename ext/js/templates/{sandbox => }/anki-template-renderer.js (98%) rename ext/js/templates/{sandbox => }/template-renderer-frame-api.js (96%) rename ext/js/templates/{sandbox => }/template-renderer-frame-main.js (100%) rename ext/js/templates/{sandbox => }/template-renderer-media-provider.js (99%) rename ext/js/templates/{sandbox => }/template-renderer.js (98%) diff --git a/.eslintrc.json b/.eslintrc.json index d7357173ae..b9b3fa4a6f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -562,19 +562,19 @@ "ext/js/core/api-map.js", "ext/js/core/extension-error.js", "ext/js/core/json.js", - "ext/js/data/sandbox/anki-note-data-creator.js", + "ext/js/data/anki-note-data-creator.js", "ext/js/dictionary/dictionary-data-util.js", - "ext/js/display/sandbox/pronunciation-generator.js", - "ext/js/display/sandbox/structured-content-generator.js", - "ext/js/dom/sandbox/css-style-applier.js", + "ext/js/display/pronunciation-generator.js", + "ext/js/display/structured-content-generator.js", + "ext/js/dom/css-style-applier.js", "ext/js/language/ja/japanese.js", "ext/js/language/text-utilities.js", - "ext/js/templates/sandbox/anki-template-renderer-content-manager.js", - "ext/js/templates/sandbox/anki-template-renderer.js", - "ext/js/templates/sandbox/template-renderer-frame-api.js", - "ext/js/templates/sandbox/template-renderer-frame-main.js", - "ext/js/templates/sandbox/template-renderer-media-provider.js", - "ext/js/templates/sandbox/template-renderer.js" + "ext/js/templates/anki-template-renderer-content-manager.js", + "ext/js/templates/anki-template-renderer.js", + "ext/js/templates/template-renderer-frame-api.js", + "ext/js/templates/template-renderer-frame-main.js", + "ext/js/templates/template-renderer-media-provider.js", + "ext/js/templates/template-renderer.js" ], "env": { "webextensions": false @@ -626,11 +626,11 @@ "ext/js/core/to-error.js", "ext/js/core/utilities.js", "ext/js/data/anki-util.js", + "ext/js/data/array-buffer-util.js", "ext/js/data/database.js", "ext/js/data/json-schema.js", "ext/js/data/options-util.js", "ext/js/data/permissions-util.js", - "ext/js/data/sandbox/array-buffer-util.js", "ext/js/dictionary/dictionary-database.js", "ext/js/dom/native-simple-dom-parser.js", "ext/js/dom/simple-dom-parser.js", diff --git a/dev/jsconfig.json b/dev/jsconfig.json index 1bef1058a4..060a5715bc 100644 --- a/dev/jsconfig.json +++ b/dev/jsconfig.json @@ -63,7 +63,7 @@ "../ext/js/data/database.js", "../ext/js/data/json-schema.js", "../ext/js/general/cache-map.js", - "../ext/js/data/sandbox/anki-note-data-creator.js", + "../ext/js/data/anki-note-data-creator.js", "../ext/js/general/cache-map.js", "../ext/js/general/regex-util.js", "../ext/js/general/text-source-map.js", @@ -71,7 +71,7 @@ "../ext/js/dictionary/dictionary-importer.js", "../ext/js/dictionary/dictionary-database.js", "../ext/js/dictionary/dictionary-data-util.js", - "../ext/js/language/sandbox/japanese-util.js", + "../ext/js/language/japanese-util.js", "../ext/js/language/translator.js", "../ext/js/media/media-util.js", "../types/dev/**/*.ts", diff --git a/docs/templates.md b/docs/templates.md index 3f51dc983f..cb848b851c 100644 --- a/docs/templates.md +++ b/docs/templates.md @@ -3,7 +3,7 @@ ## Helpers Yomitan supports several custom Handlebars helpers for rendering templates. -The source code for these templates can be found [here](../ext/js/templates/sandbox/anki-template-renderer.js). +The source code for these templates can be found [here](../ext/js/templates/anki-template-renderer.js). ### `dumpObject` diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js index d19c3b4562..182f11aae1 100644 --- a/ext/js/background/backend.js +++ b/ext/js/background/backend.js @@ -29,9 +29,9 @@ import {log} from '../core/log.js'; import {isObjectNotArray} from '../core/object-utilities.js'; import {clone, deferPromise, promiseTimeout} from '../core/utilities.js'; import {isNoteDataValid} from '../data/anki-util.js'; +import {arrayBufferToBase64} from '../data/array-buffer-util.js'; import {OptionsUtil} from '../data/options-util.js'; import {getAllPermissions, hasPermissions, hasRequiredPermissionsForOptions} from '../data/permissions-util.js'; -import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js'; import {DictionaryDatabase} from '../dictionary/dictionary-database.js'; import {Environment} from '../extension/environment.js'; import {ObjectPropertyAccessor} from '../general/object-property-accessor.js'; diff --git a/ext/js/background/offscreen-proxy.js b/ext/js/background/offscreen-proxy.js index 59d1291e8b..30c6862aa6 100644 --- a/ext/js/background/offscreen-proxy.js +++ b/ext/js/background/offscreen-proxy.js @@ -18,7 +18,7 @@ import {ExtensionError} from '../core/extension-error.js'; import {isObjectNotArray} from '../core/object-utilities.js'; -import {base64ToArrayBuffer} from '../data/sandbox/array-buffer-util.js'; +import {base64ToArrayBuffer} from '../data/array-buffer-util.js'; /** * This class is responsible for creating and communicating with an offscreen document. diff --git a/ext/js/background/offscreen.js b/ext/js/background/offscreen.js index e38d4ba371..b0b11c937d 100644 --- a/ext/js/background/offscreen.js +++ b/ext/js/background/offscreen.js @@ -18,7 +18,7 @@ import {ClipboardReader} from '../comm/clipboard-reader.js'; import {createApiMap, invokeApiMapHandler} from '../core/api-map.js'; -import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js'; +import {arrayBufferToBase64} from '../data/array-buffer-util.js'; import {DictionaryDatabase} from '../dictionary/dictionary-database.js'; import {Translator} from '../language/translator.js'; diff --git a/ext/js/data/anki-note-builder.js b/ext/js/data/anki-note-builder.js index 32d4b593f5..e156103a2a 100644 --- a/ext/js/data/anki-note-builder.js +++ b/ext/js/data/anki-note-builder.js @@ -25,14 +25,14 @@ export class AnkiNoteBuilder { /** * Initiate an instance of AnkiNoteBuilder. * @param {import('anki-note-builder').MinimalApi} api - * @param {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} templateRenderer + * @param {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/template-renderer.js').TemplateRenderer} templateRenderer */ constructor(api, templateRenderer) { /** @type {import('anki-note-builder').MinimalApi} */ this._api = api; /** @type {RegExp} */ this._markerPattern = cloneFieldMarkerPattern(true); - /** @type {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} */ + /** @type {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/template-renderer.js').TemplateRenderer} */ this._templateRenderer = templateRenderer; /** @type {import('anki-note-builder').BatchedRequestGroup[]} */ this._batchedRequests = []; diff --git a/ext/js/data/sandbox/anki-note-data-creator.js b/ext/js/data/anki-note-data-creator.js similarity index 99% rename from ext/js/data/sandbox/anki-note-data-creator.js rename to ext/js/data/anki-note-data-creator.js index d0456b0f5c..fbeb8cee3c 100644 --- a/ext/js/data/sandbox/anki-note-data-creator.js +++ b/ext/js/data/anki-note-data-creator.js @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../../dictionary/dictionary-data-util.js'; -import {distributeFurigana, distributeFuriganaInflected} from '../../language/ja/japanese.js'; +import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../dictionary/dictionary-data-util.js'; +import {distributeFurigana, distributeFuriganaInflected} from '../language/ja/japanese.js'; /** * Creates a compatibility representation of the specified data. diff --git a/ext/js/data/sandbox/array-buffer-util.js b/ext/js/data/array-buffer-util.js similarity index 100% rename from ext/js/data/sandbox/array-buffer-util.js rename to ext/js/data/array-buffer-util.js diff --git a/ext/js/data/sandbox/string-util.js b/ext/js/data/string-util.js similarity index 100% rename from ext/js/data/sandbox/string-util.js rename to ext/js/data/string-util.js diff --git a/ext/js/display/display-content-manager.js b/ext/js/display/display-content-manager.js index c61c3acab2..28fdc709cb 100644 --- a/ext/js/display/display-content-manager.js +++ b/ext/js/display/display-content-manager.js @@ -17,7 +17,7 @@ */ import {EventListenerCollection} from '../core/event-listener-collection.js'; -import {base64ToArrayBuffer} from '../data/sandbox/array-buffer-util.js'; +import {base64ToArrayBuffer} from '../data/array-buffer-util.js'; /** * The content manager which is used when generating HTML display content. diff --git a/ext/js/display/display-generator.js b/ext/js/display/display-generator.js index 0caf4d7160..8a388a3890 100644 --- a/ext/js/display/display-generator.js +++ b/ext/js/display/display-generator.js @@ -21,8 +21,8 @@ import {getDisambiguations, getGroupedPronunciations, getTermFrequency, groupKan import {HtmlTemplateCollection} from '../dom/html-template-collection.js'; import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji} from '../language/ja/japanese.js'; import {getLanguageFromText} from '../language/text-utilities.js'; -import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './sandbox/pronunciation-generator.js'; -import {StructuredContentGenerator} from './sandbox/structured-content-generator.js'; +import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './pronunciation-generator.js'; +import {StructuredContentGenerator} from './structured-content-generator.js'; export class DisplayGenerator { /** diff --git a/ext/js/display/sandbox/pronunciation-generator.js b/ext/js/display/pronunciation-generator.js similarity index 98% rename from ext/js/display/sandbox/pronunciation-generator.js rename to ext/js/display/pronunciation-generator.js index f28520be56..2c03eb94fb 100644 --- a/ext/js/display/sandbox/pronunciation-generator.js +++ b/ext/js/display/pronunciation-generator.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/ja/japanese.js'; +import {getKanaDiacriticInfo, isMoraPitchHigh} from '../language/ja/japanese.js'; /** * @param {string[]} morae diff --git a/ext/js/display/sandbox/structured-content-generator.js b/ext/js/display/structured-content-generator.js similarity index 97% rename from ext/js/display/sandbox/structured-content-generator.js rename to ext/js/display/structured-content-generator.js index 90a471580b..a7fd9f3d01 100644 --- a/ext/js/display/sandbox/structured-content-generator.js +++ b/ext/js/display/structured-content-generator.js @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -import {getLanguageFromText} from '../../language/text-utilities.js'; +import {getLanguageFromText} from '../language/text-utilities.js'; export class StructuredContentGenerator { /** - * @param {import('../../display/display-content-manager.js').DisplayContentManager|import('../../templates/sandbox/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} contentManager + * @param {import('./display-content-manager.js').DisplayContentManager|import('../templates/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} contentManager * @param {Document} document */ constructor(contentManager, document) { - /** @type {import('../../display/display-content-manager.js').DisplayContentManager|import('../../templates/sandbox/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} */ + /** @type {import('./display-content-manager.js').DisplayContentManager|import('../templates/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} */ this._contentManager = contentManager; /** @type {Document} */ this._document = document; diff --git a/ext/js/dom/sandbox/css-style-applier.js b/ext/js/dom/css-style-applier.js similarity index 99% rename from ext/js/dom/sandbox/css-style-applier.js rename to ext/js/dom/css-style-applier.js index ea3f1a28e7..ba49d6aa3c 100644 --- a/ext/js/dom/sandbox/css-style-applier.js +++ b/ext/js/dom/css-style-applier.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {readResponseJson} from '../../core/json.js'; +import {readResponseJson} from '../core/json.js'; /** * This class is used to apply CSS styles to elements using a consistent method diff --git a/ext/js/dom/dom-text-scanner.js b/ext/js/dom/dom-text-scanner.js index e263d9f321..b86d65869f 100644 --- a/ext/js/dom/dom-text-scanner.js +++ b/ext/js/dom/dom-text-scanner.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {readCodePointsBackward, readCodePointsForward} from '../data/sandbox/string-util.js'; +import {readCodePointsBackward, readCodePointsForward} from '../data/string-util.js'; /** * A class used to scan text in a document. diff --git a/ext/js/dom/text-source-element.js b/ext/js/dom/text-source-element.js index b2829e75e3..d91e75f309 100644 --- a/ext/js/dom/text-source-element.js +++ b/ext/js/dom/text-source-element.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {readCodePointsBackward, readCodePointsForward} from '../data/sandbox/string-util.js'; +import {readCodePointsBackward, readCodePointsForward} from '../data/string-util.js'; import {convertMultipleRectZoomCoordinates} from './document-util.js'; /** diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js index 4cb3eb8146..b3d2d55cf1 100644 --- a/ext/js/media/audio-downloader.js +++ b/ext/js/media/audio-downloader.js @@ -19,8 +19,8 @@ import {RequestBuilder} from '../background/request-builder.js'; import {ExtensionError} from '../core/extension-error.js'; import {readResponseJson} from '../core/json.js'; +import {arrayBufferToBase64} from '../data/array-buffer-util.js'; import {JsonSchema} from '../data/json-schema.js'; -import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js'; import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js'; import {SimpleDOMParser} from '../dom/simple-dom-parser.js'; import {isStringEntirelyKana} from '../language/ja/japanese.js'; diff --git a/ext/js/pages/settings/backup-controller.js b/ext/js/pages/settings/backup-controller.js index dd739d39b5..5c1688492d 100644 --- a/ext/js/pages/settings/backup-controller.js +++ b/ext/js/pages/settings/backup-controller.js @@ -21,9 +21,9 @@ import {parseJson} from '../../core/json.js'; import {log} from '../../core/log.js'; import {isObjectNotArray} from '../../core/object-utilities.js'; import {toError} from '../../core/to-error.js'; +import {arrayBufferUtf8Decode} from '../../data/array-buffer-util.js'; import {OptionsUtil} from '../../data/options-util.js'; import {getAllPermissions} from '../../data/permissions-util.js'; -import {arrayBufferUtf8Decode} from '../../data/sandbox/array-buffer-util.js'; import {querySelectorNotNull} from '../../dom/query-selector.js'; import {DictionaryController} from './dictionary-controller.js'; diff --git a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js b/ext/js/templates/anki-template-renderer-content-manager.js similarity index 100% rename from ext/js/templates/sandbox/anki-template-renderer-content-manager.js rename to ext/js/templates/anki-template-renderer-content-manager.js diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/anki-template-renderer.js similarity index 98% rename from ext/js/templates/sandbox/anki-template-renderer.js rename to ext/js/templates/anki-template-renderer.js index 022716c374..4bb56a4b31 100644 --- a/ext/js/templates/sandbox/anki-template-renderer.js +++ b/ext/js/templates/anki-template-renderer.js @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -import {Handlebars} from '../../../lib/handlebars.js'; -import {createAnkiNoteData} from '../../data/sandbox/anki-note-data-creator.js'; -import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../../dictionary/dictionary-data-util.js'; -import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../../display/sandbox/pronunciation-generator.js'; -import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js'; -import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js'; -import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/ja/japanese.js'; +import {Handlebars} from '../../lib/handlebars.js'; +import {createAnkiNoteData} from '../data/anki-note-data-creator.js'; +import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../dictionary/dictionary-data-util.js'; +import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../display/pronunciation-generator.js'; +import {StructuredContentGenerator} from '../display/structured-content-generator.js'; +import {CssStyleApplier} from '../dom/css-style-applier.js'; +import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../language/ja/japanese.js'; import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js'; import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js'; import {TemplateRenderer} from './template-renderer.js'; diff --git a/ext/js/templates/sandbox/template-renderer-frame-api.js b/ext/js/templates/template-renderer-frame-api.js similarity index 96% rename from ext/js/templates/sandbox/template-renderer-frame-api.js rename to ext/js/templates/template-renderer-frame-api.js index a0017d7072..cd9b42320d 100644 --- a/ext/js/templates/sandbox/template-renderer-frame-api.js +++ b/ext/js/templates/template-renderer-frame-api.js @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import {createApiMap, invokeApiMapHandler} from '../../core/api-map.js'; -import {parseJson} from '../../core/json.js'; +import {createApiMap, invokeApiMapHandler} from '../core/api-map.js'; +import {parseJson} from '../core/json.js'; export class TemplateRendererFrameApi { /** diff --git a/ext/js/templates/sandbox/template-renderer-frame-main.js b/ext/js/templates/template-renderer-frame-main.js similarity index 100% rename from ext/js/templates/sandbox/template-renderer-frame-main.js rename to ext/js/templates/template-renderer-frame-main.js diff --git a/ext/js/templates/sandbox/template-renderer-media-provider.js b/ext/js/templates/template-renderer-media-provider.js similarity index 99% rename from ext/js/templates/sandbox/template-renderer-media-provider.js rename to ext/js/templates/template-renderer-media-provider.js index 29dd29aec5..2f238e205f 100644 --- a/ext/js/templates/sandbox/template-renderer-media-provider.js +++ b/ext/js/templates/template-renderer-media-provider.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import {Handlebars} from '../../../lib/handlebars.js'; +import {Handlebars} from '../../lib/handlebars.js'; export class TemplateRendererMediaProvider { constructor() { diff --git a/ext/js/templates/sandbox/template-renderer.js b/ext/js/templates/template-renderer.js similarity index 98% rename from ext/js/templates/sandbox/template-renderer.js rename to ext/js/templates/template-renderer.js index 84eb6a19d6..7bb93aa251 100644 --- a/ext/js/templates/sandbox/template-renderer.js +++ b/ext/js/templates/template-renderer.js @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import {Handlebars} from '../../../lib/handlebars.js'; -import {ExtensionError} from '../../core/extension-error.js'; +import {Handlebars} from '../../lib/handlebars.js'; +import {ExtensionError} from '../core/extension-error.js'; export class TemplateRenderer { constructor() { diff --git a/ext/template-renderer.html b/ext/template-renderer.html index 6df382a40e..d7014a99c9 100644 --- a/ext/template-renderer.html +++ b/ext/template-renderer.html @@ -11,7 +11,7 @@ - + diff --git a/test/eslint-config.test.js b/test/eslint-config.test.js index 47e347dddf..6ea6715a62 100644 --- a/test/eslint-config.test.js +++ b/test/eslint-config.test.js @@ -90,7 +90,7 @@ const targets = [ { name: 'sandbox', paths: [ - 'ext/js/templates/sandbox/template-renderer-frame-main.js' + 'ext/js/templates/template-renderer-frame-main.js' ], /** @type {import('test/eslint-config').MinimalEslintConfigEnv} */ env: { diff --git a/test/fixtures/anki-template-renderer-test.js b/test/fixtures/anki-template-renderer-test.js index 635e0b7d46..1e3ec74e18 100644 --- a/test/fixtures/anki-template-renderer-test.js +++ b/test/fixtures/anki-template-renderer-test.js @@ -16,7 +16,7 @@ */ import {vi} from 'vitest'; -import {AnkiTemplateRenderer} from '../../ext/js/templates/sandbox/anki-template-renderer.js'; +import {AnkiTemplateRenderer} from '../../ext/js/templates/anki-template-renderer.js'; import {fetch} from '../mocks/common.js'; import {createDomTest} from './dom-test.js'; diff --git a/test/utilities/anki.js b/test/utilities/anki.js index 9f9bfef345..f5d281e445 100644 --- a/test/utilities/anki.js +++ b/test/utilities/anki.js @@ -16,9 +16,9 @@ */ import {AnkiNoteBuilder} from '../../ext/js/data/anki-note-builder.js'; +import {createAnkiNoteData} from '../../ext/js/data/anki-note-data-creator.js'; import {getStandardFieldMarkers} from '../../ext/js/data/anki-template-util.js'; -import {createAnkiNoteData} from '../../ext/js/data/sandbox/anki-note-data-creator.js'; -import {AnkiTemplateRenderer} from '../../ext/js/templates/sandbox/anki-template-renderer.js'; +import {AnkiTemplateRenderer} from '../../ext/js/templates/anki-template-renderer.js'; /** * @param {import('dictionary').DictionaryEntryType} type