@stlite/desktop 0.16.1 → 0.18.0

package/bin/dump_artifacts.js

@@ -24,16 +24,20 @@ async function copyBuildDirectory(options) {
         console.warn(`sourceDir == destDir (${sourceDir}). Are you in the development environment? Skip copying the directory.`);
         return;
     }
-    if (!options.override) {
+    if (options.keepOld) {
         try {
             await promises_1.default.access(options.copyTo);
-            console.info(`${options.copyTo} already exists. Skip copying.`);
+            console.info(`${options.copyTo} already exists. Use it and skip copying.`);
             return;
         }
-        catch { }
+        catch {
+            // If the destination directory does not exist
+            throw new Error(`${options.copyTo} does not exist even though the \`keepOld\` option is specified`);
+        }
     }
     console.log(`Copy ${sourceDir} to ${options.copyTo}`);
-    fs_extra_1.default.copy(sourceDir, options.copyTo);
+    await promises_1.default.rm(options.copyTo, { recursive: true, force: true });
+    await fs_extra_1.default.copy(sourceDir, options.copyTo);
 }
 async function installLocalWheel(pyodide, localPath) {
     console.log(`Install the local wheel ${localPath}`);
@@ -90,24 +94,19 @@ async function createSitePackagesSnapshot(options) {
 async function copyStreamlitAppDirectory(options) {
     console.info("Copy the Streamlit app directory...");
     console.log(`Copy ${options.sourceDir} to ${options.copyTo}`);
-    return fs_extra_1.default.copy(options.sourceDir, options.copyTo);
+    await promises_1.default.rm(options.copyTo, { recursive: true, force: true });
+    await fs_extra_1.default.copy(options.sourceDir, options.copyTo);
 }
 // Original: packages/sharing-editor/bin/gen-sample-app-manifests-json.ts
 // TODO: Be DRY
 async function readRequirements(requirementsTxtPath) {
-    try {
-        const requirementsTxtData = await promises_1.default.readFile(requirementsTxtPath, {
-            encoding: "utf-8",
-        });
-        return requirementsTxtData
-            .split("\n")
-            .map((r) => r.trim())
-            .filter((r) => r !== "");
-    }
-    catch {
-        console.log(`Failed to read ${requirementsTxtPath}. Use [] as the requirements.`);
-        return [];
-    }
+    const requirementsTxtData = await promises_1.default.readFile(requirementsTxtPath, {
+        encoding: "utf-8",
+    });
+    return requirementsTxtData
+        .split("\n")
+        .map((r) => r.trim())
+        .filter((r) => r !== "");
 }
 // Original: kernel/src/requirements.ts
 // TODO: Be DRY
@@ -154,11 +153,11 @@ function verifyRequirements(requirements) {
     alias: "l",
     default: false,
 })
-    .options("force", {
+    .options("keepOldBuild", {
     type: "boolean",
     default: false,
-    alias: "f",
-    describe: "Forcefully copy the directory even if the destination directory already exists.",
+    alias: "k",
+    describe: "Keep the existing build directory contents except appHomeDir.",
 })
     .parseAsync()
     .then(async (args) => {
@@ -174,7 +173,7 @@ function verifyRequirements(requirements) {
         requirements = requirements.concat(await readRequirements(requirementTxtFilePath));
     }
     verifyRequirements(requirements);
-    await copyBuildDirectory({ copyTo: destDir, override: args.force });
+    await copyBuildDirectory({ copyTo: destDir, keepOld: args.keepOldBuild });
     await createSitePackagesSnapshot({
         useLocalKernelWheels: args.localKernelWheels,
         requirements: requirements,

package/build/electron/main.js

@@ -30,7 +30,11 @@ const createWindow = () => {
         return (0, file_1.walkRead)(streamlitAppDir);
     });
     if (electron_1.app.isPackaged || process.env.NODE_ENV === "production") {
-        mainWindow.loadFile(path.resolve(__dirname, "../index.html"));
+        // Use .loadURL() with an absolute URL based on "/" instead of .loadFile()
+        // because absolute URLs with the file:// scheme will be resolved
+        // to absolute file paths based on the special handler
+        // registered through `interceptFileProtocol` below.
+        mainWindow.loadURL("file:///index.html");
     }
     else {
         mainWindow.loadURL("http://localhost:3000");
@@ -43,6 +47,21 @@ const createWindow = () => {
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 electron_1.app.whenReady().then(() => {
+    // Resolve absolute paths based on the bundled directory.
+    // It is assumed that the resource paths are absolute paths starting with "/",
+    // which is configured at `package.json` with the `"homepage"` field.
+    // Ref: https://github.com/electron/electron/issues/4612#issuecomment-189116655
+    const bundleBasePath = path.resolve(__dirname, "..");
+    electron_1.protocol.interceptFileProtocol("file", function (req, callback) {
+        const urlWithoutScheme = req.url.slice(7); // 7 = "file://".length
+        if (path.isAbsolute(urlWithoutScheme)) {
+            const resolvedFilePath = path.join(bundleBasePath, urlWithoutScheme);
+            callback(path.normalize(resolvedFilePath));
+        }
+        else {
+            callback(urlWithoutScheme);
+        }
+    });
     createWindow();
     electron_1.app.on("activate", () => {
         // On macOS it's common to re-create a window in the app when the

package/build/electron/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../electron/main.ts"],"names":[],"mappings":";;AAAA,uCAAuD;AACvD,6BAA6B;AAC7B,0CAA0C;AAC1C,iCAAkC;AAElC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;IAC1C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE;QACpC,QAAQ,EAAE,IAAI,CAAC,OAAO,CACpB,SAAS,EACT,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC1B,CAAC,CAAC,+CAA+C;YACjD,CAAC,CAAC,kCAAkC,CACvC;KACF,CAAC,CAAC;CACJ;AAED,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,MAAM,UAAU,GAAG,IAAI,wBAAa,CAAC;QACnC,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,GAAG;QACX,cAAc,EAAE;YACd,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC;SAC5C;KACF,CAAC,CAAC;IAEH,kBAAO,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC,EAAE,EAAE,EAAE;QAChD,gEAAgE;QAChE,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAClC,SAAS,EACT,kCAAkC,CACnC,CAAC;QACF,OAAO,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,kBAAO,CAAC,MAAM,CACZ,2BAA2B,EAC3B,KAAK,EAAE,EAAE,EAAmC,EAAE;QAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACpE,OAAO,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;IACnC,CAAC,CACF,CAAC;IAEF,IAAI,cAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QAC3D,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;KAC/D;SAAM;QACL,UAAU,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;KAC7C;IAED,IAAI,CAAC,cAAG,CAAC,UAAU,EAAE;QACnB,UAAU,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;KACvC;AACH,CAAC,CAAC;AAEF,wDAAwD;AACxD,yDAAyD;AACzD,sDAAsD;AACtD,cAAG,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACxB,YAAY,EAAE,CAAC;IAEf,cAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;QACtB,iEAAiE;QACjE,4DAA4D;QAC5D,IAAI,wBAAa,CAAC,aAAa,EAAE,CAAC,MAAM,KAAK,CAAC;YAAE,YAAY,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,wEAAwE;AACxE,0EAA0E;AAC1E,2BAA2B;AAC3B,cAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,cAAG,CAAC,IAAI,EAAE,CAAC;AAChD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../electron/main.ts"],"names":[],"mappings":"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"}

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>stlite</title><meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; worker-src blob:; script-src-elem 'self' blob: https://cdn.jsdelivr.net/; connect-src https://data.streamlit.io/ https://*.mapbox.com/ 'self'; img-src * blob: data:; media-src * blob:"><link href="./static/css/6.bcb29708.chunk.css" rel="stylesheet"><link href="./static/css/main.978bf258.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="./static/js/runtime-main.42b31020.js"></script><script src="./static/js/6.ac18380a.chunk.js"></script><script src="./static/js/main.d0a5f08f.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>stlite</title><meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; worker-src blob:; script-src-elem 'self' 'unsafe-inline' *; style-src-elem 'self' 'unsafe-inline' *; font-src 'self' data:; connect-src https://data.streamlit.io/ https://*.mapbox.com/ 'self' *; img-src * blob: data:; media-src * blob:; frame-src *"><link href="./static/css/6.bcb29708.chunk.css" rel="stylesheet"><link href="./static/css/main.978bf258.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="./static/js/runtime-main.42b31020.js"></script><script src="./static/js/6.ac18380a.chunk.js"></script><script src="./static/js/main.d0a5f08f.chunk.js"></script></body></html>

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stlite/desktop",
-  "version": "0.16.1",
+  "version": "0.18.0",
   "license": "Apache-2.0",
-  "homepage": "./",
+  "homepage": "/",
   "main": "./build/electron/main.js",
   "files": [
     "build",
@@ -25,7 +25,7 @@
     "start": "concurrently \"cross-env BROWSER=none yarn start:web\" \"wait-on http://localhost:3000 && yarn start:electron\" \"wait-on http://localhost:3000 && tsc -p electron && cross-env NODE_ENV=\"development\" electron .\"",
     "build:app": "yarn build:web && yarn build:electron && yarn build:pyodide",
     "build": "yarn build:app && yarn build:bin",
-    "serve": "NODE_ENV=\"production\" electron .",
+    "serve": "cross-env NODE_ENV=production electron .",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
     "fix:eslint": "eslint --fix '{src,electron,bin}/**/*.{ts,tsx}'",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@craco/craco": "^6.1.2",
-    "@stlite/kernel": "^0.16.0",
+    "@stlite/kernel": "^0.18.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",