isomorfeus-asset-manager 0.14.6 → 0.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a63a4b134ab1cde4ab7e130434a5c58fdf9032da7cf2f6ee02b3bbbcb520355a
-  data.tar.gz: 41fb59ad6245a093215a9dacd87a7bcf0f57203ffbf1dcffa9a8cbf3f8bb8662
+  metadata.gz: dd67d5e589186012d44384e22c24ecc58f6d91ea8d5596aed46c8d6a130b9275
+  data.tar.gz: 8981272264e96d66ace7e1f942c3c985bf9f99d7ef0cb4da836c2ecad5f3f87f
 SHA512:
-  metadata.gz: a2f6056029f97fd832be797d084c447b34efa4c68e503107d5995a4c8a95784cfbd23a9f5031da8e8bb196944979f8bccc4fa307cdb58cf95963eaed06da8ada
-  data.tar.gz: 19531ac72416188808d6deacf15d46af3813cc073bf38c6beb2670d0c92fded90f2789fa3a1c1a5aa0229a992845ccff700581d5c6fe011858eceb4552da02e0
+  metadata.gz: db8bb45d6f08592354a67591edaf1c463dc57b3aea3d6fac6b61eb00ca4ac3eda700a20934e48b4fb90d18983af81ac5f1a5faea181aaa5f59ff2c2ce986ab86
+  data.tar.gz: 21ba109c1c94ec3b1a13ccf647ebb6ba92a3c2b1eeb3fa266d973b05569b5b065ffb6246997ec1cf6e94374a09979f8ac643fd36791270702ca4157cd7df848d

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 Jan Biedermann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 Jan Biedermann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -12,4 +12,4 @@ No need to install esbuild separately, everything bundled ready to go.
 However, if within the project the 'esbuild' npm package is installed in node_modules, that version will be used instead.
 
 ### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com)
+At the [Isomorfeus Framework Project](https://isomorfeus.com)

data/lib/isomorfeus/asset_manager/asset.rb

@@ -108,23 +108,39 @@ module Isomorfeus
             // Isomorfeus Asset Manager HMR code begin
             let ws_protocol = (window.location.protocol == 'https:') ? 'wss:' : 'ws:';
             let ws_url = ws_protocol + '//' + window.location.host + "#{Isomorfeus.assets_websocket_path}";
-            let hmr_ws = new WebSocket(ws_url);
-            hmr_ws.onmessage = function(event) {
-              let update = JSON.parse(event.data);
-              if (typeof update.error !== 'undefined') { console.error(update.error); 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);
-              console.log('Updating ', opal_module_name);
-              if (typeof Opal !== 'undefined' && typeof Opal.require_table !== "undefined" && Opal.require_table['corelib/module']) {
-                try {
-                  eval(update.javascript);
-                  if (Opal.require_table[opal_module_name]) { Opal.load.call(Opal, opal_module_name); }
-                  else { Opal.require.call(Opal, opal_module_name); }
-                  Opal.Isomorfeus.$force_render();
-                } catch (e) { console.error(e); return; }
-              }
+            let hmr_ws_fun = function() {
+              let hmr_ws = new WebSocket(ws_url);
+              hmr_ws.onopen = function(event) { console.log("Isomorfeus Asset Manager HMR socket connected"); }
+              hmr_ws.onmessage = function(event) {
+                let update = JSON.parse(event.data);
+                if (typeof update.error !== 'undefined') { console.error(update.error); return; }
+                if (typeof update.locale !== 'undefined') {
+                  console.log('Isomorfeus Asset Manager updating locale ', update.locale);
+                  try { Opal.Isomorfeus.I18n.Init.$reload_from_server(); }
+                  catch { console.log('Isomorfeus Asset Manager could not update locale ', update.locale) }
+                  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);
+                console.log('Isomorfeus Asset Manager updating ', opal_module_name);
+                if (typeof Opal !== 'undefined' && typeof Opal.require_table !== "undefined" && Opal.require_table['corelib/module']) {
+                  try {
+                    eval(update.javascript);
+                    if (Opal.require_table[opal_module_name]) { Opal.load.call(Opal, opal_module_name); }
+                    else { Opal.require.call(Opal, opal_module_name); }
+                    Opal.Isomorfeus.$force_render();
+                  } catch (e) { console.error(e); return; }
+                }
+              };
+              hmr_ws.onclose = function(event) {
+                setTimeout(function() {
+                  console.log("Isomorfeus Asset Manager reconnecting HMR socket");
+                  hmr_ws_fun();
+                }, 2000);
+              };
             }
+            hmr_ws_fun()
             // Isomorfeus Asset Manager HMR code end
             JAVASCRIPT
           end

data/lib/isomorfeus/asset_manager/config.rb

@@ -66,8 +66,8 @@ 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 operations policies]
-  self.assets_websocket_path = '/_assets_websocket'
+  self.asset_manager_hmr_dirs = %w[channels components data locales operations policies]
+  self.assets_websocket_path = '/_asset_manager_hmr_websocket'
   self.assets_path = '/assets'
   self.assets = {
     'web.js' => Isomorfeus::AssetManager::Asset.new(:browser),

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.14.6'
+    VERSION = '0.14.10'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -168,11 +168,17 @@ module Isomorfeus
           am_class.last_updated = (Time.now.to_f * (10 ** 9)).to_i
           next if file.start_with?(@server_path)
           begin
-            update = compile_ruby(file)
-            update_json = Oj.dump(update, mode: :strict)
+            if file.end_with?('.rb')
+              update = compile_ruby(file)
+              update_json = Oj.dump(update, mode: :strict)
+            elsif file.end_with?('.yml') || file.end_with?('.mo') || file.end_with?('.po')
+              update_json = Oj.dump({ locale: file }, mode: :strict)
+            else
+              update_json = Oj.dump({ error: "Don't know how to update #{file}!" }, mode: :strict)
+            end
             Iodine.publish(Isomorfeus.asset_manager_hmr_channel, update_json)
           rescue Exception => e
-            message = "#{e.message}\n#{e.backtrace.join("\n")}"
+            message = "IsomorfeusAssetManager during hot module update:\n#{e.class}\n#{e.message}\n#{e.backtrace.join("\n")}"
             STDERR.puts message
             Iodine.publish(Isomorfeus.asset_manager_hmr_channel, Oj.dump({ error: message }, mode: :strict))
           end
@@ -191,13 +197,14 @@ module Isomorfeus
       resolve_paths << 'node_modules'
       resolve_paths.uniq!
 
-      result = @context.exec <<~JAVASCRIPT
-      let res = esbuild.buildSync({
+      result = @context.await <<~JAVASCRIPT
+      esbuild.build({
         entryPoints: [path.resolve(global.imports_path, '#{asset_key}')],
         bundle: true,
         color: false,
         format: '#{asset.target == :node ? 'cjs' : 'iife'}',
         legalComments: 'linked',
+        loader: { '.svg': 'text' },
         metafile: true,
         minify: #{Isomorfeus.production? ? 'true' : 'false'},
         nodePaths: #{resolve_paths},
@@ -208,9 +215,7 @@ module Isomorfeus
         splitting: false,
         target: 'es6',
         write: true
-      });
-      global.res_meta = res.metafile;
-      return res;
+      }).then((result) => { global.res_meta = result.metafile; return result; });
       JAVASCRIPT
       if analyze
         analysis = @context.await <<~JAVASCRIPT

data/node_modules/.package-lock.json

@@ -4,14 +4,14 @@
   "requires": true,
   "packages": {
     "node_modules/esbuild-wasm": {
-      "version": "0.14.13",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.13.tgz",
-      "integrity": "sha512-niRkHnjbCSscizzSCtYfc0shAjrK4OXT9COaBdUFuWebx5+2gjXU4YbZohVGLvEf89hh6/U3z+JGMTAF4PajZg==",
+      "version": "0.14.21",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.21.tgz",
+      "integrity": "sha512-sPMyljBiKxXjW1wLd5dQnrUJR1PAt8ybSidXoZWJnMuB1mpdLju57LtstDWWkCgcaE+TGJJ6NqP/OtGyeDdEAA==",
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     }
   }

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

@@ -22,6 +22,13 @@ interface CommonOptions {
   /** Documentation: https://esbuild.github.io/api/#target */
   target?: string | string[];
 
+  /** Documentation: https://esbuild.github.io/api/#mangle-props */
+  mangleProps?: RegExp;
+  /** Documentation: https://esbuild.github.io/api/#mangle-props */
+  reserveProps?: RegExp;
+  /** Documentation: https://esbuild.github.io/api/#mangle-props */
+  mangleCache?: Record<string, string | false>;
+  /** Documentation: https://esbuild.github.io/api/#drop */
   drop?: Drop[];
   /** Documentation: https://esbuild.github.io/api/#minify */
   minify?: boolean;
@@ -195,6 +202,8 @@ export interface BuildResult {
   stop?: () => void;
   /** Only when "metafile: true" */
   metafile?: Metafile;
+  /** Only when "mangleCache" is present */
+  mangleCache?: Record<string, string | false>;
 }
 
 export interface BuildFailure extends Error {
@@ -248,6 +257,8 @@ export interface TransformResult {
   code: string;
   map: string;
   warnings: Message[];
+  /** Only when "mangleCache" is present */
+  mangleCache?: Record<string, string | false>;
 }
 
 export interface TransformFailure extends Error {

data/node_modules/esbuild-wasm/esm/browser.js

@@ -251,6 +251,21 @@ function validateInitializeOptions(options) {
     worker
   };
 }
+function validateMangleCache(mangleCache) {
+  let validated;
+  if (mangleCache !== void 0) {
+    validated = /* @__PURE__ */ Object.create(null);
+    for (let key of Object.keys(mangleCache)) {
+      let value = mangleCache[key];
+      if (typeof value === "string" || value === false) {
+        validated[key] = value;
+      } else {
+        throw new Error(`Expected ${JSON.stringify(key)} in mangle cache to map to either a string or false`);
+      }
+    }
+  }
+  return validated;
+}
 function pushLogFlags(flags, options, keys, isTTY, logLevelDefault) {
   let color = getFlag(options, keys, "color", mustBeBoolean);
   let logLevel = getFlag(options, keys, "logLevel", mustBeString);
@@ -269,6 +284,8 @@ function pushCommonFlags(flags, options, keys) {
   let target = getFlag(options, keys, "target", mustBeStringOrArray);
   let format = getFlag(options, keys, "format", mustBeString);
   let globalName = getFlag(options, keys, "globalName", mustBeString);
+  let mangleProps = getFlag(options, keys, "mangleProps", mustBeRegExp);
+  let reserveProps = getFlag(options, keys, "reserveProps", mustBeRegExp);
   let minify = getFlag(options, keys, "minify", mustBeBoolean);
   let minifySyntax = getFlag(options, keys, "minifySyntax", mustBeBoolean);
   let minifyWhitespace = getFlag(options, keys, "minifyWhitespace", mustBeBoolean);
@@ -316,6 +333,10 @@ function pushCommonFlags(flags, options, keys) {
   if (drop)
     for (let what of drop)
       flags.push(`--drop:${what}`);
+  if (mangleProps)
+    flags.push(`--mangle-props=${mangleProps.source}`);
+  if (reserveProps)
+    flags.push(`--reserve-props=${reserveProps.source}`);
   if (jsx)
     flags.push(`--jsx=${jsx}`);
   if (jsxFactory)
@@ -376,6 +397,7 @@ function flagsForBuildOptions(callName, options, isTTY, logLevelDefault, writeDe
   let write = (_a = getFlag(options, keys, "write", mustBeBoolean)) != null ? _a : writeDefault;
   let allowOverwrite = getFlag(options, keys, "allowOverwrite", mustBeBoolean);
   let incremental = getFlag(options, keys, "incremental", mustBeBoolean) === true;
+  let mangleCache = getFlag(options, keys, "mangleCache", mustBeObject);
   keys.plugins = true;
   checkForInvalidFlags(options, keys, `in ${callName}() call`);
   if (sourcemap)
@@ -525,7 +547,8 @@ function flagsForBuildOptions(callName, options, isTTY, logLevelDefault, writeDe
     absWorkingDir,
     incremental,
     nodePaths,
-    watch: watchMode
+    watch: watchMode,
+    mangleCache: validateMangleCache(mangleCache)
   };
 }
 function flagsForTransformOptions(callName, options, isTTY, logLevelDefault) {
@@ -539,6 +562,7 @@ function flagsForTransformOptions(callName, options, isTTY, logLevelDefault) {
   let loader = getFlag(options, keys, "loader", mustBeString);
   let banner = getFlag(options, keys, "banner", mustBeString);
   let footer = getFlag(options, keys, "footer", mustBeString);
+  let mangleCache = getFlag(options, keys, "mangleCache", mustBeObject);
   checkForInvalidFlags(options, keys, `in ${callName}() call`);
   if (sourcemap)
     flags.push(`--sourcemap=${sourcemap === true ? "external" : sourcemap}`);
@@ -552,7 +576,10 @@ function flagsForTransformOptions(callName, options, isTTY, logLevelDefault) {
     flags.push(`--banner=${banner}`);
   if (footer)
     flags.push(`--footer=${footer}`);
-  return flags;
+  return {
+    flags,
+    mangleCache: validateMangleCache(mangleCache)
+  };
 }
 function createChannel(streamIn) {
   let responseCallbacks = /* @__PURE__ */ new Map();
@@ -696,8 +723,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.14.13") {
-        throw new Error(`Cannot start service: Host version "${"0.14.13"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.14.21") {
+        throw new Error(`Cannot start service: Host version "${"0.14.21"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -1156,7 +1183,8 @@ function createChannel(streamIn) {
       absWorkingDir,
       incremental,
       nodePaths,
-      watch
+      watch,
+      mangleCache
     } = flagsForBuildOptions(callName, options, isTTY, buildLogLevelDefault, writeDefault);
     let request = {
       command: "build",
@@ -1172,6 +1200,8 @@ function createChannel(streamIn) {
     };
     if (requestPlugins)
       request.plugins = requestPlugins;
+    if (mangleCache)
+      request.mangleCache = mangleCache;
     let serve2 = serveOptions && buildServeData(refs, serveOptions, request, key);
     let rebuild;
     let stop;
@@ -1180,6 +1210,8 @@ function createChannel(streamIn) {
         result.outputFiles = response.outputFiles.map(convertOutputFiles);
       if (response.metafile)
         result.metafile = JSON.parse(response.metafile);
+      if (response.mangleCache)
+        result.mangleCache = response.mangleCache;
       if (response.writeToStdout !== void 0)
         console.log(decodeUTF8(response.writeToStdout).replace(/\n$/, ""));
     };
@@ -1307,20 +1339,32 @@ function createChannel(streamIn) {
       try {
         if (typeof input !== "string")
           throw new Error('The input to "transform" must be a string');
-        let flags = flagsForTransformOptions(callName, options, isTTY, transformLogLevelDefault);
+        let {
+          flags,
+          mangleCache
+        } = flagsForTransformOptions(callName, options, isTTY, transformLogLevelDefault);
         let request = {
           command: "transform",
           flags,
           inputFS: inputPath !== null,
           input: inputPath !== null ? inputPath : input
         };
+        if (mangleCache)
+          request.mangleCache = mangleCache;
         sendRequest(refs, request, (error, response) => {
           if (error)
             return callback(new Error(error), null);
           let errors = replaceDetailsInMessages(response.errors, details);
           let warnings = replaceDetailsInMessages(response.warnings, details);
           let outstanding = 1;
-          let next = () => --outstanding === 0 && callback(null, { warnings, code: response.code, map: response.map });
+          let next = () => {
+            if (--outstanding === 0) {
+              let result = { warnings, code: response.code, map: response.map };
+              if (response.mangleCache)
+                result.mangleCache = response == null ? void 0 : response.mangleCache;
+              callback(null, result);
+            }
+          };
           if (errors.length > 0)
             return callback(failureErrorWithLog("Transform failed", errors, warnings), null);
           if (response.codeFS) {
@@ -1625,7 +1669,7 @@ function convertOutputFiles({ path, contents }) {
 }
 
 // lib/npm/browser.ts
-var version = "0.14.13";
+var version = "0.14.21";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = () => {
   throw new Error(`The "serve" API only works in node`);
@@ -2382,7 +2426,7 @@ onmessage = ({ data: wasm }) => {
     callback(null, count);
   };
   let go = new global.Go();
-  go.argv = ["", \`--service=\${"0.14.13"}\`];
+  go.argv = ["", \`--service=\${"0.14.21"}\`];
   WebAssembly.instantiate(wasm, go.importObject).then(({ instance }) => go.run(instance));
 };}`;
   let worker;