proscenium 0.1.0.alpha4-arm64-darwin → 0.1.2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac83bfca343680535bf4f188a9e74db2848752cda2708f323a175215d508a1c
-  data.tar.gz: ba7d653af25382437e4aa3870f5be2f02731da51828080c01eddcdb370f58de9
+  metadata.gz: d20f6189b8ed53c8f8c49fdd34ff7c94e9dd664e4a270d0f19300ce2435868b2
+  data.tar.gz: 19ca20f0dc49a00ccacddc79459cfa1f9676f3d89d5f276a8c1b9c27637f2212
 SHA512:
-  metadata.gz: f1ee7d5ca80dd3ada1436934df8302cbb091e0eca24f9be66417b529a47a574edd46bae4e3b00a643f0eeab0af80a72d2fdebd174b2403aab56de59df4ccb02b
-  data.tar.gz: 686685bd60968269a7e286a965f7aeab153e5202136d881f875586f8c64eade642e51f405b4d1a92a88be04dea85e7ba3d07b94900ce582cd8d3372bbea16c65
+  metadata.gz: 2703a824ce1acc0e8aa972012fe275b881d8946ff63c8498f8b52de64229faeadc4008e00acb960078c5c9c3d8c02b0219ddaeb75f0b7479f529e7f34495e12a
+  data.tar.gz: fa206820113a895af26afa184c88045a62ac307e83eaf7337c9feaff202f2d4ac01d16de9b19378f162397bb839f6ca268b0429ec515a39d21899b34b706a8a5

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,13 +121,17 @@ 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
   }
 
   if (!debug) {
-    params.sourcemap = isTest ? false : isProd ? 'linked' : 'inline'
+    params.sourcemap = isProd || isTest ? false : 'inline'
   }
 
   let result
@@ -142,7 +150,8 @@ async function main(paths = [], options = {}) {
   if (write) {
     return new TextEncoder().encode(JSON.stringify(result))
   } else {
-    return result.outputFiles[0].contents
+    const fileIndex = params.sourcemap === 'linked' ? 1 : 0
+    return result.outputFiles[fileIndex].contents
   }
 }
 

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.0.alpha4'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha4
+  version: 0.1.2
 platform: arm64-darwin
 authors:
 - Joel Moss
@@ -200,9 +200,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: