From 3a20244e3887bce473eb7e5e0a9b27e778153771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= Date: Sun, 21 Jul 2024 01:38:08 +0300 Subject: [PATCH] Use @ exclusively for root imports Remove "root" resolve alias and now-redundant jsx-runtime alias. --- gulp/webpack.config.js | 3 +-- gulp/webpack.production.config.js | 3 +-- src/js/platform/api.js | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gulp/webpack.config.js b/gulp/webpack.config.js index 79318745..71b06a64 100644 --- a/gulp/webpack.config.js +++ b/gulp/webpack.config.js @@ -87,8 +87,7 @@ export default { fallback: { fs: false }, alias: { "global-compression": resolve("../src/js/core/lzstring.js"), - "root": resolve("../src/js/"), - "@/jsx-runtime": resolve("../src/js/jsx-runtime.ts"), + "@": resolve("../src/js/"), }, fullySpecified: false, extensions: [".ts", ".js", ".tsx", ".jsx"], diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js index b0942134..0cba84a3 100644 --- a/gulp/webpack.production.config.js +++ b/gulp/webpack.production.config.js @@ -96,8 +96,7 @@ export default { fallback: { fs: false }, alias: { "global-compression": resolve("../src/js/core/lzstring.js"), - "root": resolve("../src/js/"), - "@/jsx-runtime": resolve("../src/js/jsx-runtime.ts"), + "@": resolve("../src/js/"), }, fullySpecified: false, extensions: [".ts", ".js", ".tsx", ".jsx"], diff --git a/src/js/platform/api.js b/src/js/platform/api.js index 2355e10c..9f0cafd3 100644 --- a/src/js/platform/api.js +++ b/src/js/platform/api.js @@ -2,10 +2,10 @@ import { Application } from "../application"; /* typehints:end */ -import { DialogWithForm } from "root/core/modal_dialog_elements"; -import { FormElementInput } from "root/core/modal_dialog_forms"; import { createLogger } from "../core/logging"; import { compressX64 } from "../core/lzstring"; +import { DialogWithForm } from "../core/modal_dialog_elements"; +import { FormElementInput } from "../core/modal_dialog_forms"; import { timeoutPromise } from "../core/utils"; import { T } from "../translations";