@ubox-tools/deploy-xperience 1.1.22 → 1.1.24

package/README.md

@@ -106,15 +106,25 @@ When `--ubox-id` is provided, the search/create step is skipped entirely and the
 
 ## Proxy / Source Transformation
 
-Before injecting source files, `generateProxy()` applies three transforms to each file:
+Before injecting source files, `generateProxy()` applies transforms to each file:
 
 | Transform | Applies to | What it does |
 |---|---|---|
-| Parameter substitution | JS | Replaces `const KEY = "value"` with `const KEY = "{parameter:KEY}"` for every key in `parameters.json` |
-| Asset path substitution | JS, CSS | Replaces `../assets/file.ext` references with `{resources:type/file.ext}` tokens |
+| Asset path substitution | JS, CSS, HTML | Replaces `assets/file.ext` references with `{resources:type/file.ext}` tokens |
 | Emoji escaping | JS | Converts non-ASCII characters to `\uXXXX` Unicode escape sequences |
 | Local tag stripping | HTML | Removes local `<link href>` and `<script src>` tags (CDN URLs are kept) |
 
+Asset references are resolved by their actual relative path, so both a root-level shared folder and a per-app folder work:
+
+| Reference in source | Resolved from |
+|---|---|
+| `../../assets/logo.png` | `<project-root>/assets/logo.png` |
+| `assets/logo.png` | `apps/<appName>/assets/logo.png` |
+
+Files inside subdirectories (e.g. `assets/img/logo.png`) are supported — the token uses only the filename: `{resources:images/logo.png}`.
+
+> **Parameter tokens are embedded at authoring time** — `data.js` uses inline `{parameter:key}` tokens with local fallbacks. No deploy-time regex substitution is performed.
+
 ## Project Layout Expected
 
 ```
@@ -130,7 +140,9 @@ Before injecting source files, `generateProxy()` applies three transforms to eac
       parameters.json   (optional)
     main/
       ...same files...
-  assets/
+      assets/               (optional, app-specific assets)
+        *.jpg / *.png / ...
+  assets/                   (shared across all apps)
     *.jpg / *.png / *.woff2 / ...
   deploy.js
 ```

package/deploy.js

@@ -238,33 +238,27 @@ function generateProxy(appName) {
     const isHTML   = ext === 'html';
 
     if (isJS || isCSS) {
-      // 1. Parameter token substitution (JS only — parameters live in JS files)
-      if (isJS) {
-        for (const key of Object.keys(params)) {
-          const re = new RegExp(`((?:const|let|var)\\s+${key}\\s*=\\s*)(?:"[^"]*"|'[^']*')`, 'g');
-          content = content.replace(re, `$1"{parameter:${key}}"`);
-        }
-      }
-
-      // 2. Asset path substitution: "...assets/file.ext" → "{resources:type/file.ext}"
-      const assetInStringRe = /(['"])(?:\.\.\/)*assets\/([^'"]+)\1/g;
-      content = content.replace(assetInStringRe, (match, quote, assetFile) => {
-        const assetExt  = path.extname(assetFile).slice(1).toLowerCase();
+      // 1. Asset path substitution: "...assets/file.ext" → "{resources:type/file.ext}"
+      const assetInStringRe = /(['"])((?:\.\.\/)*assets\/([^'"]+))\1/g;
+      content = content.replace(assetInStringRe, (match, quote, relativePath, assetFile) => {
+        const fileName  = path.basename(assetFile);
+        const assetExt  = path.extname(fileName).slice(1).toLowerCase();
         const type      = assetResourceType(assetExt);
-        const absPath   = path.join(ASSETS_DIR, assetFile);
-        if (fs.existsSync(absPath)) assets[assetFile] = { type, absPath };
-        return `"{resources:${type}/${assetFile}}"`;
+        const absPath   = path.resolve(appDir, relativePath);
+        if (fs.existsSync(absPath)) assets[fileName] = { type, absPath };
+        return `"{resources:${type}/${fileName}}"`;
       });
 
       // CSS url() pattern
       if (isCSS) {
-        const assetUrlRe = /url\((['"]?)(?:\.\.\/)*assets\/([^'")\s]+)\1\)/g;
-        content = content.replace(assetUrlRe, (match, quote, assetFile) => {
-          const assetExt = path.extname(assetFile).slice(1).toLowerCase();
+        const assetUrlRe = /url\((['"]?)((?:\.\.\/)*assets\/([^'")\s]+))\1\)/g;
+        content = content.replace(assetUrlRe, (match, quote, relativePath, assetFile) => {
+          const fileName = path.basename(assetFile);
+          const assetExt = path.extname(fileName).slice(1).toLowerCase();
           const type     = assetResourceType(assetExt);
-          const absPath  = path.join(ASSETS_DIR, assetFile);
-          if (fs.existsSync(absPath)) assets[assetFile] = { type, absPath };
-          return `url("{resources:${type}/${assetFile}}")`;
+          const absPath  = path.resolve(appDir, relativePath);
+          if (fs.existsSync(absPath)) assets[fileName] = { type, absPath };
+          return `url("{resources:${type}/${fileName}}")`;
         });
       }
 
@@ -274,13 +268,14 @@ function generateProxy(appName) {
 
     if (isHTML) {
       // Asset path substitution for HTML src/href attributes
-      const assetInStringRe = /(['"])(?:\.\.\/)*assets\/([^'"]+)\1/g;
-      content = content.replace(assetInStringRe, (match, quote, assetFile) => {
-        const assetExt = path.extname(assetFile).slice(1).toLowerCase();
+      const assetInStringRe = /(['"])((?:\.\.\/)*assets\/([^'"]+))\1/g;
+      content = content.replace(assetInStringRe, (match, quote, relativePath, assetFile) => {
+        const fileName = path.basename(assetFile);
+        const assetExt = path.extname(fileName).slice(1).toLowerCase();
         const type     = assetResourceType(assetExt);
-        const absPath  = path.join(ASSETS_DIR, assetFile);
-        if (fs.existsSync(absPath)) assets[assetFile] = { type, absPath };
-        return `"{resources:${type}/${assetFile}}"`;
+        const absPath  = path.resolve(appDir, relativePath);
+        if (fs.existsSync(absPath)) assets[fileName] = { type, absPath };
+        return `"{resources:${type}/${fileName}}"`;
       });
 
       // Strip local <link> tags (keep CDN ones with https://)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubox-tools/deploy-xperience",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "Deploy a Ubox experience to studio.ubox.world",
   "bin": { "deploy-xperience": "./deploy.js" },
   "dependencies": { "puppeteer": "*" },