@webspatial/builder 0.1.22 → 1.0.0

package/README.md

@@ -1,5 +1,5 @@
 <div align="left">
-  <img src="../../docs/assets/logo.png" alt="WebSpatial Logo" width="400"/>
+  <img src="../../assets/logo.png" alt="WebSpatial Logo" width="400"/>
 </div>
 <br/>
 
@@ -10,11 +10,10 @@ The build tool transforms websites into Packaged WebSpatial Apps for debugging a
 ## Documentation
 
 For WebSpatial Builder:
-- [Add Build Tool for Packaged WebSpatial Apps](../../docs/en/development-guide/enabling-webspatial-in-web-projects/step-2-add-build-tool-for-packaged-webspatial-apps.md)
+- [Add Build Tool for Packaged WebSpatial Apps](https://webspatial.dev/docs/development-guide/enabling-webspatial-in-web-projects/step-2-add-build-tool-for-packaged-webspatial-apps)
 
 For WebSpatial:
-- [Table of Contents](../../docs/en/README.md)
-- [Introduction](../../docs/en/introduction/README.md)
-- [Quick Example](../../docs/en/quick-start/README.md)
-- [Core Concepts](../../docs/en/core-concepts/README.md)
-- [Development Guide](../../docs/en/development-guide/README.md)
+- [Introduction](https://webspatial.dev/docs/introduction)
+- [Quick Example](https://webspatial.dev/docs/quick-example)
+- [Core Concepts](https://webspatial.dev/docs/core-concepts)
+- [Development Guide](https://webspatial.dev/docs/development-guide)

package/dist/lib/cmds/build.js

@@ -55,15 +55,18 @@ async function run(args) {
       If the --tryWithoutBuild=true parameter is used, it will be judged whether it is the same as the previous command.
       If it is the same, it will be defaulted as already compiled, and the compilation will be skipped and the application will be launched directly.
     */
-    if (manifestInfo.fromNet || args['tryWithoutBuild'] === 'true') {
-        // If this command is a new command, go through the build process; otherwise, go through the launch process
-        if (history_1.default.checkManifest(manifestInfo.json) &&
-            history_1.default.checkTestAppIsExist()) {
-            console.log('Same as the previous record');
-            await xcode_1.XcodeManager.runWithHistory();
-            return;
-        }
-    }
+    // fixme: the cache not invalidate when npm version change
+    // if (manifestInfo.fromNet || args['tryWithoutBuild'] === 'true') {
+    //   // If this command is a new command, go through the build process; otherwise, go through the launch process
+    //   if (
+    //     CliHistory.checkManifest(manifestInfo.json) &&
+    //     CliHistory.checkTestAppIsExist()
+    //   ) {
+    //     console.log('Same as the previous record')
+    //     await XcodeManager.runWithHistory()
+    //     return
+    //   }
+    // }
     resource_1.ResourceManager.pullPlatformModule(args['platform']);
     const icon = await doReadyProject((_a = args['project']) !== null && _a !== void 0 ? _a : 'dist', manifestInfo);
     await doXcode(args, icon, manifestInfo, true);

package/dist/lib/pwa/config.js

@@ -27,7 +27,7 @@ function configId(manifestJson, bundleId) {
 }
 function configStartUrl(manifestJson, base, manifestUrl, isNet) {
     var _a;
-    let start_url = (_a = manifestJson.start_url) !== null && _a !== void 0 ? _a : '/index.html';
+    let start_url = (_a = manifestJson.start_url) !== null && _a !== void 0 ? _a : '/';
     const isStartUrl = (0, validate_1.validateURL)(start_url);
     const hasBase = base.length > 0;
     if (hasBase) {
@@ -146,7 +146,7 @@ function configMainScene(manifestJson) {
             width: 1280,
             height: 1280,
         },
-        resizability: 'automatic',
+        resizability: 'nil',
     };
     if (manifestJson.xr_main_scene) {
         if (typeof manifestJson.xr_main_scene === 'object') {
@@ -160,7 +160,7 @@ function configMainScene(manifestJson) {
                     : 1280;
             mainScene.resizability = resizabilities.includes(manifestJson.xr_main_scene.resizability)
                 ? manifestJson.xr_main_scene.resizability
-                : 'automatic';
+                : 'nil';
             manifestJson.mainScene = mainScene;
         }
         else if (typeof manifestJson.xr_main_scene === 'string') {

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

@@ -6,5 +6,6 @@ export declare class PWAGenerator {
     private static useDefaultManifestJson;
     static generator(args: PWAInitArgs, isDev?: boolean): Promise<ManifestInfo>;
     static validate(args: PWAInitArgs, isDev?: boolean): Promise<ManifestInfo>;
+    private static compareManifest;
     static config(manifestInfo: ManifestInfo, args: PWAInitArgs, isDev: boolean): void;
 }

package/dist/lib/pwa/index.js

@@ -49,6 +49,8 @@ class PWAGenerator {
             manifest = useDefault
                 ? this.defaultManifestJson
                 : await (0, load_1.loadJsonFromDisk)(url);
+            manifest =
+                isDev && !useDefault ? this.compareManifest(manifest) : manifest;
             this.useDefaultManifestJson = useDefault;
         }
         // check manifest.json
@@ -65,6 +67,15 @@ class PWAGenerator {
             fromNet: isNetWeb,
         };
     }
+    static compareManifest(manifest) {
+        var _a, _b, _c, _d;
+        manifest.name = (_a = manifest.name) !== null && _a !== void 0 ? _a : this.defaultManifestJson.name;
+        manifest.display = (_b = manifest.display) !== null && _b !== void 0 ? _b : this.defaultManifestJson.display;
+        manifest.start_url =
+            (_c = manifest.start_url) !== null && _c !== void 0 ? _c : this.defaultManifestJson.start_url;
+        manifest.scope = (_d = manifest.scope) !== null && _d !== void 0 ? _d : this.defaultManifestJson.scope;
+        return manifest;
+    }
     // generate manifest
     static config(manifestInfo, args, isDev) {
         var _a;
@@ -86,7 +97,7 @@ PWAGenerator.defaultBundleId = 'com.webspatial.test';
 PWAGenerator.defaultManifestJson = {
     name: 'WebSpatialTest',
     display: 'minimal-ui',
-    start_url: '/index.html',
+    start_url: '/',
     scope: '/',
 };
 PWAGenerator.useDefaultManifestJson = false;

package/dist/lib/xcode/index.js

@@ -18,11 +18,11 @@ class XcodeManager {
     static async upload(option, appInfo) {
         if (option['u'] && option['p']) {
             // use username, password
-            xcrun_1.default.uploadApp((0, path_1.join)(resource_1.PROJECT_EXPORT_DIRECTORY, `${appInfo.name}.ipa`), option['u'], option['p'], true);
+            xcrun_1.default.uploadApp('"' + (0, path_1.join)(resource_1.PROJECT_EXPORT_DIRECTORY, `${appInfo.name}.ipa`) + '"', option['u'], option['p'], true);
         }
         else if (option['k'] && option['i']) {
             // use apiKey, apiIssuer
-            xcrun_1.default.uploadApp((0, path_1.join)(resource_1.PROJECT_EXPORT_DIRECTORY, `${appInfo.name}.ipa`), option['k'], option['i'], false);
+            xcrun_1.default.uploadApp('"' + (0, path_1.join)(resource_1.PROJECT_EXPORT_DIRECTORY, `${appInfo.name}.ipa`) + '"', option['k'], option['i'], false);
         }
     }
     static async runWithSimulator() {

package/dist/lib/xcode/xcodeproject.js

@@ -242,7 +242,7 @@ class XcodeProject {
             // set these to bypass lint
             manifestSwift = manifestSwift.replace('SceneWidth', '1280');
             manifestSwift = manifestSwift.replace('SceneHeight', '1280');
-            manifestSwift = manifestSwift.replace('SceneResizability', `"automatic"`);
+            manifestSwift = manifestSwift.replace('SceneResizability', `nil`);
             manifestSwift = manifestSwift.replace('USE_MAIN_SCENE', 'false');
         }
         fs.writeFileSync(manifestSwiftPath, manifestSwift, 'utf-8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/builder",
-  "version": "0.1.22",
+  "version": "1.0.0",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
@@ -40,7 +40,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^0.1.22"
+    "@webspatial/platform-visionos": "^1.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",