diff --git a/package-lock.json b/package-lock.json index 1b9a966e7..e7b0915ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -397,6 +397,12 @@ "@types/node": "*" } }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/lunr": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.2.tgz", @@ -8581,6 +8587,43 @@ "integrity": "sha512-qSC/t6vfUPqVMkH7wQmRwYbShubAJufUoUynJj8e+AlSXK3+M6rC/OnQ+Mdw6Qd/WYTf46QZDM8nUhxYVJTIPw==", "dev": true }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "tsconfig-paths-webpack-plugin": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz", + "integrity": "sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g==", + "dev": true, + "requires": { + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "tsconfig-paths": "^3.4.0" + } + }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index a4268d69b..ffac514db 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "svgo": "^1.3.0", "ts-loader": "^6.1.2", "ts-node": "^7.0.1", + "tsconfig-paths-webpack-plugin": "^3.2.0", "tslint": "^5.18.0", "tslint-sonarts": "^1.9.0", "typescript": "^3.7.3", diff --git a/src/assets/javascripts/components/_/index.ts b/src/assets/javascripts/components/_/index.ts index 61c4690ea..2e67b48d0 100644 --- a/src/assets/javascripts/components/_/index.ts +++ b/src/assets/javascripts/components/_/index.ts @@ -24,7 +24,7 @@ import { keys } from "ramda" import { NEVER, Observable, OperatorFunction, of, pipe } from "rxjs" import { map, scan, shareReplay, switchMap } from "rxjs/operators" -import { getElement } from "../../utilities" +import { getElement } from "utilities" /* ---------------------------------------------------------------------------- * Types diff --git a/src/assets/javascripts/components/hidden/index.ts b/src/assets/javascripts/components/hidden/index.ts index f0dce55dc..b97372324 100644 --- a/src/assets/javascripts/components/hidden/index.ts +++ b/src/assets/javascripts/components/hidden/index.ts @@ -29,8 +29,8 @@ import { tap } from "rxjs/operators" -import { resetHidden, setHidden } from "../../actions" -import { ViewportOffset } from "../../utilities" +import { resetHidden, setHidden } from "actions" +import { ViewportOffset } from "utilities" /* ---------------------------------------------------------------------------- * Functions diff --git a/src/assets/javascripts/components/main/index.ts b/src/assets/javascripts/components/main/index.ts index 0566ea3c1..7aead7705 100644 --- a/src/assets/javascripts/components/main/index.ts +++ b/src/assets/javascripts/components/main/index.ts @@ -28,7 +28,8 @@ import { shareReplay } from "rxjs/operators" -import { ViewportOffset, ViewportSize } from "../../utilities" +import { ViewportOffset, ViewportSize } from "utilities" + import { Header } from "../header" /* ---------------------------------------------------------------------------- diff --git a/src/assets/javascripts/components/sidebar/index.ts b/src/assets/javascripts/components/sidebar/index.ts index a880a8350..f85085f78 100644 --- a/src/assets/javascripts/components/sidebar/index.ts +++ b/src/assets/javascripts/components/sidebar/index.ts @@ -42,8 +42,9 @@ import { resetSidebarLock, setSidebarHeight, setSidebarLock -} from "../../actions" -import { ViewportOffset } from "../../utilities" +} from "actions" +import { ViewportOffset } from "utilities" + import { Main } from "../main" /* ---------------------------------------------------------------------------- diff --git a/src/assets/javascripts/templates/search/_/index.tsx b/src/assets/javascripts/templates/search/_/index.tsx index abd6fdfde..adfb0f97b 100644 --- a/src/assets/javascripts/templates/search/_/index.tsx +++ b/src/assets/javascripts/templates/search/_/index.tsx @@ -20,8 +20,9 @@ * IN THE SOFTWARE. */ -import { h } from "../../../extensions" -import { SearchResult } from "../../../modules" +import { h } from "extensions" +import { SearchResult } from "modules" + import { renderArticleDocument } from "../article" import { renderSectionDocument } from "../section" diff --git a/src/assets/javascripts/templates/search/article/index.tsx b/src/assets/javascripts/templates/search/article/index.tsx index 445731f3d..732cddbeb 100644 --- a/src/assets/javascripts/templates/search/article/index.tsx +++ b/src/assets/javascripts/templates/search/article/index.tsx @@ -20,8 +20,8 @@ * IN THE SOFTWARE. */ -import { h } from "../../../extensions" -import { ArticleDocument } from "../../../modules" +import { h } from "extensions" +import { ArticleDocument } from "modules" /* ---------------------------------------------------------------------------- * Data diff --git a/src/assets/javascripts/templates/search/section/index.tsx b/src/assets/javascripts/templates/search/section/index.tsx index e6c809c26..0ac058e45 100644 --- a/src/assets/javascripts/templates/search/section/index.tsx +++ b/src/assets/javascripts/templates/search/section/index.tsx @@ -20,8 +20,8 @@ * IN THE SOFTWARE. */ -import { h } from "../../../extensions" -import { SectionDocument } from "../../../modules" +import { h } from "extensions" +import { SectionDocument } from "modules" /* ---------------------------------------------------------------------------- * Data diff --git a/src/assets/javascripts/workers/search/main/index.ts b/src/assets/javascripts/workers/search/main/index.ts index 9aed6dddd..246af581c 100644 --- a/src/assets/javascripts/workers/search/main/index.ts +++ b/src/assets/javascripts/workers/search/main/index.ts @@ -20,7 +20,8 @@ * IN THE SOFTWARE. */ -import { Search } from "../../../modules" +import { Search } from "modules" + import { SearchMessage, SearchMessageType } from "../_" /* ---------------------------------------------------------------------------- diff --git a/webpack.config.ts b/webpack.config.ts index 437887e10..e8571f6b2 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -21,6 +21,7 @@ */ import * as path from "path" +import { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin" import { Configuration } from "webpack" /* ---------------------------------------------------------------------------- @@ -74,7 +75,10 @@ function config(args: Configuration): Configuration { __dirname, path.resolve(__dirname, "node_modules") ], - extensions: [".ts", ".tsx", ".js", ".json"] + extensions: [".ts", ".tsx", ".js", ".json"], + plugins: [ + new TsconfigPathsPlugin() + ] }, /* Source maps */