@webspatial/builder 1.6.1 → 2.0.0

package/dist/index.js

@@ -9,10 +9,11 @@ const fetch_1 = require("./lib/utils/fetch");
 const launch_1 = require("./lib/cmds/launch");
 const shutdown_1 = require("./lib/cmds/shutdown");
 const test_1 = require("./lib/cmds/test");
+const MIN_SUPPORTED_NODE_MAJOR = 22;
 module.exports = async () => {
-    if ((0, semver_1.major)(process.versions.node) < 14) {
+    if ((0, semver_1.major)(process.versions.node) < MIN_SUPPORTED_NODE_MAJOR) {
         throw new Error(`Current Node.js version is ${process.versions.node}.` +
-            ' Node.js version 14 or above is required to run XRAPP BUILDER.');
+            ` Node.js version ${MIN_SUPPORTED_NODE_MAJOR} or above is required to run XRAPP BUILDER.`);
     }
     const program = new commander_1.Command();
     FetchUtils_1_1.fetchUtils.setFetch(fetch_1.fetch);

package/dist/lib/cmds/build.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 exports.store = store;
@@ -7,7 +10,7 @@ const pwa_1 = require("../pwa");
 const resource_1 = require("../resource");
 const xcode_1 = require("../xcode");
 const check_1 = require("./check");
-const history_1 = require("../utils/history");
+const history_1 = __importDefault(require("../utils/history"));
 // build and export ipa
 async function build(args) {
     var _a;

package/dist/lib/cmds/launch.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launch = launch;
-const xcrun_1 = require("../xcode/xcrun");
+const xcrun_1 = __importDefault(require("../xcode/xcrun"));
 async function launch(args) {
     var _a;
     const bundleId = (_a = args['bundleId']) !== null && _a !== void 0 ? _a : 'com.webspatial.test';

package/dist/lib/cmds/shutdown.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shutdown = shutdown;
-const xcrun_1 = require("../xcode/xcrun");
+const xcrun_1 = __importDefault(require("../xcode/xcrun"));
 async function shutdown(args) {
     xcrun_1.default.shutdownSimulator();
     return true;

package/dist/lib/cmds/test.js

@@ -1,129 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = test;
-const path_1 = require("path");
-function configStartUrl(manifestStartUrl, base, manifestUrl, isNet) {
-    let start_url = manifestStartUrl !== null && manifestStartUrl !== void 0 ? manifestStartUrl : '/index.html';
-    if (!start_url.match(/\.html(\?|$)/)) {
-        const [path, query] = start_url.split('?');
-        start_url = path.endsWith('/') ? `${path}index.html` : `${path}/index.html`;
-        if (query)
-            start_url += `?${query}`;
-    }
-    const isStartUrl = validateURL(start_url);
-    const hasBase = base.length > 0;
-    if (hasBase) {
-        const isBaseUrl = validateURL(base);
-        if (!isStartUrl && !isBaseUrl) {
-            const staticWebRoot = (0, path_1.resolve)('./static-web');
-            let resolvedPath = (0, path_1.join)(base, start_url);
-            const normalizedPath = (0, path_1.normalize)(resolvedPath);
-            const safePath = (0, path_1.join)(staticWebRoot, normalizedPath);
-            start_url = (0, path_1.relative)(process.cwd(), safePath)
-                .replace(/^(\.\.\/)+/, './')
-                .replace(/\/$/, '');
-        }
-        else if (isStartUrl && !isBaseUrl) {
-            const startUrl = new URL(start_url);
-            const fullPath = (0, path_1.join)(base, startUrl.pathname) + startUrl.search + startUrl.hash;
-            let newBase = new URL('/', startUrl.origin);
-            start_url = new URL(fullPath, newBase).href;
-        }
-        else if (!isStartUrl && isBaseUrl) {
-            if (start_url.startsWith('/')) {
-                const baseUrl = new URL(base);
-                start_url = baseUrl.origin + (0, path_1.join)(baseUrl.pathname, start_url);
-            }
-            else {
-                start_url = new URL(start_url, base).href;
-            }
-        }
-        else if (isStartUrl && isBaseUrl) {
-            const startUrl = new URL(start_url);
-            const baseUrl = new URL(base);
-            const startFullPath = startUrl.pathname + startUrl.search + startUrl.hash;
-            start_url = new URL(startFullPath, baseUrl.origin + baseUrl.pathname).href;
-        }
-    }
-    else {
-        if (isNet) {
-            const murl = new URL(manifestUrl);
-            if (!isStartUrl) {
-                const newStartUrl = new URL(start_url, murl.origin);
-                start_url = newStartUrl.href;
-            }
-            else {
-                const startUrl = new URL(start_url);
-                start_url =
-                    murl.origin + startUrl.pathname + startUrl.search + startUrl.hash;
-            }
-        }
-        else if (!isStartUrl) {
-            const staticWebRoot = (0, path_1.resolve)('./static-web');
-            const resolvedPath = (0, path_1.resolve)(staticWebRoot, start_url);
-            const normalizedPath = (0, path_1.normalize)(resolvedPath);
-            const safePath = (0, path_1.join)(staticWebRoot, normalizedPath);
-            start_url = (0, path_1.relative)(process.cwd(), safePath)
-                .replace(/^(\.\.\/)+/, './')
-                .replace(/\/$/, '');
-        }
-    }
-    return start_url;
-}
-function configScope(start_url, scope) {
-    const isStartUrl = validateURL(start_url);
-    const isUrl = validateURL(scope);
-    if (isStartUrl && isUrl) {
-        const scopeURL = new URL(scope);
-        const startURL = new URL(start_url);
-        if (scopeURL.host !== startURL.host || start_url.indexOf(scope) !== 0) {
-            scope = parseRouter(start_url);
-        }
-    }
-    else if (isStartUrl && !isUrl) {
-        scope = new URL(scope, start_url).href;
-    }
-    else if (!isStartUrl && isUrl) {
-        const cleanPath = start_url.replace(/\/[^\/]+$/, '');
-        scope = (0, path_1.normalize)(cleanPath + '/');
-    }
-    //  else {
-    //   scope = join(parseRouter(start_url), scope)
-    // }
-    // scope = scope
-    return scope;
-}
-function validateURL(url) {
-    try {
-        new URL(url);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}
-function parseRouter(url) {
-    let urlParts = url.split('/');
-    urlParts.pop();
-    let pathUrl = urlParts.join();
-    while (pathUrl.indexOf(',') >= 0) {
-        pathUrl = pathUrl.replace(',', '/');
-    }
-    return pathUrl;
-}
-function testStartUrl() {
-    console.log(configStartUrl('/', '', '/manifest.json', false));
-    console.log(configStartUrl('http://www.baidu.com', '', 'http://www.baidu.com/manifest.json', true));
-    console.log(configStartUrl('/', '/', '/manifest.json', false));
-    console.log(configStartUrl('/a.html?a=1', '/', '/manifest.json', false));
-    console.log(configStartUrl('http://www.baidu.com/test/a.html?a=1', '/xx', '/manifest.json', false));
-    console.log(configStartUrl('http://www.baidu.com/a.html?a=1', 'http://www.google.com/test', '/manifest.json', false));
-    console.log(configStartUrl('/test/index.html', '/public/aaa', '/manifest.json', false));
-}
-function testScope() {
-    console.log(configScope('/test/index.html', '/test'));
-}
-function test() {
-    // testStartUrl()
-    // testScope()
-}
+function test() { }

package/dist/lib/cmds/version.js

@@ -1,8 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVersion = getVersion;
-const fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 async function getVersion() {
     const packageJsonFile = path.join(__dirname, '../../../package.json');
     const packageJsonContents = await (await fs.promises.readFile(packageJsonFile)).toString();

package/dist/lib/pwa/index.d.ts

@@ -3,7 +3,6 @@ export declare class PWAGenerator {
     static DisplayModes: string[];
     private static defaultBundleId;
     private static defaultManifestJson;
-    private static useDefaultManifestJson;
     static generator(args: PWAInitArgs, isDev?: boolean): Promise<ManifestInfo>;
     static validate(args: PWAInitArgs, isDev?: boolean): Promise<ManifestInfo>;
     private static compareManifest;

package/dist/lib/pwa/index.js

@@ -1,11 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PWAGenerator = void 0;
 const path_1 = require("path");
 const config_1 = require("./config");
 const load_1 = require("../resource/load");
 const validate_1 = require("./validate");
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const utils_1 = require("../utils/utils");
 class PWAGenerator {
     static async generator(args, isDev = false) {
@@ -51,7 +84,6 @@ class PWAGenerator {
                 : await (0, load_1.loadJsonFromDisk)(url);
             manifest =
                 isDev && !useDefault ? this.compareManifest(manifest) : manifest;
-            this.useDefaultManifestJson = useDefault;
         }
         // check manifest.json
         (0, validate_1.checkManifestJson)(manifest, isDev);
@@ -103,4 +135,3 @@ PWAGenerator.defaultManifestJson = {
     start_url: '/',
     scope: '/',
 };
-PWAGenerator.useDefaultManifestJson = false;

package/dist/lib/pwa/validate.js

@@ -106,10 +106,10 @@ async function checkIcons(manifest, manifestUrl, isDev = false) {
             image = !imgUrl.startsWith('http')
                 ? await (0, load_1.loadImageFromDisk)(imgUrl)
                 : await (0, load_1.loadImageFromNet)(imgUrl);
-            if (image.getWidth() >= 1024 && image.getHeight() >= 1024) {
+            if (image.width >= 1024 && image.height >= 1024) {
                 has1024 = true;
-                if (image.getWidth() > imageSize) {
-                    imageSize = image.getWidth();
+                if (image.width > imageSize) {
+                    imageSize = image.width;
                 }
             }
         }

package/dist/lib/resource/file.js

@@ -1,8 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyDir = copyDir;
 exports.clearDir = clearDir;
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 function copyDir(from, to) {
     const paths = fs.readdirSync(from);
     paths.forEach(path => {

package/dist/lib/resource/imageHelper.d.ts

@@ -1,7 +1,6 @@
-import Jimp = require('jimp');
 export declare class ImageHelper {
-    static createImg(size: number): Jimp;
+    static createImg(size: number): any;
     static webp2PngBuffer(buffer: Buffer): Promise<Buffer>;
     static svg2img(svg: string): Promise<Buffer>;
-    static isFullyOpaque(image: Jimp): boolean;
+    static isFullyOpaque(image: any): boolean;
 }

package/dist/lib/resource/imageHelper.js

@@ -1,12 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageHelper = void 0;
-const Jimp = require("jimp");
+const JimpModule = __importStar(require("jimp"));
 const sharp = require("sharp");
 const resvg_js_1 = require("@resvg/resvg-js");
 class ImageHelper {
     static createImg(size) {
-        return new Jimp(size, size, 0x00000000);
+        return new JimpModule.Jimp({
+            width: size,
+            height: size,
+            color: 0x00000000,
+        });
     }
     static async webp2PngBuffer(buffer) {
         return await sharp(buffer).toFormat('png').toBuffer();
@@ -24,7 +61,7 @@ class ImageHelper {
         return pngBuffer;
     }
     static isFullyOpaque(image) {
-        const pixelNum = image.getWidth() * image.getHeight();
+        const pixelNum = image.width * image.height;
         for (var i = 0; i < pixelNum; i++) {
             const idx = i * 4 + 3;
             if (image.bitmap.data[idx] < 255) {

package/dist/lib/resource/index.d.ts

@@ -1,5 +1,4 @@
 import { ManifestInfo } from '../types';
-import * as Jimp from 'jimp';
 export declare let PROJECT_DIRECTORY: string;
 export declare let PROJECT_BUILD_DIRECTORY: string;
 export declare let PROJECT_EXPORT_DIRECTORY: string;
@@ -11,7 +10,7 @@ export declare const MIDDLE_APPICON_DIRECTORY: string;
 export declare const LOGO_DIRECTORY: string;
 export declare class ResourceManager {
     static moveProjectFrom(dir: string): Promise<void>;
-    static generateIcon(info: ManifestInfo): Promise<Jimp>;
+    static generateIcon(info: ManifestInfo): Promise<any>;
     static initPlatform(platform: string): void;
     static setupTempPath(platform: string): void;
     /**

package/dist/lib/resource/index.js

@@ -1,7 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceManager = exports.LOGO_DIRECTORY = exports.MIDDLE_APPICON_DIRECTORY = exports.BACK_APPICON_DIRECTORY = exports.ASSET_DIRECTORY = exports.WEB_PROJECT_DIRECTORY = exports.PROJECT_TEST_DIRECTORY = exports.PROJECT_EXPORT_DIRECTORY = exports.PROJECT_BUILD_DIRECTORY = exports.PROJECT_DIRECTORY = void 0;
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const file_1 = require("./file");
 const load_1 = require("./load");
@@ -44,7 +77,7 @@ class ResourceManager {
         const icon = !imgUrl.startsWith('http')
             ? await (0, load_1.loadImageFromDisk)(imgUrl)
             : await (0, load_1.loadImageFromNet)(imgUrl);
-        icon.resize(1024, 1024);
+        icon.resize({ w: 1024, h: 1024 });
         return icon;
     }
     static initPlatform(platform) {

package/dist/lib/resource/load.d.ts

@@ -1,6 +1,5 @@
-import Jimp = require('jimp');
 export declare function loadJsonFromNet(url: String): Promise<Record<string, any>>;
 export declare function loadJsonFromDisk(url: String): Promise<Record<string, any>>;
-export declare function loadImageFromNet(src: string): Promise<Jimp>;
-export declare function loadImageFromDisk(src: string): Promise<Jimp>;
+export declare function loadImageFromNet(src: string): Promise<any>;
+export declare function loadImageFromDisk(src: string): Promise<any>;
 export declare function loadFileString(url: String): Promise<string>;

package/dist/lib/resource/load.js

@@ -1,14 +1,47 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadJsonFromNet = loadJsonFromNet;
 exports.loadJsonFromDisk = loadJsonFromDisk;
 exports.loadImageFromNet = loadImageFromNet;
 exports.loadImageFromDisk = loadImageFromDisk;
 exports.loadFileString = loadFileString;
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const FetchUtils_1_1 = require("../utils/FetchUtils-1");
 const CustomError_1 = require("../utils/CustomError");
-const Jimp = require("jimp");
+const JimpModule = __importStar(require("jimp"));
 const imageHelper_1 = require("./imageHelper");
 async function loadJsonFromNet(url) {
     const response = await FetchUtils_1_1.fetchUtils.fetch(url, { encoding: 'binary' });
@@ -110,10 +143,10 @@ async function loadImageFromNet(src) {
     if (contentType.startsWith('image/webp')) {
         body = await imageHelper_1.ImageHelper.webp2PngBuffer(body);
     }
-    return await Jimp.read(Buffer.from(body));
+    return await JimpModule.Jimp.read(Buffer.from(body));
 }
 async function loadImageFromDisk(src) {
-    return await Jimp.read(src);
+    return await JimpModule.Jimp.read(src);
 }
 async function loadFileString(url) {
     let file = await fs.promises.readFile(url.toString());

package/dist/lib/utils/FetchUtils-1.d.ts

@@ -1,9 +1,7 @@
 declare class FetchUtils {
-    private fetchEngine;
     fetch: any;
     downloadFile: any;
     decompressResponseBuffer: any;
-    setFetchEngine(newFetchEngine: any): void;
     setFetch(newFetch: any): void;
     setDownloadFile(newDownloadFile: any): void;
     setDecompressResponseBuffer(newDecompressResponseBuffer: any): void;

package/dist/lib/utils/FetchUtils-1.js

@@ -3,14 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchUtils = void 0;
 class FetchUtils {
     constructor() {
-        this.fetchEngine = null;
         this.fetch = null;
         this.downloadFile = null;
         this.decompressResponseBuffer = null;
     }
-    setFetchEngine(newFetchEngine) {
-        this.fetchEngine = newFetchEngine;
-    }
     setFetch(newFetch) {
         this.fetch = newFetch;
     }

package/dist/lib/utils/fetch.js

@@ -1,11 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetch = fetch;
 exports.downloadFile = downloadFile;
 exports.decompressResponseBuffer = decompressResponseBuffer;
 const fetch_h2_1 = require("fetch-h2");
-const fs = require("fs");
-const zlib = require("zlib");
+const fs = __importStar(require("fs"));
+const zlib = __importStar(require("zlib"));
 // const userAgent = 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0';
 const userAgent = 'Mozilla/5.0 (X11; Linux x86_64; PICO 4 OS5.5.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.24 Chrome/105.0.5195.68 VR Safari/537.36  OculusBrowser/7.0';
 const fetchh2Ctx = (0, fetch_h2_1.context)({ userAgent: userAgent, overwriteUserAgent: true });

package/dist/lib/utils/history.js

@@ -1,7 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const utils_1 = require("./utils");
 const resource_1 = require("../resource");
 /*

package/dist/lib/utils/utils.js

@@ -1,9 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliLog = void 0;
 exports.parseRouter = parseRouter;
 exports.getInstalledPackageVersion = getInstalledPackageVersion;
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const Log_1 = require("./Log");
 function parseRouter(url) {

package/dist/lib/xcode/index.js

@@ -1,10 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XcodeManager = void 0;
 const resource_1 = require("../resource");
-const xcodeproject_1 = require("./xcodeproject");
-const xcodebuild_1 = require("./xcodebuild");
-const xcrun_1 = require("./xcrun");
+const xcodeproject_1 = __importDefault(require("./xcodeproject"));
+const xcodebuild_1 = __importDefault(require("./xcodebuild"));
+const xcrun_1 = __importDefault(require("./xcrun"));
 const path_1 = require("path");
 class XcodeManager {
     static async parseProject(option, isDev = false) {

package/dist/lib/xcode/xcodebuild.js

@@ -1,12 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XcodebuildCMD = void 0;
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const resource_1 = require("../resource");
 const semver_1 = require("semver");
 const file_1 = require("../resource/file");
-const { execSync, exec } = require('child_process');
+const { execSync } = require('child_process');
 class Xcodebuild {
     static async project() {
         try {

package/dist/lib/xcode/xcodeproject.js

@@ -1,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const resource_1 = require("../resource");
 const path_1 = require("path");
 const load_1 = require("../resource/load");
@@ -144,11 +177,13 @@ class XcodeProject {
         };
     }
     static async bindIcon(icon) {
+        var _a;
         if (icon) {
             // The application icon of Apple Vision Pro requires at least 2 images, one of which is a completely opaque base image. Therefore, Spatial Web is required to provide the base image, and CLI will generate an additional completely transparent image as the middle layer.
+            const iconMime = (_a = icon.mime) !== null && _a !== void 0 ? _a : 'image/png';
             const iconConfigDirectory = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, resource_1.BACK_APPICON_DIRECTORY);
             const iconConfigPath = (0, path_1.join)(iconConfigDirectory, 'Contents.json');
-            const iconFileName = 'icon.' + icon.getMIME().replace('image/', '');
+            const iconFileName = 'icon.' + iconMime.replace('image/', '');
             const iconFullPath = (0, path_1.join)(iconConfigDirectory, iconFileName);
             let iconConfig = await (0, load_1.loadJsonFromDisk)(iconConfigPath);
             /*
@@ -159,7 +194,7 @@ class XcodeProject {
                 }
             */
             iconConfig.images[0]['filename'] = iconFileName;
-            await icon.writeAsync(iconFullPath);
+            await icon.write(iconFullPath);
             await fs.writeFileSync(iconConfigPath, JSON.stringify(iconConfig));
             const middleIconConfigDirectory = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, resource_1.MIDDLE_APPICON_DIRECTORY);
             const middleIconConfigPath = (0, path_1.join)(middleIconConfigDirectory, 'Contents.json');
@@ -168,15 +203,15 @@ class XcodeProject {
             let middleConfig = await (0, load_1.loadJsonFromDisk)(middleIconConfigPath);
             let middleIcon = imageHelper_1.ImageHelper.createImg(512);
             middleConfig.images[0]['filename'] = middleIconFileName;
-            await middleIcon.writeAsync(middleIconFullPath);
+            await middleIcon.write(middleIconFullPath);
             await fs.writeFileSync(middleIconConfigPath, JSON.stringify(middleConfig));
             const logoConfigDirectory = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, resource_1.LOGO_DIRECTORY);
             const logoConfigPath = (0, path_1.join)(logoConfigDirectory, 'Contents.json');
             let logoConfig = await (0, load_1.loadJsonFromDisk)(logoConfigPath);
-            const logoFileName = 'logo.' + icon.getMIME().replace('image/', '');
+            const logoFileName = 'logo.' + iconMime.replace('image/', '');
             const logoFullPath = (0, path_1.join)(logoConfigDirectory, logoFileName);
             logoConfig.images[0]['filename'] = logoFileName;
-            await icon.writeAsync(logoFullPath);
+            await icon.write(logoFullPath);
             await fs.writeFileSync(logoConfigPath, JSON.stringify(logoConfig));
         }
     }

package/dist/lib/xcode/xcrun.d.ts

@@ -30,7 +30,6 @@ export default class Xcrun {
     static shutdownSimulator(): Promise<void>;
     private static launchSimulator;
     private static buildTestApp;
-    private static terminateApp;
     private static installApp;
     private static uninstallApp;
     private static launchApp;

package/dist/lib/xcode/xcrun.js

@@ -1,13 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const resource_1 = require("../resource");
 const path_1 = require("path");
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const xcodebuild_1 = require("./xcodebuild");
 const file_1 = require("../resource/file");
 const utils_1 = require("../utils/utils");
-const history_1 = require("../utils/history");
+const history_1 = __importDefault(require("../utils/history"));
 class Xcrun {
     static async validate(path, key1, key2, useAccount) {
         const cmd = new XcrunCMD().altool();
@@ -173,9 +209,6 @@ class Xcrun {
         console.log('------------------- build end -------------------');
         return true;
     }
-    static terminateApp(deviceId, appId) {
-        (0, child_process_1.execSync)(new XcrunCMD().simctl().terminate(deviceId, appId).line);
-    }
     static installApp(path, deviceId, appName) {
         const appFile = (0, path_1.join)(path, `Build/Products/Debug-xrsimulator/${appName}.app`);
         let cmd = new XcrunCMD().simctl();
@@ -291,16 +324,18 @@ class Xcrun {
     static parseDeviceInfo(device) {
         var _a;
         const uuidRegex = /[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/i;
-        const uuidMatch = (_a = device.match(uuidRegex)) !== null && _a !== void 0 ? _a : ["()"];
+        const uuidMatch = (_a = device.match(uuidRegex)) !== null && _a !== void 0 ? _a : ['()'];
         const deviceId = uuidMatch[0];
         const name = device.substring(0, device.indexOf(deviceId) - 1).trim();
-        const statePart = device.substring(device.indexOf(deviceId) + deviceId.length).trim();
+        const statePart = device
+            .substring(device.indexOf(deviceId) + deviceId.length)
+            .trim();
         const stateMatch = statePart.match(/\(([^)]+)\)/);
         const state = stateMatch ? stateMatch[1].trim() : 'Unknown';
         return {
             name: name,
             deviceId: deviceId,
-            state: state
+            state: state,
         };
     }
     // Try to find an available simulator, if not, create one and save the running record for the next time direct use.

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@webspatial/builder",
-  "version": "1.6.1",
+  "version": "2.0.0",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=22"
   },
   "bin": {
     "webspatial-builder": "bin/bundlepwa.js"
@@ -33,7 +33,7 @@
     "commander": "^13.1.0",
     "fetch-h2": "^2.5.1",
     "inquirer": "^8.2.4",
-    "jimp": "^0.22.7",
+    "jimp": "^1.6.1",
     "mime-types": "^2.1.27",
     "minimist": "^1.2.8",
     "node-fetch": "2.6.7",
@@ -41,7 +41,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^1.6.1"
+    "@webspatial/platform-visionos": "^2.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",
@@ -52,12 +52,13 @@
     "@types/minimist": "^1.2.0",
     "@types/node": "^12.20.1",
     "@types/node-fetch": "^2.5.10",
+    "@types/pngjs": "^6.0.5",
     "@types/semver": "^7.3.1",
     "@types/valid-url": "^1.0.3",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.4",
     "javascript-obfuscator": "^4.0.1",
-    "rollup": "^3.26.0",
+    "rollup": "^4.60.2",
     "tslib": "^2.6.0",
     "typescript": "^5.1.5"
   },