diff --git a/app/javascript/controllers/hotkeys_controller.ts b/app/javascript/controllers/hotkeys_controller.ts index 590eda48a..851ff3e62 100644 --- a/app/javascript/controllers/hotkeys_controller.ts +++ b/app/javascript/controllers/hotkeys_controller.ts @@ -1,6 +1,6 @@ import {Controller} from "@hotwired/stimulus"; -import {assert} from "javascript/helpers"; +import {assert} from "helpers/assert"; export default class extends Controller { static override targets = ["click"]; diff --git a/app/javascript/helpers/index.ts b/app/javascript/helpers/index.ts deleted file mode 100644 index 997f6591a..000000000 --- a/app/javascript/helpers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./assert"; diff --git a/spec/javascript/controllers/hotkeys_controller_spec.ts b/spec/javascript/controllers/hotkeys_controller_spec.ts index b092f20e6..9adb08d09 100644 --- a/spec/javascript/controllers/hotkeys_controller_spec.ts +++ b/spec/javascript/controllers/hotkeys_controller_spec.ts @@ -1,6 +1,6 @@ import {bootStimulus, getController} from "support/stimulus"; import HotkeysController from "controllers/hotkeys_controller"; -import {assert} from "javascript/helpers"; +import {assert} from "helpers/assert"; function setupDOM(): void { document.body.innerHTML = ` diff --git a/spec/javascript/helpers/assert_spec.ts b/spec/javascript/helpers/assert_spec.ts index bb0b4cdc5..bf123d510 100644 --- a/spec/javascript/helpers/assert_spec.ts +++ b/spec/javascript/helpers/assert_spec.ts @@ -1,4 +1,4 @@ -import {assert} from "javascript/helpers"; +import {assert} from "helpers/assert"; describe("assert", () => { it("throws an error when the passed value is null", () => { diff --git a/spec/javascript/support/stimulus.ts b/spec/javascript/support/stimulus.ts index 40b8e49d0..9fb8dc53f 100644 --- a/spec/javascript/support/stimulus.ts +++ b/spec/javascript/support/stimulus.ts @@ -1,7 +1,7 @@ import type {Context, Controller} from "@hotwired/stimulus"; import {Application} from "@hotwired/stimulus"; -import {assert} from "javascript/helpers"; +import {assert} from "helpers/assert"; let application: Application | null = null; diff --git a/tsconfig.json b/tsconfig.json index 54bda20dd..8b374b393 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,7 @@ "paths": { "channels/*": ["./app/javascript/channels/*"], "controllers/*": ["./app/javascript/controllers/*"], + "helpers/*": ["./app/javascript/helpers/*"], "javascript/*": ["./app/javascript/*"], "support/*": ["./spec/javascript/support/*"] }, diff --git a/vitest.config.ts b/vitest.config.ts index 70e9cdee4..95a048986 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -12,6 +12,7 @@ export default defineConfig({ alias: [ {find: /^channels\//u, replacement: appPath("channels")}, {find: /^controllers\//u, replacement: appPath("controllers")}, + {find: /^helpers\//u, replacement: appPath("helpers")}, {find: /^javascript\//u, replacement: appPath("")}, {find: /^spec\//u, replacement: `${path.resolve(root, "spec")}/`}, {find: "jquery", replacement: path.resolve(root, "node_modules/jquery/jquery.js")},