bun_bun_bundle 0.15.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efbe626f3c9d8abd553a9d2ba4e62bc56616228ca33b7b46638bc9f1b8ae2b34
-  data.tar.gz: cff4e8780c9cf25bf07cb2417a13a22056a3081558f184b1baa4311b107049bc
+  metadata.gz: 9c79743b209590b3032ac218c34f97bb265a730c6d531a8e610535cc7091b904
+  data.tar.gz: 72c36c431475e6ae64cd6e9f9b1bfd5e4e6636fe816c08dab890dcd8938d569a
 SHA512:
-  metadata.gz: 14946ddc866eb9695bf55eb43c3d0e4e7f5d41e670339baa26a935b931bb1081dc4e2a4a53a08300a29508e39d84c16c6a0fb393118b125b999ecf883b1777e8
-  data.tar.gz: a5bf6c88fd8c19c8a16599ce41b0e4972a4b5cfacd7994413fe2f6f277568764662b6af89a19d25762ce3f3b0ada63283d7d252089a688b603c40621e8953241
+  metadata.gz: 2cb7ae2c2abc22ec33e8476a595c083fc9f380020a5c53d1601b34c4e3937ecda165e3b707037a6873cbc3aef79a6a549ddbded82b7e4dc5b3f8c8fd355a256f
+  data.tar.gz: f224269b08ada52408905e18b29f63a9f03f153cd755add16247b199c25ae551cec554c58bdf3f21fa025a104872667806c2a340c9bc2c95149f7569ec3dce14

data/README.md

@@ -319,6 +319,20 @@ To exclude specific paths, add one or more `not` clauses:
   './components/internal/**';
 ```
 
+Cascade layer assignments are preserved on each expanded import. Both named
+and anonymous forms are supported:
+
+```css
+@import './components/*.css' layer(components);
+@import './utilities/*.css' layer;
+```
+
+`layer` clauses may be combined with `not` clauses (layer first):
+
+```css
+@import './components/**/*.css' layer(components) not './components/admin/**';
+```
+
 > [!WARNING]
 > Always include the file extension in glob patterns (e.g., `**/*.css` instead
 > of `**/*`). Without it, editor temp files like Vim's `~` backups will be
@@ -433,6 +447,10 @@ Reference custom plugins by their file path in your config:
 }
 ```
 
+A plugin list replaces the built-in list for that asset type only. In the
+example above both lists re-include the defaults, but overriding just `"js"`
+leaves the default `css` plugins (`aliases`, `cssGlobs`) in place.
+
 > [!WARNING]
 > The order of the plugins matters here. For example, the aliases plugin needs
 > to resolve the paths first before the glob plugin can do its work. Keep that

data/lib/bun/bun_bundle.js

@@ -141,7 +141,6 @@ export default {
       const json = readFileSync(join(this.root, this.CONFIG_PATH), 'utf-8')
       const user = JSON.parse(json)
       this.config = this.deepMerge(defaults, user)
-      if (user.plugins != null) this.config.plugins = user.plugins
     } catch {
       this.config = defaults
     }

data/lib/bun/plugins/aliases.js

@@ -1,6 +1,6 @@
 const CSS_REGEX = /((?:url\(\s*|@import\s+|not\s+)['"]?(?:glob:)?)\$\//g
 const JS_REGEX =
-  /((?:from\s+|require\s*\(\s*|import\s*\(\s*)['"](?:glob:)?)\$\//g
+  /((?:from\s+|import\s+|require\s*\(\s*|import\s*\(\s*)['"](?:glob:)?)\$\//g
 
 // Resolves `$/` root aliases in CSS url() references and JS/CSS imports.
 // e.g. url('$/app/assets/images/foo.png') → url('/absolute/root/app/assets/images/foo.png')

data/lib/bun/plugins/cssGlobs.js

@@ -2,12 +2,16 @@ import {dirname, relative, resolve, join} from 'path'
 import {Glob} from 'bun'
 
 const IMPORT_RE =
-  /@import\s+['"]([^'"]*\*[^'"]*)['"]((?:\s+not\s+['"][^'"]*['"])*)\s*;/g
+  /@import\s+['"]([^'"]*\*[^'"]*)['"](?:\s+(layer(?:\([^)]*\))?))?((?:\s+not\s+['"][^'"]*['"])*)\s*;/g
 const NOT_RE = /not\s+['"]([^'"]*)['"]/g
 
 function parseImport(match) {
-  const nots = [...(match[2] || '').matchAll(NOT_RE)]
-  return {pattern: match[1], excludes: nots.map(m => m[1])}
+  const nots = [...(match[3] || '').matchAll(NOT_RE)]
+  return {
+    pattern: match[1],
+    layer: match[2] || null,
+    excludes: nots.map(m => m[1])
+  }
 }
 
 function splitGlob(pattern) {
@@ -48,7 +52,7 @@ export default function cssGlobs() {
     const replacements = []
 
     for (const match of content.matchAll(IMPORT_RE)) {
-      const {pattern, excludes} = parseImport(match)
+      const {pattern, layer, excludes} = parseImport(match)
       const files = (await scanFiles(fileDir, pattern, excludes)).filter(
         f => resolve(fileDir, f) !== args.path
       )
@@ -64,9 +68,10 @@ export default function cssGlobs() {
       const s = files.length !== 1 ? 's' : ''
       console.log(`  CSS glob: ${label} → ${files.length} file${s}`)
 
+      const suffix = layer ? ` ${layer}` : ''
       replacements.push({
         fullMatch: match[0],
-        expanded: files.map(f => `@import '${f}';`).join('\n')
+        expanded: files.map(f => `@import '${f}'${suffix};`).join('\n')
       })
     }
 

data/lib/bun_bun_bundle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BunBunBundle
-  VERSION = '0.15.1'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bun_bun_bundle
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Wout Fierens