From 1f3feacb2162db3a35699060727c43b062c882fb Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Fri, 16 Jun 2023 00:37:08 -0400 Subject: [PATCH] Add path aliases --- styles/src/element/{interactive => }/index.ts | 0 .../{interactive => }/interactive.test.ts | 0 .../element/{interactive => }/interactive.ts | 0 styles/src/styleTree/assistant.ts | 2 +- styles/src/styleTree/commandPalette.ts | 2 +- styles/src/styleTree/contactList.ts | 2 +- styles/src/styleTree/contactNotification.ts | 2 +- styles/src/styleTree/contextMenu.ts | 2 +- styles/src/styleTree/copilot.ts | 2 +- styles/src/styleTree/editor.ts | 2 +- styles/src/styleTree/feedback.ts | 2 +- styles/src/styleTree/picker.ts | 2 +- styles/src/styleTree/projectPanel.ts | 2 +- styles/src/styleTree/search.ts | 2 +- .../styleTree/simpleMessageNotification.ts | 2 +- styles/src/styleTree/statusBar.ts | 2 +- styles/src/styleTree/tabBar.ts | 2 +- styles/src/styleTree/toolbarDropdownMenu.ts | 2 +- styles/src/styleTree/updateNotification.ts | 2 +- styles/src/styleTree/welcome.ts | 2 +- styles/src/styleTree/workspace.ts | 2 +- styles/tsconfig.json | 30 +++++++++++++++++-- 22 files changed, 46 insertions(+), 20 deletions(-) rename styles/src/element/{interactive => }/index.ts (100%) rename styles/src/element/{interactive => }/interactive.test.ts (100%) rename styles/src/element/{interactive => }/interactive.ts (100%) diff --git a/styles/src/element/interactive/index.ts b/styles/src/element/index.ts similarity index 100% rename from styles/src/element/interactive/index.ts rename to styles/src/element/index.ts diff --git a/styles/src/element/interactive/interactive.test.ts b/styles/src/element/interactive.test.ts similarity index 100% rename from styles/src/element/interactive/interactive.test.ts rename to styles/src/element/interactive.test.ts diff --git a/styles/src/element/interactive/interactive.ts b/styles/src/element/interactive.ts similarity index 100% rename from styles/src/element/interactive/interactive.ts rename to styles/src/element/interactive.ts diff --git a/styles/src/styleTree/assistant.ts b/styles/src/styleTree/assistant.ts index b31fe8169eb0693077a4ef59671bdddce13ec408..6ebf648481db46b845d33d712bd3b4d5b6f35d55 100644 --- a/styles/src/styleTree/assistant.ts +++ b/styles/src/styleTree/assistant.ts @@ -1,7 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { text, border, background, foreground } from "./components" import editor from "./editor" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function assistant(colorScheme: ColorScheme) { const layer = colorScheme.highest diff --git a/styles/src/styleTree/commandPalette.ts b/styles/src/styleTree/commandPalette.ts index 081a0ba68c1dce191c6fc6b6f5d9bcc7243f3c11..8634d08a90e2c145a6273357b894140d0c659c99 100644 --- a/styles/src/styleTree/commandPalette.ts +++ b/styles/src/styleTree/commandPalette.ts @@ -2,7 +2,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { text, background } from "./components" import { toggleable } from "./toggle" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function commandPalette(colorScheme: ColorScheme) { let layer = colorScheme.highest diff --git a/styles/src/styleTree/contactList.ts b/styles/src/styleTree/contactList.ts index 3b95a3c885f24d11d210c0c5c288811be39b57d5..f038d7971688f110291fe785eec52bfc1aae5280 100644 --- a/styles/src/styleTree/contactList.ts +++ b/styles/src/styleTree/contactList.ts @@ -1,7 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, borderColor, foreground, text } from "./components" import { toggleable } from "./toggle" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function contactsPanel(colorScheme: ColorScheme) { const nameMargin = 8 const sidePadding = 12 diff --git a/styles/src/styleTree/contactNotification.ts b/styles/src/styleTree/contactNotification.ts index 4d572390052b11a97ad59d47a3320eac1ee0b921..7de3f2fe0c5ecd58b9bd20d61190ba88d55ad3e2 100644 --- a/styles/src/styleTree/contactNotification.ts +++ b/styles/src/styleTree/contactNotification.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" const avatarSize = 12 const headerPadding = 8 diff --git a/styles/src/styleTree/contextMenu.ts b/styles/src/styleTree/contextMenu.ts index 51bff9de7fed6e83ffd2486003bb8aa73fa2cc47..21231ccac9d29ac8c98ff90c8760af310cb93097 100644 --- a/styles/src/styleTree/contextMenu.ts +++ b/styles/src/styleTree/contextMenu.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, borderColor, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function contextMenu(colorScheme: ColorScheme) { diff --git a/styles/src/styleTree/copilot.ts b/styles/src/styleTree/copilot.ts index 27ef5ec11c49548adb8c6d22823e713126a16d36..9229761414a6bbfda40050a857bfdc7f74e4ac75 100644 --- a/styles/src/styleTree/copilot.ts +++ b/styles/src/styleTree/copilot.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, foreground, svg, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function copilot(colorScheme: ColorScheme) { let layer = colorScheme.middle diff --git a/styles/src/styleTree/editor.ts b/styles/src/styleTree/editor.ts index 3612a0acd1fec92238c2c43f91e49f60db7bb2f7..5a55341933b74472ef0ce726f3e376beb4f4cbbf 100644 --- a/styles/src/styleTree/editor.ts +++ b/styles/src/styleTree/editor.ts @@ -4,7 +4,7 @@ import { background, border, borderColor, foreground, text } from "./components" import hoverPopover from "./hoverPopover" import { buildSyntax } from "../theme/syntax" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function editor(colorScheme: ColorScheme) { diff --git a/styles/src/styleTree/feedback.ts b/styles/src/styleTree/feedback.ts index 19a8f1e4c75911b4bc167d3227cab73c7a4ba2d5..4f0e99844dfbc74075d2f8f8134b8bb146aa2b95 100644 --- a/styles/src/styleTree/feedback.ts +++ b/styles/src/styleTree/feedback.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function feedback(colorScheme: ColorScheme) { let layer = colorScheme.highest diff --git a/styles/src/styleTree/picker.ts b/styles/src/styleTree/picker.ts index 3bcdae584fddadc86ba637febdefb6411d96c10f..940059eb438d8ff3e17748313e1dee5397f3c297 100644 --- a/styles/src/styleTree/picker.ts +++ b/styles/src/styleTree/picker.ts @@ -2,7 +2,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, text } from "./components" import { toggleable } from "./toggle" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function picker(colorScheme: ColorScheme): any { let layer = colorScheme.lowest diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 132dfe102c14a26123cb82d694979a446ca1fb05..5df3988be6ffd82fb08c0d8a0a0777c295774f7e 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -1,7 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function projectPanel(colorScheme: ColorScheme) { const { isLight } = colorScheme diff --git a/styles/src/styleTree/search.ts b/styles/src/styleTree/search.ts index 1f63d2740bada69aee3f5ebeb0d2fb82af5618d5..64f17e7d7407f0b94cb5f10135abe740dd1293a7 100644 --- a/styles/src/styleTree/search.ts +++ b/styles/src/styleTree/search.ts @@ -1,7 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function search(colorScheme: ColorScheme) { diff --git a/styles/src/styleTree/simpleMessageNotification.ts b/styles/src/styleTree/simpleMessageNotification.ts index 4c2abfcf9d6fac3575fa30c295cf1a6eaea1e6eb..404be2da7eaa0e860ab0b16427ce48dc75955ce7 100644 --- a/styles/src/styleTree/simpleMessageNotification.ts +++ b/styles/src/styleTree/simpleMessageNotification.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" const headerPadding = 8 diff --git a/styles/src/styleTree/statusBar.ts b/styles/src/styleTree/statusBar.ts index ee78f5e6b311f74f229d6ff1d5c98f6d3c07d70e..30f933de8c153eca7ae15562a3d4263e620238a7 100644 --- a/styles/src/styleTree/statusBar.ts +++ b/styles/src/styleTree/statusBar.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function statusBar(colorScheme: ColorScheme) { let layer = colorScheme.lowest diff --git a/styles/src/styleTree/tabBar.ts b/styles/src/styleTree/tabBar.ts index 8011a707727a14f031839e857664ebb4ccca599a..ae2d14bfd624ea52591f378e70c8c46798b71e37 100644 --- a/styles/src/styleTree/tabBar.ts +++ b/styles/src/styleTree/tabBar.ts @@ -2,7 +2,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { text, border, background, foreground } from "./components" import { toggleable } from "./toggle" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function tabBar(colorScheme: ColorScheme) { const height = 32 diff --git a/styles/src/styleTree/toolbarDropdownMenu.ts b/styles/src/styleTree/toolbarDropdownMenu.ts index 0bb3958dc878dfd1206a663c1ceca7a6ad4389cc..bb3e8eda0c83ad9b1ca45ba0321440852ed9e61b 100644 --- a/styles/src/styleTree/toolbarDropdownMenu.ts +++ b/styles/src/styleTree/toolbarDropdownMenu.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import { toggleable } from "./toggle" export default function dropdownMenu(colorScheme: ColorScheme) { let layer = colorScheme.middle diff --git a/styles/src/styleTree/updateNotification.ts b/styles/src/styleTree/updateNotification.ts index a7a5aaabaa8c4881e0fd4ada5c049da45a458c80..0cef7fa805eb660f38cb50a13e8e189c1919075b 100644 --- a/styles/src/styleTree/updateNotification.ts +++ b/styles/src/styleTree/updateNotification.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { foreground, text } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" const headerPadding = 8 diff --git a/styles/src/styleTree/welcome.ts b/styles/src/styleTree/welcome.ts index f0e4badf3f84f34f7a3501eb29d67afdfab0c6eb..a0d599b7477058c7097f79f75cf2e0b31f1bcc7d 100644 --- a/styles/src/styleTree/welcome.ts +++ b/styles/src/styleTree/welcome.ts @@ -8,7 +8,7 @@ import { TextProperties, svg, } from "./components" -import { interactive } from "../element/interactive" +import { interactive } from "../element" export default function welcome(colorScheme: ColorScheme) { let layer = colorScheme.highest diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index fa2d337592bca85fc58df563d8091ff723e9bfc6..1045be1a9af1023aed9ce7ac681f0b4804e2b2ee 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -11,7 +11,7 @@ import { } from "./components" import statusBar from "./statusBar" import tabBar from "./tabBar" -import { interactive } from "../element/interactive" +import { interactive } from "../element" import merge from 'ts-deepmerge'; export default function workspace(colorScheme: ColorScheme) { const layer = colorScheme.lowest diff --git a/styles/tsconfig.json b/styles/tsconfig.json index 6d24728a0a9f0e38b3a038c7c7bf3d0642e6e88f..051626adbc371db1b684db8f7e56e06421348153 100644 --- a/styles/tsconfig.json +++ b/styles/tsconfig.json @@ -20,7 +20,33 @@ "noFallthroughCasesInSwitch": false, "experimentalDecorators": true, "strictPropertyInitialization": false, - "skipLibCheck": true + "skipLibCheck": true, + "baseUrl": ".", + "paths": { + "@/*": [ + "./*" + ], + "@element/*": [ + "./src/element/*" + ], + "@component/*": [ + "./src/component/*" + ], + "@styleTree/*": [ + "./src/styleTree/*" + ], + "@theme/*": [ + "./src/theme/*" + ], + "@themes/*": [ + "./src/themes/*" + ], + "@util/*": [ + "./src/util/*" + ] + } }, - "exclude": ["node_modules"] + "exclude": [ + "node_modules" + ] }