isomorfeus-asset-manager 0.14.19 → 0.14.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7df0d3122b5bfff71c027bed005e9878e0bb64c6ddd1300e6256efb544ddf1
-  data.tar.gz: 2aa0e3f088152054b47bec1b9886ed93a843774735a2e7b26d67edda01cf10a8
+  metadata.gz: e208b674f5b5ed724db1be5c74054c92d4b2468faea3a30267f528f36c1bb9ce
+  data.tar.gz: 03201b0049a608178c9a7d550749556de94ad9e9382eca635f18694ed5debd51
 SHA512:
-  metadata.gz: 07f69556f092f6d1a8b74a8003cf4564f445fc0938bbfcf2edb68df0d43eec0c298c670284e213c059ef0ec79cca536048a8f55f22a6b543080ab5daea28f93d
-  data.tar.gz: 6c1050f997977b5a5351fe3edc94b0c175540f565e62b187e3e3a1d31f616564d1dda5c1fa26759e36c5fa452c68042d032306475d051b4500f461cd22264467
+  metadata.gz: ff78d031bde9dc60794d00abd392449f6acee64845d9ba5270749dcea6fbe89c680da79c5a46975db1ff16f6c036b525f330c1fd211fc0462f842cf29cdc102c
+  data.tar.gz: 2088239fe557d25847360d8e5348d0052f72176384bd22492e1222569286a9c196f53284dd895c9ce46fdc93bc13c0faf045aa9bd7d72db4637c45d0a10c66d0

data/lib/isomorfeus/asset_manager/browser_asset.rb

@@ -94,6 +94,11 @@ module Isomorfeus
                   catch { console.log('Isomorfeus Asset Manager could not update locale ', update.locale) }
                   return;
                 }
+                if (typeof update.reload !== 'undefined') {
+                  console.log('Isomorfeus Asset Manager reloading page, updating javascript import  ', update.reload);
+                  setTimeout(function() { window.location.reload(true); }, 500);
+                  return;
+                }
                 let start_index = 'Opal.modules[\\"'.length;
                 let end_index = update.javascript.indexOf('"', start_index);
                 let opal_module_name = update.javascript.substr(start_index, end_index - start_index);

data/lib/isomorfeus/asset_manager/config.rb

@@ -78,7 +78,7 @@ module Isomorfeus
 
   self.hmr_listener = nil
   self.asset_manager_hmr_channel = :isomorfeus_asset_manager_module_updates
-  self.asset_manager_hmr_dirs = %w[channels components data locales operations policies]
+  self.asset_manager_hmr_dirs = %w[channels components data imports locales mail_components operations policies server]
   self.hmr_websocket_path = '/_asset_manager_hmr_websocket'
   self.assets_path = '/assets'
   self.assets = {

data/lib/isomorfeus/asset_manager/node_asset.rb

@@ -49,7 +49,7 @@ module Isomorfeus
       def generate_entry(asset_name)
         js = ''
         js << "#{@js_imports.map(&:to_s).join("\n")}"
-        js << "#{@ruby_imports.map { |i| i.to_s(asset_name) }.join("\n")}"
+        js << "#{@ruby_imports.map { |i| i.to_s(asset_name) }.join('')}"
       end
     end
   end

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.14.19'
+    VERSION = '0.14.22'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -78,22 +78,10 @@ module Isomorfeus
       { javascript: compiler.compile }
     end
 
-    def print_message(m, level)
-      l = m['location']
-      STDERR.puts "#{l['file']}:#{l['line']}:#{l['column']}: #{level}: #{m['text']}"
-      STDERR.puts "  #{l['line']} | #{l['lineText']}\n\n"
-    end
 
     def handle_errors(asset_key, result)
-      unless result['errors'].empty?
-        result['errors'].each do |e|
-          print_message(e, 'error')
-          unless e['notes'].empty?
-            e['notes'].each do |n|
-              print_message(n, 'note')
-            end
-          end
-        end
+      result = result['result']
+      if result && !(result['errors'].nil? || result['errors'].empty?)
         raise "Asset Manager: error bundling '#{asset_key}'"
       end
     end
@@ -137,6 +125,9 @@ module Isomorfeus
               elsif file.end_with?('.yml') || file.end_with?('.mo') || file.end_with?('.po')
                 Isomorfeus.server_requires_reload!
                 update_json = Oj.dump({ locale: file }, mode: :strict)
+              elsif file.end_with?('.js')
+                Isomorfeus.assets.each_value { |asset| asset.unbundle! }
+                update_json = Oj.dump({ reload: file }, mode: :strict)
               else
                 update_json = Oj.dump({ error: "Don't know how to update #{file}!" }, mode: :strict)
               end
@@ -177,7 +168,7 @@ module Isomorfeus
         target: '#{asset.browser? ? 'es6' : 'node16' }',
         write: true
       })
-      .then((result) => { global.res_meta = result.metafile; return result; }, (reason) => { return { result: { errors: [{text: reson}]}}; })
+      .then((result) => { global.res_meta = result.metafile; return result; }, (reason) => { return { result: { errors: [{text: reason}]}}; })
       .catch((error) => { return { result: { errors: [{text: error.message}]}}; });
       JAVASCRIPT
       if analyze

data/node_modules/.package-lock.json

@@ -1,18 +1,18 @@
-{
-  "name": "isomorfeus-asset-manager",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "node_modules/esbuild-wasm": {
-      "version": "0.14.23",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.23.tgz",
-      "integrity": "sha512-w1qhGLvUaPXiigGWIEGcnMmN/FxQ6VDLnHQIOpf29Qh9z6x4qe4gmsQyUbFBW6UsWsw/E8OJDE0XRtiV/0siYQ==",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    }
-  }
-}
+{
+  "name": "isomorfeus-asset-manager",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/esbuild-wasm": {
+      "version": "0.14.36",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.36.tgz",
+      "integrity": "sha512-tDMs2l397fd/pwLoIKb4uYfQayM5hMfUwVvCmzbFEU+zXedj15/Z/A8iD87cWHN1VD66REdgcGMt1BO6C7RnLw==",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    }
+  }
+}

data/node_modules/esbuild-wasm/bin/esbuild

@@ -2,17 +2,18 @@
 
 // Forward to the automatically-generated WebAssembly loader from the Go compiler
 
+const module_ = require('module');
 const crypto = require('crypto');
 const path = require('path');
 const zlib = require('zlib');
 const fs = require('fs');
 const os = require('os');
 
-const wasm_exec = path.join(__dirname, '..', 'wasm_exec.js');
+const wasm_exec_node = path.join(__dirname, '..', 'wasm_exec_node.js');
 const esbuild_wasm = path.join(__dirname, '..', 'esbuild.wasm');
 
-const code = fs.readFileSync(wasm_exec, 'utf8');
-const wrapper = new Function('require', 'module', 'process', 'WebAssembly', code);
+const code = fs.readFileSync(wasm_exec_node, 'utf8');
+const wrapper = new Function('require', 'WebAssembly', code);
 
 function instantiate(bytes, importObject) {
   // Using this API causes "./esbuild --version" to run around 1 second faster
@@ -80,6 +81,37 @@ fs.read = function () {
   return read.apply(this, arguments);
 };
 
+// Hack around a Unicode bug in node: https://github.com/nodejs/node/issues/24550.
+// See this for the matching Go issue: https://github.com/golang/go/issues/43917.
+const write = fs.write;
+fs.write = function (fd, buf, offset, length, position, callback) {
+  if (offset === 0 && length === buf.length && position === null) {
+    if (fd === process.stdout.fd) {
+      try {
+        process.stdout.write(buf, err => err ? callback(err, 0, null) : callback(null, length, buf));
+      } catch (err) {
+        callback(err, 0, null);
+      }
+      return;
+    }
+    if (fd === process.stderr.fd) {
+      try {
+        process.stderr.write(buf, err => err ? callback(err, 0, null) : callback(null, length, buf));
+      } catch (err) {
+        callback(err, 0, null);
+      }
+      return;
+    }
+  }
+  return write.apply(this, arguments);
+};
+const writeSync = fs.writeSync;
+fs.writeSync = function (fd, buf) {
+  if (fd === process.stdout.fd) return process.stdout.write(buf), buf.length;
+  if (fd === process.stderr.fd) return process.stderr.write(buf), buf.length;
+  return writeSync.apply(this, arguments);
+};
+
 // WASM code generated with Go 1.17.2+ will crash when run in a situation with
 // many environment variables: https://github.com/golang/go/issues/49011. An
 // example of this situation is running a Go-compiled WASM executable in GitHub
@@ -97,5 +129,5 @@ for (let key in process.env) {
   }
 }
 
-const argv = ['node', wasm_exec, esbuild_wasm].concat(process.argv.slice(2));
-wrapper(require, require.main, Object.assign(Object.create(process), { argv }), Object.assign(Object.create(WebAssembly), { instantiate }));
+process.argv.splice(2, 0, esbuild_wasm);
+wrapper(module_.createRequire(wasm_exec_node), Object.assign(Object.create(WebAssembly), { instantiate }));

data/node_modules/esbuild-wasm/esm/browser.d.ts

@@ -7,7 +7,7 @@ export type Drop = 'console' | 'debugger';
 
 interface CommonOptions {
   /** Documentation: https://esbuild.github.io/api/#sourcemap */
-  sourcemap?: boolean | 'inline' | 'external' | 'both';
+  sourcemap?: boolean | 'linked' | 'inline' | 'external' | 'both';
   /** Documentation: https://esbuild.github.io/api/#legal-comments */
   legalComments?: 'none' | 'inline' | 'eof' | 'linked' | 'external';
   /** Documentation: https://esbuild.github.io/api/#source-root */
@@ -27,6 +27,8 @@ interface CommonOptions {
   /** Documentation: https://esbuild.github.io/api/#mangle-props */
   reserveProps?: RegExp;
   /** Documentation: https://esbuild.github.io/api/#mangle-props */
+  mangleQuoted?: boolean;
+  /** Documentation: https://esbuild.github.io/api/#mangle-props */
   mangleCache?: Record<string, string | false>;
   /** Documentation: https://esbuild.github.io/api/#drop */
   drop?: Drop[];
@@ -569,6 +571,16 @@ export interface InitializeOptions {
    */
   wasmURL?: string
 
+  /**
+   * The result of calling "new WebAssembly.Module(buffer)" where "buffer"
+   * is a typed array or ArrayBuffer containing the binary code of the
+   * "esbuild.wasm" file.
+   *
+   * You can use this as an alternative to "wasmURL" for environments where it's
+   * not possible to download the WebAssembly module.
+   */
+  wasmModule?: WebAssembly.Module
+
   /**
    * By default esbuild runs the WebAssembly-based browser API in a web worker
    * to avoid blocking the UI thread. This can be disabled by setting "worker"