plutonium 0.15.18 → 0.15.19

data/lib/generators/pu/core/assets/assets_generator.rb

@@ -15,6 +15,8 @@ module Pu
         install_dependencies
         copy_tailwind_config
         configure_application
+        replace_build_script
+        import_styles
       rescue => e
         exception "#{self.class} failed:", e
       end
@@ -23,10 +25,11 @@ module Pu
 
       def copy_tailwind_config
         copy_file "tailwind.config.js", force: true
+        copy_file "postcss.config.js", force: true
       end
 
       def install_dependencies
-        run "yarn add @radioactive-labs/plutonium flowbite @tailwindcss/forms"
+        run "yarn add @radioactive-labs/plutonium flowbite @tailwindcss/forms @tailwindcss/typography postcss-cli cssnano"
       end
 
       def configure_application
@@ -39,6 +42,17 @@ module Pu
         configure_plutonium "config.assets.stylesheet = \"application\""
         configure_plutonium "config.assets.script = \"application\""
       end
+
+      def replace_build_script
+        gsub_file "package.json",
+          /"build:css":.*/,
+          '"build:css": "postcss ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css"'
+      end
+
+      def import_styles
+        prepend_to_file "app/assets/stylesheets/application.tailwind.css",
+          "@import \"gem:plutonium/src/css/plutonium.css\";\n"
+      end
     end
   end
 end

data/lib/generators/pu/core/assets/templates/postcss.config.js

@@ -0,0 +1,12 @@
+const { execSync } = require('child_process');
+const plutoniumGemPath = execSync("bundle show plutonium").toString().trim();
+
+module.exports = {
+  plugins: {
+    [`${plutoniumGemPath}/postcss-gem-import.js`]: {},
+    'postcss-import': {},
+    tailwindcss: {},
+    autoprefixer: {},
+    cssnano: {}
+  }
+}

data/lib/plutonium/ui/layout/base.rb

@@ -33,18 +33,7 @@ module Plutonium
           head {
             render_title
             render_metatags
-            render_security_metatags
-            render_turbo_metatags
-            render_font_tags
-            render_favicon_tag
-            render_assets_tags
-
-            # plain assets
-            # plain head
-            # <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.7/quill.snow.min.css" integrity="sha512-/FHUK/LsH78K9XTqsR9hbzr21J8B8RwHR/r8Jv9fzry6NVAOVIGFKQCNINsbhK7a1xubVu2r5QZcz2T9cKpubw==" crossorigin="anonymous" referrerpolicy="no-referrer" /> '
-            # <script src="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.7/quill.min.js" integrity="sha512-P2W2rr8ikUPfa31PLBo5bcBQrsa+TNj8jiKadtaIrHQGMo6hQM6RdPjQYxlNguwHz8AwSQ28VkBK6kHBLgd/8g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-            # <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slim-select/2.6.0/slimselect.min.css" integrity="sha512-GvqWM4KWH8mbgWIyvwdH8HgjUbyZTXrCq0sjGij9fDNiXz3vJoy3jCcAaWNekH2rJe4hXVWCJKN+bEW8V7AAEQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-            # <script src="https://cdnjs.cloudflare.com/ajax/libs/slim-select/2.6.0/slimselect.min.js" integrity="sha512-0E8oaoA2v32h26IycsmRDShtQ8kMgD91zWVBxdIvUCjU3xBw81PV61QBsBqNQpWkp/zYJZip8Ag3ifmzz1wCKQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+            render_assets
           }
         end
 
@@ -53,6 +42,7 @@ module Plutonium
             render_before_main
             render_main(&)
             render_after_main
+            render_body_scripts
           }
         end
 
@@ -90,6 +80,12 @@ module Plutonium
         end
 
         def render_metatags
+          render_base_metatags
+          render_security_metatags
+          render_turbo_metatags
+        end
+
+        def render_base_metatags
           meta(charset: "utf-8")
           meta(name: "viewport", content: "width=device-width,initial-scale=1")
         end
@@ -105,30 +101,35 @@ module Plutonium
           meta(name: "turbo-refresh-scroll", content: "preserve")
         end
 
-        def render_font_tags
+        def render_fonts
           link(rel: "preconnect", href: "https://fonts.googleapis.com")
           link(rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: true)
           link(href: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap", rel: "stylesheet")
         end
 
-        def render_favicon_tag
+        def render_favicon
           favicon_link_tag(Plutonium.configuration.assets.favicon) if Plutonium.configuration.assets.favicon
         end
 
-        def render_assets_tags
-          render_asset_style_tags
-          render_asset_scripts_tags
+        def render_assets
+          render_favicon
+          render_fonts
+          render_styles
+          render_scripts
         end
 
-        def render_asset_style_tags
+        def render_styles
           url = resource_asset_url_for(:css, resource_stylesheet_asset)
           stylesheet_link_tag(url, "data-turbo-track": "reload")
         end
 
-        def render_asset_scripts_tags
+        def render_scripts
           url = resource_asset_url_for(:js, resource_script_asset)
           javascript_include_tag(url, "data-turbo-track": "reload", type: "module")
         end
+
+        def render_body_scripts
+        end
       end
     end
   end

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.18"
+  VERSION = "0.15.19"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.1.9",
+      "version": "0.1.10",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
@@ -16,6 +16,7 @@
       },
       "devDependencies": {
         "@tailwindcss/forms": "^0.5.7",
+        "@tailwindcss/typography": "^0.5.15",
         "autoprefixer": "^10.4.18",
         "concurrently": "^8.2.2",
         "cssnano": "^7.0.2",
@@ -1470,6 +1471,36 @@
         "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
       }
     },
+    "node_modules/@tailwindcss/typography": {
+      "version": "0.5.15",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
+      "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash.castarray": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2",
+        "postcss-selector-parser": "6.0.10"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
+      }
+    },
+    "node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -2829,10 +2860,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -4401,17 +4433,38 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.castarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
+      "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.7",
+    "@tailwindcss/typography": "^0.5.15",
     "autoprefixer": "^10.4.18",
     "concurrently": "^8.2.2",
     "cssnano": "^7.0.2",

data/postcss-gem-import.js

@@ -0,0 +1,28 @@
+import { execSync } from 'child_process';
+
+const plugin = (opts = {}) => {
+  return {
+    postcssPlugin: 'postcss-gem-import',
+    Once(root) {
+      root.walkAtRules('import', (rule) => {
+        const importPath = rule.params.replace(/['"]/g, '');
+
+        if (importPath.startsWith('gem:')) {
+          const gemName = importPath.split('gem:')[1].split('/')[0];
+
+          try {
+            const gemPath = execSync(`bundle show ${gemName}`, { encoding: 'utf8' }).trim();
+            const newPath = importPath.replace(`gem:${gemName}`, gemPath);
+            rule.params = `"${newPath}"`;
+          } catch (error) {
+            throw rule.error(`Failed to resolve gem path for ${gemName}: ${error.message}`);
+          }
+        }
+      });
+    }
+  };
+};
+
+plugin.postcss = true;
+
+export default plugin;

data/postcss.config.js

@@ -1,5 +1,6 @@
 const config = {
   plugins: {
+    'postcss-import': {},
     tailwindcss: {},
     autoprefixer: {}
   }

data/src/css/core.css

@@ -0,0 +1,13 @@
+@layer components {
+  .pu-color-input::-webkit-color-swatch-wrapper {
+    @apply p-0;
+  }
+
+  .pu-color-input::-webkit-color-swatch {
+    @apply border-none rounded-lg;
+  }
+
+  .pu-color-input::-moz-color-swatch {
+    @apply border-none rounded-lg;
+  }
+}