proscenium 0.1.1-x86_64-linux → 0.1.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb09bd3aacc4ffeec61de7c9aed8795432a096ddec4490f44036c2492d04b7b
-  data.tar.gz: 7a173194f536f01294d18f756da7134e736e892135394325b09ee51765ec29cd
+  metadata.gz: 446ad2f069aa35ab275b66632c447318d4f6b58306e4de6f6812b1b4cd3292b3
+  data.tar.gz: 9e620e076b80ae0bc7613b09743b19eceec98a2e16818d19177e01e77394efe0
 SHA512:
-  metadata.gz: fe234a1042f3c813a57c3a1f0edadf11f1d702fd2825cf706a91c06b3e50147864532ddc6e1085cca61f1f4400958104bbb63041cd5a24c400b6800eb9103985
-  data.tar.gz: 42664f98b4e0c74c6ddeab211e73d1c071fad71d335a0664df35cb5b3ef72d25c63a86fbee294725bfb460a21b0c2b2bb733d1afed77bb705699ce5eda9f8bd8
+  metadata.gz: c933cfec773e60aea31f7262bf16dc22471a6dcbb7ede70d9631ba97652f3723c8c2761872ea5276e99cdfab19481e084a6818857580b85cd905260c6d14e8f4
+  data.tar.gz: 82116ba5093880d9a81080fc90b5611271033c595ea3799b04bb99fc8bf2790d40b517c94b5b8999745b9f93487fb85ed2ac8ea4cbc7f5e7479c800bb2bba051

data/lib/proscenium/compilers/esbuild/argument_error.js

@@ -1,6 +1,8 @@
 export default class ArgumentError extends Error {
   static MESSAGES = {
     rootRequired: 'Current working directory is required as --root.',
+    lightningcssBinRequired:
+      'Path to the lightningcss CLI binary is required as --lightningcss-bin.',
     pathsRequired: 'One or more file paths or globs are required.',
 
     rootUnknown: ({ root }) => `A valid working directory is required - received ${root}`

data/lib/proscenium/compilers/esbuild/css_plugin.js

@@ -1,16 +1,12 @@
 import { crypto } from 'std/crypto/mod.ts'
-import { join, resolve, dirname, basename, fromFileUrl } from 'std/path/mod.ts'
+import { join, dirname, basename } from 'std/path/mod.ts'
 
 import { fileExists } from '../../utils.js'
 import postcss from './css/postcss.js'
 import setup from './setup_plugin.js'
 
-export default setup('css', async build => {
+export default setup('css', async (build, options) => {
   const cwd = build.initialOptions.absWorkingDir
-  const lightningcssBin = resolve(
-    dirname(fromFileUrl(import.meta.url)),
-    '../../../../bin/lightningcss'
-  )
 
   let customMedia
   try {
@@ -40,7 +36,7 @@ export default setup('css', async build => {
         }
 
         let cmd = [
-          lightningcssBin,
+          options.lightningcssBin,
           '--nesting',
           '--error-recovery',
           args.pluginData?.importedFromJs && '--minify',

data/lib/proscenium/compilers/esbuild.js

@@ -31,6 +31,8 @@ import throwCompileError from './esbuild/compile_error.js'
  *       take place.
  *   --import-map
  *       Path to an import map, relative to the <root>.
+ *   --lightningcss-bin
+ *       Path to the lightningcss CLI binary.
  *   --write
  *       Write output to the filesystem according to esbuild logic.
  *   --debug
@@ -40,10 +42,11 @@ if (import.meta.main) {
   !Deno.env.get('RAILS_ENV') && Deno.env.set('RAILS_ENV', 'development')
 
   const { _: paths, ...options } = parseArgs(Deno.args, {
-    string: ['root', 'import-map'],
+    string: ['root', 'import-map', 'lightningcss-bin'],
     boolean: ['write', 'debug'],
     alias: {
-      'import-map': 'importMap'
+      'import-map': 'importMap',
+      'lightningcss-bin': 'lightningcssBin'
     }
   })
 
@@ -62,6 +65,7 @@ async function main(paths = [], options = {}) {
 
   if (!Array.isArray(paths) || paths.length < 1) throw new ArgumentError('pathsRequired')
   if (!options.root) throw new ArgumentError('rootRequired')
+  if (!options.lightningcssBin) throw new ArgumentError('lightningcssBinRequired')
 
   const root = resolve(options.root)
 
@@ -117,7 +121,11 @@ async function main(paths = [], options = {}) {
     jsxDev: !isTest && !isProd,
     minify: isProd,
     bundle: true,
-    plugins: [envPlugin(), resolvePlugin({ runtimeDir, importMap, debug }), cssPlugin({ debug })],
+    plugins: [
+      envPlugin(),
+      resolvePlugin({ runtimeDir, importMap, debug }),
+      cssPlugin({ lightningcssBin: options.lightningcssBin, debug })
+    ],
     metafile: write,
     write
   }

data/lib/proscenium/middleware/esbuild.rb

@@ -15,7 +15,9 @@ module Proscenium
 
       def attempt
         benchmark :esbuild do
-          render_response build("#{cli} --root #{root} #{path}")
+          render_response build(
+            "#{cli} --root #{root} --lightningcss-bin #{lightningcss_cli} #{path}"
+          )
         end
       rescue CompileError => e
         render_response "export default #{e.detail.to_json}" do |response|
@@ -38,6 +40,14 @@ module Proscenium
           Gem.bin_path 'proscenium', 'esbuild'
         end
       end
+
+      def lightningcss_cli
+        if ENV['PROSCENIUM_TEST']
+          'bin/lightningcss'
+        else
+          Gem.bin_path 'proscenium', 'lightningcss'
+        end
+      end
     end
   end
 end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: x86_64-linux
 authors:
 - Joel Moss