From df43409d537a7ffe08fdb9010eddd0e2349ef10c Mon Sep 17 00:00:00 2001
From: Kaloyan Manolov <kmanolov@asteasolutions.com>
Date: Wed, 26 Mar 2025 17:26:53 +0200
Subject: [PATCH] Add crossenv to build script
---
README.md | 1 +
package.json | 14 +++++++-------
src/main/index.js | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index ff0d0d5..6d69415 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Scratch 3.0 as a standalone desktop application
## Developer Instructions
### Releasing a new version
+# TODO: Update readme once scratch-desktop uses scratch-gui from an npm package
Let's assume that you want to make a new release, version `3.999.0`, corresponding to `scratch-gui` version
`0.1.0-prerelease.20yymmdd`.
diff --git a/package.json b/package.json
index ed42f02..f879b4b 100644
--- a/package.json
+++ b/package.json
@@ -7,19 +7,19 @@
"license": "AGPL-3.0-only",
"main": "./dist/main/main.js",
"scripts": {
- "clean": "rimraf ./dist ./static/assets",
+ "clean": "rimraf ./dist ./static/fetched",
"start": "node scripts/start.js",
"compile:renderer": "webpack --config webpack.renderer.js",
"compile:main": "webpack --config webpack.main.js",
"compile": "npm run compile:renderer && npm run compile:main",
- "fetch": "rimraf ./static/assets/ && mkdirp ./static/assets/ && node ./scripts/fetchMediaLibraryAssets.js",
+ "fetch": "rimraf ./static/fetched/ && mkdirp ./static/fetched/ && node ./scripts/fetchMediaLibraryAssets.js",
"build": "npm run build:dev",
- "build:dev": "NODE_ENV=production npm run compile && npm run doBuild -- --mode=dev",
- "build:dir": "NODE_ENV=production npm run compile && npm run doBuild -- --mode=dir",
- "build:dist": "NODE_ENV=production npm run compile && npm run doBuild -- --mode=dist",
+ "build:dev": "npx cross-env NODE_ENV=production npm run compile && npm run doBuild -- --mode=dev",
+ "build:dir": "npx cross-env NODE_ENV=production npm run compile && npm run doBuild -- --mode=dir",
+ "build:dist": "npx cross-env NODE_ENV=production npm run compile && npm run doBuild -- --mode=dist",
"doBuild": "node ./scripts/electron-builder-wrapper.js",
- "dist": "npm run clean && npm run compile && npm run fetch && npm run doBuild -- --mode=dist",
- "distDev": "npm run clean && npm run compile && npm run fetch && npm run doBuild -- --mode=dev",
+ "dist": "npm run clean && npm run fetch && npm run build:dist",
+ "distDev": "npm run clean && npm run fetch && npm run build:dev",
"test": "npm run test:lint",
"test:lint": "eslint --cache --color --ext .jsx,.js ."
},
diff --git a/src/main/index.js b/src/main/index.js
index c96b46e..7dc43ae 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -85,7 +85,7 @@ const displayPermissionDeniedWarning = (browserWindow, permissionType) => {
* @returns {string} - an absolute URL as a string
*/
const makeFullUrl = (url, search = null) => {
- const baseUrl = (isDevelopment ?
+ const baseUrl = (isDevelopment ?
`http://localhost:${PORT}/` :
`file://${path.join(__dirname, "../renderer")}/`
);