fix: cleanup /src file structure and npm scripts

saadeghi · Apr 29, 2021 · 6a4c2dd · 6a4c2dd
1 parent 2ff947d
commit 6a4c2dd
Show file tree

Hide file tree

Showing 60 changed files with 15 additions and 83 deletions.
diff --git a/index.js b/index.js
@@ -1,9 +1,9 @@
 var daisyuiInfo = require('./package.json')
 
-const base = require("./dist/base.js")
-const baseRtl = require("./dist/base.rtl.js")
-const styled = require("./dist/styled.js")
-const styledRtl = require("./dist/styled.rtl.js")
+const base = require("./dist/base")
+const baseRtl = require("./dist/base.rtl")
+const styled = require("./dist/styled")
+const styledRtl = require("./dist/styled.rtl")
 const colors = require("./colors/index")
 const resets_general = require('./dist/resets/general')
 const themes = require("./dist/themes")

diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
   "typings": "index.js",
   "files": [
     "dist",
+    "!dist/components",
     "index.js",
     "colors"
   ],
@@ -71,12 +72,15 @@
     "tailwindcss": "^2.0.1"
   },
   "scripts": {
-    "prestyle": "prejss-cli src/resets/*.css --out-dir dist/resets --format commonjs && prejss-cli src/utilities/*.css --out-dir dist/utilities --format commonjs",
-    "style": "postcss src/base/index.css -o dist/base.css && postcss src/styled/index.css -o dist/styled.css && postcss src/full/index.css -o dist/full.css && postcss src/themes/index.css -o dist/themes.css",
-    "poststyle": "prejss-cli dist/base.css --format commonjs && prejss-cli dist/styled.css --format commonjs && prejss-cli dist/themes.css --format commonjs",
+    "utilities": "prejss-cli src/resets/*.css --out-dir dist/resets --format commonjs && prejss-cli src/utilities/*.css --out-dir dist/utilities --format commonjs",
+    "components": "postcss src/{components,themes}/**/*.css --base src --dir dist",
+    "base": "cat dist/components/base/*.css > dist/base.css",
+    "styled": "cat dist/components/base/*.css dist/components/styled/*.css > dist/styled.css",
+    "themes": "cat dist/themes/*.css > dist/themes.css",
     "rtl": "rtlcss dist/base.css -s && rtlcss dist/styled.css -s",
-    "postrtl": "prejss-cli dist/base.rtl.css --format commonjs && prejss-cli dist/styled.rtl.css --format commonjs",
-    "build": "npm run style && npm run rtl",
-    "add": "touch src/base/components/$npm_config_name.css && touch src/styled/components/$npm_config_name.css && echo '@import \"./components/'$npm_config_name'\";' >> src/base/index.css && echo '@import \"./components/'$npm_config_name'\";' >> src/styled/index.css && open src/base/components/$npm_config_name.css && open src/styled/components/$npm_config_name.css"
+    "prejss": "prejss-cli dist/{{base,styled}{,.rtl},themes}.css --format commonjs",
+    "full": "postcss src/full/index.css -o dist/full.css",
+    "build": "npm run utilities && npm run components && npm run base && npm run styled && npm run themes && npm run rtl && npm run prejss && npm run full",
+    "add": "touch src/components/base/$npm_config_name.css && touch src/components/styled/$npm_config_name.css && open src/components/base/$npm_config_name.css && open src/components/styled/$npm_config_name.css"
   }
 }
diff --git a/src/base/index.css b/src/base/index.css
diff --git a/src/base/components/accordion.css → src/components/base/accordion.css b/src/base/components/accordion.css → src/components/base/accordion.css
diff --git a/src/base/components/alert.css → src/components/base/alert.css b/src/base/components/alert.css → src/components/base/alert.css
diff --git a/src/base/components/artboard.css → src/components/base/artboard.css b/src/base/components/artboard.css → src/components/base/artboard.css
diff --git a/src/base/components/avatar.css → src/components/base/avatar.css b/src/base/components/avatar.css → src/components/base/avatar.css
diff --git a/src/base/components/badge.css → src/components/base/badge.css b/src/base/components/badge.css → src/components/base/badge.css
diff --git a/src/base/components/breadcrumbs.css → src/components/base/breadcrumbs.css b/src/base/components/breadcrumbs.css → src/components/base/breadcrumbs.css
diff --git a/src/base/components/button.css → src/components/base/button.css b/src/base/components/button.css → src/components/base/button.css
diff --git a/src/base/components/card.css → src/components/base/card.css b/src/base/components/card.css → src/components/base/card.css
diff --git a/src/base/components/checkbox.css → src/components/base/checkbox.css b/src/base/components/checkbox.css → src/components/base/checkbox.css
diff --git a/src/base/components/countdown.css → src/components/base/countdown.css b/src/base/components/countdown.css → src/components/base/countdown.css
diff --git a/src/base/components/divider.css → src/components/base/divider.css b/src/base/components/divider.css → src/components/base/divider.css
diff --git a/src/base/components/drawer.css → src/components/base/drawer.css b/src/base/components/drawer.css → src/components/base/drawer.css
diff --git a/src/base/components/form.css → src/components/base/form.css b/src/base/components/form.css → src/components/base/form.css
diff --git a/src/base/components/hero.css → src/components/base/hero.css b/src/base/components/hero.css → src/components/base/hero.css
diff --git a/src/base/components/input.css → src/components/base/input.css b/src/base/components/input.css → src/components/base/input.css
diff --git a/src/base/components/link.css → src/components/base/link.css b/src/base/components/link.css → src/components/base/link.css
diff --git a/src/base/components/mask.css → src/components/base/mask.css b/src/base/components/mask.css → src/components/base/mask.css
diff --git a/src/base/components/menu.css → src/components/base/menu.css b/src/base/components/menu.css → src/components/base/menu.css
diff --git a/src/base/components/mockup.css → src/components/base/mockup.css b/src/base/components/mockup.css → src/components/base/mockup.css
diff --git a/src/base/components/modal.css → src/components/base/modal.css b/src/base/components/modal.css → src/components/base/modal.css
diff --git a/src/base/components/navbar.css → src/components/base/navbar.css b/src/base/components/navbar.css → src/components/base/navbar.css
diff --git a/src/base/components/progress.css → src/components/base/progress.css b/src/base/components/progress.css → src/components/base/progress.css
diff --git a/src/base/components/radio.css → src/components/base/radio.css b/src/base/components/radio.css → src/components/base/radio.css
diff --git a/src/base/components/select.css → src/components/base/select.css b/src/base/components/select.css → src/components/base/select.css
diff --git a/src/base/components/tab.css → src/components/base/tab.css b/src/base/components/tab.css → src/components/base/tab.css
diff --git a/src/base/components/textarea.css → src/components/base/textarea.css b/src/base/components/textarea.css → src/components/base/textarea.css
diff --git a/src/base/components/toggle.css → src/components/base/toggle.css b/src/base/components/toggle.css → src/components/base/toggle.css
diff --git a/src/styled/components/accordion.css → src/components/styled/accordion.css b/src/styled/components/accordion.css → src/components/styled/accordion.css
diff --git a/src/styled/components/alert.css → src/components/styled/alert.css b/src/styled/components/alert.css → src/components/styled/alert.css
diff --git a/src/styled/components/artboard.css → src/components/styled/artboard.css b/src/styled/components/artboard.css → src/components/styled/artboard.css
diff --git a/src/styled/components/avatar.css → src/components/styled/avatar.css b/src/styled/components/avatar.css → src/components/styled/avatar.css
diff --git a/src/styled/components/badge.css → src/components/styled/badge.css b/src/styled/components/badge.css → src/components/styled/badge.css
diff --git a/src/styled/components/breadcrumbs.css → src/components/styled/breadcrumbs.css b/src/styled/components/breadcrumbs.css → src/components/styled/breadcrumbs.css
diff --git a/src/styled/components/button.css → src/components/styled/button.css b/src/styled/components/button.css → src/components/styled/button.css
diff --git a/src/styled/components/card.css → src/components/styled/card.css b/src/styled/components/card.css → src/components/styled/card.css
diff --git a/src/styled/components/checkbox.css → src/components/styled/checkbox.css b/src/styled/components/checkbox.css → src/components/styled/checkbox.css
diff --git a/src/styled/components/countdown.css → src/components/styled/countdown.css b/src/styled/components/countdown.css → src/components/styled/countdown.css
diff --git a/src/styled/components/divider.css → src/components/styled/divider.css b/src/styled/components/divider.css → src/components/styled/divider.css
diff --git a/src/styled/components/drawer.css → src/components/styled/drawer.css b/src/styled/components/drawer.css → src/components/styled/drawer.css
diff --git a/src/styled/components/form.css → src/components/styled/form.css b/src/styled/components/form.css → src/components/styled/form.css
diff --git a/src/styled/components/hero.css → src/components/styled/hero.css b/src/styled/components/hero.css → src/components/styled/hero.css
diff --git a/src/styled/components/input.css → src/components/styled/input.css b/src/styled/components/input.css → src/components/styled/input.css
diff --git a/src/styled/components/link.css → src/components/styled/link.css b/src/styled/components/link.css → src/components/styled/link.css
diff --git a/src/styled/components/mask.css → src/components/styled/mask.css b/src/styled/components/mask.css → src/components/styled/mask.css
diff --git a/src/styled/components/menu.css → src/components/styled/menu.css b/src/styled/components/menu.css → src/components/styled/menu.css
diff --git a/src/styled/components/mockup.css → src/components/styled/mockup.css b/src/styled/components/mockup.css → src/components/styled/mockup.css
diff --git a/src/styled/components/modal.css → src/components/styled/modal.css b/src/styled/components/modal.css → src/components/styled/modal.css
diff --git a/src/styled/components/navbar.css → src/components/styled/navbar.css b/src/styled/components/navbar.css → src/components/styled/navbar.css
diff --git a/src/styled/components/progress.css → src/components/styled/progress.css b/src/styled/components/progress.css → src/components/styled/progress.css
diff --git a/src/styled/components/radio.css → src/components/styled/radio.css b/src/styled/components/radio.css → src/components/styled/radio.css
diff --git a/src/styled/components/select.css → src/components/styled/select.css b/src/styled/components/select.css → src/components/styled/select.css
diff --git a/src/styled/components/tab.css → src/components/styled/tab.css b/src/styled/components/tab.css → src/components/styled/tab.css
diff --git a/src/styled/components/textarea.css → src/components/styled/textarea.css b/src/styled/components/textarea.css → src/components/styled/textarea.css
diff --git a/src/styled/components/toggle.css → src/components/styled/toggle.css b/src/styled/components/toggle.css → src/components/styled/toggle.css
diff --git a/src/full/index.css b/src/full/index.css
@@ -1,5 +1,5 @@
 @import "tailwindcss/base";
 @import "tailwindcss/components";
-@import "./../styled/index";
+@import "./../../dist/styled";
 @import "tailwindcss/utilities";
 
diff --git a/src/styled/index.css b/src/styled/index.css
diff --git a/src/themes/index.css b/src/themes/index.css