diff --git a/app/javascript/packs/application.ts b/app/javascript/packs/application.ts index 91272b03..a3359592 100644 --- a/app/javascript/packs/application.ts +++ b/app/javascript/packs/application.ts @@ -1,6 +1,6 @@ -import start from '../retrospring/common'; -import initAnswerbox from '../retrospring/features/answerbox/index'; -import initInbox from '../retrospring/features/inbox/index'; +import start from 'retrospring/common'; +import initAnswerbox from 'retrospring/features/answerbox/index'; +import initInbox from 'retrospring/features/inbox/index'; start(); document.addEventListener('turbolinks:load', initAnswerbox); diff --git a/app/javascript/retrospring/features/answerbox/index.ts b/app/javascript/retrospring/features/answerbox/index.ts index 45c8cd68..9f836842 100644 --- a/app/javascript/retrospring/features/answerbox/index.ts +++ b/app/javascript/retrospring/features/answerbox/index.ts @@ -1,5 +1,5 @@ -import registerEvents from "retrospring/utilities/registerEvents"; -import {createShareEvent} from "./share"; +import registerEvents from 'utilities/registerEvents'; +import { createShareEvent } from './share'; export default (): void => { if ('share' in navigator) { diff --git a/app/javascript/retrospring/features/answerbox/share.ts b/app/javascript/retrospring/features/answerbox/share.ts index 6d74815e..34c2ba54 100644 --- a/app/javascript/retrospring/features/answerbox/share.ts +++ b/app/javascript/retrospring/features/answerbox/share.ts @@ -1,4 +1,4 @@ -import noop from 'retrospring/utilities/noop'; +import noop from 'utilities/noop'; export function createShareEvent(answerbox: HTMLElement): () => void { return function (): void { diff --git a/app/javascript/retrospring/features/inbox/index.ts b/app/javascript/retrospring/features/inbox/index.ts index 4c4af9b3..65e0684b 100644 --- a/app/javascript/retrospring/features/inbox/index.ts +++ b/app/javascript/retrospring/features/inbox/index.ts @@ -1,12 +1,12 @@ -import registerEvents from "retrospring/utilities/registerEvents"; -import {reportEventHandler} from "./report"; +import registerEvents from 'utilities/registerEvents'; +import { reportEventHandler } from './report'; export default (): void => { const entries: NodeList = document.querySelectorAll('.inbox-entry:not(.js-initialized)'); entries.forEach((element: HTMLElement) => { registerEvents([ - {type: 'click', target: element.querySelector('[name=ib-report]'), handler: reportEventHandler} + { type: 'click', target: element.querySelector('[name=ib-report]'), handler: reportEventHandler } ]); element.classList.add('js-initialized'); diff --git a/config/webpack/environment.js b/config/webpack/environment.js index 89edc45f..7bf31a49 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -1,5 +1,16 @@ +const path = require('path') const { environment } = require('@rails/webpacker') const coffee = require('./loaders/coffee') environment.loaders.prepend('coffee', coffee) + +environment.config.merge({ + resolve: { + alias: { + retrospring: path.resolve(__dirname, '..', '..', 'app/javascript/retrospring'), + utilities: path.resolve(__dirname, '..', '..', 'app/javascript/retrospring/utilities') + } + } +}) + module.exports = environment diff --git a/tsconfig.json b/tsconfig.json index 4746f32a..fe957b80 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,9 @@ "moduleResolution": "node", "baseUrl": ".", "paths": { - "*": ["node_modules/*", "app/javascript/*"] + "*": ["node_modules/*", "app/javascript/*"], + "retrospring/*": ["app/javascript/retrospring/*"], + "utilities/*": ["app/javascript/retrospring/utilities/*"] }, "sourceMap": true, "target": "es5",