From d5d24bfd0921904292d0dfec9e954754fbad6192 Mon Sep 17 00:00:00 2001 From: Thomas Rich Date: Mon, 1 Apr 2024 15:07:48 -0700 Subject: [PATCH] tweaking css to not include blueprint by default or font files --- packages/ove/demo/index.js | 2 +- packages/ove/demo/src/index.js | 2 ++ packages/ove/index.html | 2 +- packages/ove/{src => public}/Menlo.ttf | Bin packages/ove/{src => public}/Monaco.ttf | Bin packages/ove/vite.config.lib.ts | 2 +- packages/ui/demo/src/index.js | 1 + packages/ui/index.html | 3 +-- packages/ui/package.json | 5 ++--- packages/ui/src/external_styles.js | 3 +++ packages/ui/src/index.js | 3 --- vite.react.config.ts | 24 ++++++++++++------------ 12 files changed, 24 insertions(+), 23 deletions(-) rename packages/ove/{src => public}/Menlo.ttf (100%) rename packages/ove/{src => public}/Monaco.ttf (100%) create mode 100644 packages/ui/src/external_styles.js diff --git a/packages/ove/demo/index.js b/packages/ove/demo/index.js index f2139e99..3bd16e17 100644 --- a/packages/ove/demo/index.js +++ b/packages/ove/demo/index.js @@ -1 +1 @@ -export * from "../../ove/demo/src"; +export * from "./src"; diff --git a/packages/ove/demo/src/index.js b/packages/ove/demo/src/index.js index 86c90e23..b68be79e 100644 --- a/packages/ove/demo/src/index.js +++ b/packages/ove/demo/src/index.js @@ -1,3 +1,5 @@ +// eslint-disable-next-line @nx/enforce-module-boundaries +import "../../../ui/src/external_styles"; import React, { useMemo } from "react"; import { Provider } from "react-redux"; diff --git a/packages/ove/index.html b/packages/ove/index.html index d10fe824..9d4ff6e6 100644 --- a/packages/ove/index.html +++ b/packages/ove/index.html @@ -7,6 +7,6 @@ -
+
diff --git a/packages/ove/src/Menlo.ttf b/packages/ove/public/Menlo.ttf similarity index 100% rename from packages/ove/src/Menlo.ttf rename to packages/ove/public/Menlo.ttf diff --git a/packages/ove/src/Monaco.ttf b/packages/ove/public/Monaco.ttf similarity index 100% rename from packages/ove/src/Monaco.ttf rename to packages/ove/public/Monaco.ttf diff --git a/packages/ove/vite.config.lib.ts b/packages/ove/vite.config.lib.ts index 2c978b40..3fdeb42e 100644 --- a/packages/ove/vite.config.lib.ts +++ b/packages/ove/vite.config.lib.ts @@ -64,7 +64,7 @@ export default defineConfig({ // Change this to the formats you want to support. // Don't forget to update your package.json as well. }, - copyPublicDir: false, + // copyPublicDir: false, rollupOptions: { // External packages that should not be bundled into your library. external: dependencyKeys, diff --git a/packages/ui/demo/src/index.js b/packages/ui/demo/src/index.js index 6ec40eca..9d79d6ed 100644 --- a/packages/ui/demo/src/index.js +++ b/packages/ui/demo/src/index.js @@ -1,3 +1,4 @@ +import "../../src/external_styles"; import CollapsibleCard from "./examples/CollapsibleCard"; import MenuBar from "./examples/MenuBar"; import HotkeysDialog from "./examples/HotkeysDialog"; diff --git a/packages/ui/index.html b/packages/ui/index.html index 0f7c6296..464030c4 100644 --- a/packages/ui/index.html +++ b/packages/ui/index.html @@ -6,7 +6,6 @@ - -
+
diff --git a/packages/ui/package.json b/packages/ui/package.json index 465ae74f..b33b2ba2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,12 +1,11 @@ { "name": "@teselagen/ui", - "version": "0.3.78", + "version": "0.3.79", "main": "./src/index.js", "exports": { ".": { "import": "./index.es.js", "require": "./index.cjs.js" - }, - "./style.css": "./style.css" + } } } diff --git a/packages/ui/src/external_styles.js b/packages/ui/src/external_styles.js new file mode 100644 index 00000000..10ad82d2 --- /dev/null +++ b/packages/ui/src/external_styles.js @@ -0,0 +1,3 @@ +import "@blueprintjs/core/lib/css/blueprint.css"; +import "@blueprintjs/datetime/lib/css/blueprint-datetime.css"; +import "@blueprintjs/icons/lib/css/blueprint-icons.css"; diff --git a/packages/ui/src/index.js b/packages/ui/src/index.js index 72816cc1..e70b7a8d 100644 --- a/packages/ui/src/index.js +++ b/packages/ui/src/index.js @@ -1,6 +1,3 @@ -import "@blueprintjs/core/lib/css/blueprint.css"; -import "@blueprintjs/datetime/lib/css/blueprint-datetime.css"; -import "@blueprintjs/icons/lib/css/blueprint-icons.css"; import "./style.css"; import "./autoTooltip"; export { LoadingDots } from "./FormComponents/LoadingDots"; diff --git a/vite.react.config.ts b/vite.react.config.ts index 9ad96296..e5d02ea2 100644 --- a/vite.react.config.ts +++ b/vite.react.config.ts @@ -4,7 +4,7 @@ import fs from "node:fs"; import react from "@vitejs/plugin-react"; import viteTsConfigPaths from "vite-tsconfig-paths"; import * as esbuild from "esbuild"; -import vitePluginVirtualHtml from "vite-plugin-virtual-html"; +// import vitePluginVirtualHtml from "vite-plugin-virtual-html"; import libCss from "vite-plugin-libcss"; import { camelCase } from "lodash"; import { getPort } from "./getPort"; @@ -88,17 +88,17 @@ export default ({ name }: { name: string; dir: string }) => }) ] : [ - vitePluginVirtualHtml({ - pages: { - index: { - entry: "./demo/index.js", // MUST - title: `${name} demo`, // optional, default: '' - body: ` -
- ` // optional, default: '
' - } - } - }) + // vitePluginVirtualHtml({ + // pages: { + // index: { + // entry: "./demo/index.js", // MUST + // title: `${name} demo`, // optional, default: '' + // body: ` + //
+ // ` // optional, default: '
' + // } + // } + // }) ]) ], esbuild: {