From 48edd99047b69e1502256cf9a0cee43b3724f1a2 Mon Sep 17 00:00:00 2001 From: Nanda Date: Fri, 26 Apr 2024 12:18:32 +1000 Subject: [PATCH] Fix import paths. --- .../PrivateIndicator/PrivateIndicator.tsx | 4 ++-- .../StandardUserInterface/StandardTheme.tsx | 4 ++-- lib/Styled/mixins.ts | 2 +- tsconfig-node.json | 6 +----- yarn.lock | 15 ++++++++++++++- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lib/ReactViews/PrivateIndicator/PrivateIndicator.tsx b/lib/ReactViews/PrivateIndicator/PrivateIndicator.tsx index edb7f388baa..bb5295f34b2 100644 --- a/lib/ReactViews/PrivateIndicator/PrivateIndicator.tsx +++ b/lib/ReactViews/PrivateIndicator/PrivateIndicator.tsx @@ -1,7 +1,7 @@ import React from "react"; import { useTranslation } from "react-i18next"; -import Icon from "terriajs/lib/Styled/Icon"; -import IconWrapper from "terriajs/lib/Styled/IconWrapper"; +import Icon from "../../Styled/Icon"; +import IconWrapper from "../../Styled/IconWrapper"; interface PropsType { inWorkbench?: boolean; diff --git a/lib/ReactViews/StandardUserInterface/StandardTheme.tsx b/lib/ReactViews/StandardUserInterface/StandardTheme.tsx index 5eca616ff28..a065688d20e 100644 --- a/lib/ReactViews/StandardUserInterface/StandardTheme.tsx +++ b/lib/ReactViews/StandardUserInterface/StandardTheme.tsx @@ -1,5 +1,5 @@ -import Variables from "terriajs/lib/Sass/exports/_variables-export.scss"; -import Mixins from "terriajs/lib/Styled/mixins"; +import Variables from "../../Sass/exports/_variables-export.scss"; +import Mixins from "../../Styled/mixins"; export const terriaTheme = { ...Variables, diff --git a/lib/Styled/mixins.ts b/lib/Styled/mixins.ts index 32af1855cc3..359691550c6 100644 --- a/lib/Styled/mixins.ts +++ b/lib/Styled/mixins.ts @@ -1,6 +1,6 @@ // Doesn't result in composed classes that reuse these, but to save some typing -import cssExports from "terriajs/lib/Sass/exports/_variables-export.scss"; +import cssExports from "../Sass/exports/_variables-export.scss"; interface MixinProps { theme: typeof cssExports; diff --git a/tsconfig-node.json b/tsconfig-node.json index 5f07bcbabdb..37123944db3 100644 --- a/tsconfig-node.json +++ b/tsconfig-node.json @@ -24,10 +24,6 @@ "./lib/Traits/**/*", "./lib/Language/**/*", "./lib/ReactViews/**/*", - "./lib/ThirdParty/**/*", - // These Sass and Styled modules are required for their typings - "./lib/Sass/exports/*", - "./lib/Styled/Icon.tsx", - "./lib/Styled/IconWrapper.tsx" + "./lib/ThirdParty/**/*" ] } diff --git a/yarn.lock b/yarn.lock index d69661004f2..4a85f68382b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1787,7 +1787,7 @@ dependencies: "@types/geojson" "*" -"@types/linkify-it@^3.0.5": +"@types/linkify-it@*", "@types/linkify-it@^3.0.5": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.5.tgz#1e78a3ac2428e6d7e6c05c1665c242023a4601d8" integrity sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw== @@ -1804,11 +1804,24 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== +"@types/markdown-it@^14.0.1": + version "14.0.1" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.0.1.tgz#3d3fdf9dba83b69edececc070d39ec72b84270a7" + integrity sha512-6WfOG3jXR78DW8L5cTYCVVGAsIFZskRHCDo5tbqa+qtKVt4oDRVH7hyIWu1SpDQJlmIoEivNQZ5h+AGAOrgOtQ== + dependencies: + "@types/linkify-it" "*" + "@types/mdurl" "*" + "@types/math-expression-evaluator@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/math-expression-evaluator/-/math-expression-evaluator-1.2.2.tgz#05970d669d8c27c43f97d1557fa2a67e79698100" integrity sha512-eHy3f0C2mfFdHbK2zoKRXaM830dm2pSTUBWZ3aJCWxFsOxErWsXNPziFLliqBddGYreCM4Nyl1IZwFCt0jwRNg== +"@types/mdurl@*": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.5.tgz#3e0d2db570e9fb6ccb2dc8fde0be1d79ac810d39" + integrity sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA== + "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"