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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7479881d2ace4e2930975f02eee4c5085f2355e06d35d689ca419ec0a4eb6a0
-  data.tar.gz: 216ac3339281bc6c7b526ba25d6f228fe01b855d14071a8b74eddf8d8ae94354
+  metadata.gz: ad7315e0b0349ce11b5629c744808ce9a80050a32eb942bf2572e38a534b9fa9
+  data.tar.gz: e93884817dea84e7251a0660d6d2ba650a7643c3e81f7787885e4ea13a904c02
 SHA512:
-  metadata.gz: 28c0ea45615d6eaa21bb5d761df7eab863f4b7ce81ea747514b521ebf23bb2ad1baa9a8a3172a423a21da0b11d58f0a0104c2ddb18660d765ac9b8827c36c319
-  data.tar.gz: 1289a1eeeabf08d25f7183fd5d300fe0ac60162784c25ba719039cd3bbe91739541f64d3690d98c75a288bfc660339d601b56ee60aa1bfa21ac149557538b878
+  metadata.gz: 57badd536fa32f94881fa5e02e9115510ffa1397d6425fe2ffb4438505c6eb042a8ceb87cea336939ba6972b9bcf08aab8172b7662026e964c071d0de9efd456
+  data.tar.gz: 895b1138be200a6fb6a824309d2091d64e11d90ccc12fcb039aa91db73fe633123220cdf5f4a062490d34febe0bea47a743b797bcee77d463e215878464792be

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: x86_64-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: