proscenium 0.4.1-arm64-darwin → 0.5.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49794ef4fa916c792416807d446491208f616aec182e09e85a894c4e42e9895
-  data.tar.gz: 717c3a149ff1aef9d0c7460caf7c0dc749d0809cbe1b5098ed6998ed92277429
+  metadata.gz: e1e443cd0c368ca707e4e02040d7a24928a0bc304499d779a94d8ff90438dda3
+  data.tar.gz: ffea3a06fe5d3f6e7cf4fc9d68f1291e6d4eb7b1e707d8090938cac8d3870f33
 SHA512:
-  metadata.gz: 281bc9f08e4c454a7bcef642f77dadf309a600685e014b0162b2d69710a78a4fdec6c4b9bbbaeea5d2af83f7a9a5f60670d57ade312733fe1e5dbfd5781a966e
-  data.tar.gz: 576ed3414955a3d7a9036197e7a1bb3491aad35bfbdd1d4e4614216cf24022215a9a6da57e39d919159a18a7d1858a1ed0cdcee3b24491968b36290cb0b3954f
+  metadata.gz: e2f6ecf89ad6d3a4c95531211931812ae62351191f5010e5c9ad4d3a26500e1c20a80ddf497e3e570adf59816e46e568ebdff634489089e486cfd5e573782d6b
+  data.tar.gz: 9695a839740673b71a283c779f6f42f75a3a0c3b371f5ed1e15805d1bbfd3649eb6e2d880a58ad9125c4066bcb58910ad55b2c89e098bcada47bd62b53a05123

data/app/channels/proscenium/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Proscenium
   class Connection < ActionCable::Connection::Base
     identified_by :uid

data/app/channels/proscenium/reload_channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Proscenium
   class ReloadChannel < ActionCable::Channel::Base
     def subscribed

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Proscenium::Railtie.routes.draw do
   if Proscenium.config.auto_reload
     mount Proscenium::Railtie.websocket => Proscenium.config.cable_mount_path

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

@@ -28,6 +28,7 @@ export default function () {
             font-family: var(--monospace);
             line-height: 1.5;
             width: 800px;
+            height: 66vh;
             color: #d8d8d8;
             margin: 30px auto;
             padding: 25px 40px;

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

@@ -19,9 +19,11 @@ export default setup('env', () => {
       namespace: 'env',
       callback({ path }) {
         if (path.includes(':')) {
+          const name = Deno.env.get(path.split(':')[1])
+
           return {
             loader: 'js',
-            contents: `export default '${Deno.env.get(path.split(':')[1])}'`
+            contents: name ? `export default '${name}'` : `export default ${name}`
           }
         }
 

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

@@ -1,5 +1,6 @@
 import { join, resolve } from 'std/path/mod.ts'
 import { resolve as resolveFromImportMap } from 'import-maps/resolve'
+import { cache } from 'cache'
 
 import setup from './setup_plugin.js'
 
@@ -15,6 +16,45 @@ export default setup('resolve', (build, options) => {
   const isProd = env === 'production'
 
   return [
+    {
+      // Filters for imports starting with `url:http://` or `url:https://`; returning the path
+      // without the `url:` prefix, and a namespace of 'url`
+      type: 'onResolve',
+      filter: /^url:https?:\/\//,
+      callback(args) {
+        return {
+          path: args.path.slice(4),
+          namespace: 'url'
+        }
+      }
+    },
+
+    {
+      type: 'onResolve',
+      filter: /.*/,
+      namespace: 'url',
+      callback(args) {
+        if (!isBareModule(args.path)) {
+          return {
+            path: new URL(args.path, args.importer).toString(),
+            namespace: 'url'
+          }
+        }
+      }
+    },
+
+    {
+      type: 'onLoad',
+      filter: /.*/,
+      namespace: 'url',
+      async callback(args) {
+        const file = await cache(args.path)
+        const contents = await Deno.readTextFile(file.path)
+
+        return { contents }
+      }
+    },
+
     {
       type: 'onResolve',
       filter: /.*/,
@@ -28,9 +68,13 @@ export default setup('resolve', (build, options) => {
           args.suffix = `?${options.cacheQueryString}`
         }
 
-        // Mark remote modules as external.
-        if (args.path.startsWith('http://') || args.path.startsWith('https://')) {
-          return { external: true }
+        // Mark remote modules as external. If not css, then the path is prefixed with "url:", which
+        // is then handled by the Url Middleware.
+        if (
+          !args.importer.endsWith('.css') &&
+          (args.path.startsWith('http://') || args.path.startsWith('https://'))
+        ) {
+          return { path: `/url:${encodeURIComponent(args.path)}`, external: true }
         }
 
         // Rewrite the path to the actual runtime directory.
@@ -56,14 +100,24 @@ export default setup('resolve', (build, options) => {
     const result = { path: params.path, suffix: params.suffix }
 
     if (importMap) {
-      const baseURL = new URL(params.importer.slice(cwd.length), 'file://')
+      let baseURL
+      if (params.importer.startsWith('https://') || params.importer.startsWith('http://')) {
+        baseURL = new URL(params.importer)
+      } else {
+        baseURL = new URL(params.importer.slice(cwd.length), 'file://')
+      }
+
       const { matched, resolvedImport } = resolveFromImportMap(params.path, importMap, baseURL)
 
       if (matched) {
         if (resolvedImport.protocol === 'file:') {
           params.path = resolvedImport.pathname
         } else {
-          return { path: resolvedImport.href, external: true }
+          if (params.importer.endsWith('.css')) {
+            return { path: resolvedImport.href, external: true }
+          }
+
+          return { path: `/url:${encodeURIComponent(resolvedImport.href)}`, external: true }
         }
       }
     }
@@ -73,9 +127,7 @@ export default setup('resolve', (build, options) => {
       result.path = resolve(cwd, params.path.slice(1))
     }
 
-    // Resolve the path using esbuild's internal resolution. This allows us to import node packages
-    // and extension-less paths without custom code, as esbuild with resolve them for us.
-    const resolveResult = await build.resolve(result.path, {
+    const resOptions = {
       // If path is a bare module (node_modules), and resolveDir is the Proscenium runtime dir, or
       // is the current working dir, then use `cwd` as the `resolveDir`, otherwise pass it through
       // as is. This ensures that nested node_modules are resolved correctly.
@@ -84,11 +136,16 @@ export default setup('resolve', (build, options) => {
         (!params.resolveDir.startsWith(cwd) || params.resolveDir.startsWith(runtimeDir))
           ? cwd
           : params.resolveDir,
+      kind: params.kind,
       pluginData: {
         // We use this property later on, as we should ignore this resolution call.
         isResolvingPath: true
       }
-    })
+    }
+
+    // Resolve the path using esbuild's internal resolution. This allows us to import node packages
+    // and extension-less paths without custom code, as esbuild with resolve them for us.
+    const resolveResult = await build.resolve(result.path, resOptions)
 
     // Simple return the resolved result if we have an error. Usually happens when module is not
     // found.

data/lib/proscenium/compilers/esbuild.js

@@ -92,9 +92,10 @@ async function main(paths = [], options = {}) {
       for await (const file of expandGlob(path, { root })) {
         file.isFile && entryPoints.add(file.path)
       }
-    } else if (path.startsWith('/')) {
-      // Path is absolute, so it must be outsideRoot. Don't prefix the root.
-      // See Proscenium::Middleware::OutsideRoot.
+    } else if (path.startsWith('/') || /^url:https?:\/\//.test(path)) {
+      // Path is absolute, or is prefixed with 'url:', so it must be outsideRoot, or Url. Don't
+      // prefix the root.
+      // See Proscenium::Middleware::[OutsideRoot|Url].
       entryPoints.add(path)
     } else {
       entryPoints.add(join(root, path))
@@ -128,6 +129,12 @@ async function main(paths = [], options = {}) {
     jsxDev: !isTest && !isProd,
     minify: isProd,
     bundle: true,
+
+    // The Esbuild default places browser before module, but we're building for modern browsers
+    // which support esm. So we prioritise that. Some libraries export a "browser" build that still
+    // uses CJS.
+    mainFields: ['module', 'browser', 'main'],
+
     plugins: [
       envPlugin(),
       resolvePlugin({ runtimeDir, importMap, debug, cacheQueryString: options.cacheQueryString }),

data/lib/proscenium/link_to_helper.rb

@@ -10,15 +10,6 @@ module Proscenium
     #   link_to 'Go to', MyComponent
     #
     # TODO: ummm, todo it! ;)
-    def link_to(*args, &block)
-      # name_argument_index = block ? 0 : 1
-      # if (args[name_argument_index]).respond_to?(:render_in)
-      #   return super(*LinkToComponentArguments.new(args, name_argument_index,
-      #                                              self).helper_options, &block)
-      # end
-
-      super
-    end
   end
 
   # Component handling for the `link_to` helper.

data/lib/proscenium/middleware/url.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Proscenium
+  class Middleware
+    # Handles requests prefixed with "url:https://"; downloading, caching, and compiling them.
+    class Url < Esbuild
+      private
+
+      # @override [Esbuild] It's a URL, so always assume it is renderable (we won't actually know
+      #   until it's downloaded).
+      def renderable?
+        true
+      end
+
+      # @override [Esbuild]
+      def path
+        CGI.unescape(@request.path)[1..]
+      end
+    end
+  end
+end

data/lib/proscenium/middleware.rb

@@ -10,6 +10,7 @@ module Proscenium
     autoload :Base
     autoload :Esbuild
     autoload :Runtime
+    autoload :Url
     autoload :OutsideRoot
 
     def initialize(app)
@@ -45,6 +46,7 @@ module Proscenium
         return OutsideRoot if path.fnmatch?(glob_types[:outsideRoot], File::FNM_EXTGLOB)
       end
 
+      return Url if request.path.match?(glob_types[:url])
       return Runtime if path.fnmatch?(glob_types[:runtime], File::FNM_EXTGLOB)
       return Esbuild if path.fnmatch?(glob_types[:esbuild], File::FNM_EXTGLOB)
     end

data/lib/proscenium/phlex.rb

@@ -11,9 +11,9 @@ module Proscenium
 
     module Helpers
       def side_load_javascripts(...)
-        if (output = @_view_context.side_load_javascripts(...))
-          @_target << output
-        end
+        return unless (output = @_view_context.side_load_javascripts(...))
+
+        @_target << output
       end
 
       %i[side_load_stylesheets proscenium_dev].each do |name|

data/lib/proscenium/railtie.rb

@@ -14,6 +14,7 @@ module Proscenium
   DEFAULT_GLOB_TYPES = {
     esbuild: '/{config,app,lib,node_modules}/**.{js,mjs,jsx,css}',
     runtime: '/proscenium-runtime/**.{js,jsx}',
+    url: %r{^/url:https?%3A%2F%2F},
     outsideRoot: '/**/*.{js,jsx,mjs,css}'
   }.freeze
 

data/lib/proscenium/side_load.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 module Proscenium
   module SideLoad
     DEFAULT_EXTENSIONS = %i[js css].freeze
@@ -68,3 +69,4 @@ module Proscenium
     end
   end
 end
+# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/proscenium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.74.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.74.1
 description:
 email:
 - joel@developwithstyle.com
@@ -182,6 +182,7 @@ files:
 - lib/proscenium/middleware/outside_root.rb
 - lib/proscenium/middleware/runtime.rb
 - lib/proscenium/middleware/static.rb
+- lib/proscenium/middleware/url.rb
 - lib/proscenium/phlex.rb
 - lib/proscenium/phlex/component.rb
 - lib/proscenium/phlex/react_component.rb