diff --git a/package.json b/package.json index fcde0c3..eb942c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leux", - "version": "0.2.8", + "version": "0.2.9", "homepage": "https://leux.vercel.app/", "description": "React components library", "publishConfig": { @@ -79,7 +79,6 @@ "rollup": "^2.79.0", "rollup-plugin-dts": "^4.2.2", "rollup-plugin-includepaths": "^0.2.4", - "rollup-plugin-merge-and-inject-css": "^1.1.3", "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-terser": "^7.0.2", diff --git a/rollup.config.js b/rollup.config.js index 03ef953..40bc915 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -13,8 +13,6 @@ import cssnested from "postcss-nested"; // eslint-disable-next-line node/no-missing-import import cssimport from "postcss-import"; -import cssmerge from "rollup-plugin-merge-and-inject-css"; - import peerDepsExternal from "rollup-plugin-peer-deps-external"; import eslint from "@rollup/plugin-eslint"; import eslintConfig from "./.eslintrc.json"; @@ -38,13 +36,16 @@ export default [ ], plugins: [ postcss({ + extract: "leux.min.css", inject: true, + modules: true, minimize: true, plugins: [cssimport(), simplevars(), cssnested()], - include: ["src/**/*.scss"], - }), - cssmerge({ - id: "leux.min.css", + use: { + sass: true, + stylus: null, + less: null, + }, }), peerDepsExternal(), commonjs(), diff --git a/src/components/CSS/CSS.tsx b/src/components/CSS/CSS.tsx new file mode 100644 index 0000000..9c89f93 --- /dev/null +++ b/src/components/CSS/CSS.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +import "./global.scss"; +import "./variables.scss"; +import "./main.scss"; + +const LeCSS = () => <>; + +export { LeCSS }; diff --git a/src/styles/global.scss b/src/components/CSS/global.scss similarity index 100% rename from src/styles/global.scss rename to src/components/CSS/global.scss diff --git a/src/components/CSS/index.ts b/src/components/CSS/index.ts new file mode 100644 index 0000000..7afe4f5 --- /dev/null +++ b/src/components/CSS/index.ts @@ -0,0 +1 @@ +export * from "./CSS"; diff --git a/src/styles/main.scss b/src/components/CSS/main.scss similarity index 100% rename from src/styles/main.scss rename to src/components/CSS/main.scss diff --git a/src/styles/variables.scss b/src/components/CSS/variables.scss similarity index 100% rename from src/styles/variables.scss rename to src/components/CSS/variables.scss diff --git a/src/components/index.ts b/src/components/index.ts index 0fe2b3c..5f00d5d 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -22,3 +22,4 @@ export * from "./ToastContext"; export * from "./ToastProvider"; export * from "./Tooltip"; export * from "./Topography"; +export * from "./CSS"; diff --git a/src/index.ts b/src/index.ts index 83cc4d1..9d1360b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,3 @@ export * from "./components"; export * from "./types"; -export * as LeCSS from "./styles"; export * from "./utils"; diff --git a/src/styles/index.ts b/src/styles/index.ts deleted file mode 100644 index 7c2a6ce..0000000 --- a/src/styles/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import "./global.scss"; -import "./variables.scss"; -import "./main.scss";