From 65a7c7a68a29bca29417a489a35f7395bc121818 Mon Sep 17 00:00:00 2001 From: cplepage Date: Thu, 13 Jun 2024 14:06:35 -0400 Subject: [PATCH 1/3] security fix --- platform/electron/package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/electron/package-lock.json b/platform/electron/package-lock.json index 59fc43ae..6739b3a7 100644 --- a/platform/electron/package-lock.json +++ b/platform/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "FullStacked", - "version": "0.5.0", + "version": "0.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "FullStacked", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0", "dependencies": { "electron-squirrel-startup": "^1.0.1" @@ -1540,12 +1540,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3099,9 +3099,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" From 414042d462983c7618ba89b5046271ee87f74f45 Mon Sep 17 00:00:00 2001 From: cplepage Date: Thu, 13 Jun 2024 14:33:18 -0400 Subject: [PATCH 2/3] esbuild module check --- platform/electron/src/esbuild.ts | 2 -- platform/electron/src/instanceEditor.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/electron/src/esbuild.ts b/platform/electron/src/esbuild.ts index 45f024ba..615b9d6c 100644 --- a/platform/electron/src/esbuild.ts +++ b/platform/electron/src/esbuild.ts @@ -38,8 +38,6 @@ export const loadEsbuild = async (configDirectory: string) => { ? fs.readFileSync(versionFile).toString().trim() : null; - console.log(installedVersion, esbuildVersion); - if (installedVersion?.trim() !== esbuildVersion?.trim()) { return; } diff --git a/platform/electron/src/instanceEditor.ts b/platform/electron/src/instanceEditor.ts index e590114d..7e0eec5a 100644 --- a/platform/electron/src/instanceEditor.ts +++ b/platform/electron/src/instanceEditor.ts @@ -85,7 +85,7 @@ export class InstanceEditor extends Instance { this.adapter = initAdapterEditor(adapter, this, this.esbuild.module); this.adapter.esbuild = { - check: () => !!this.esbuild, + check: () => !!this.esbuild.module, install: () => { const progressListener = (data: { step: number; From fc811e7c50ca3c1ec880ee4edaf86f78e6f3a927 Mon Sep 17 00:00:00 2001 From: cplepage Date: Thu, 13 Jun 2024 14:50:37 -0400 Subject: [PATCH 3/3] xcode build --- platform/ios/xcode/FullStacked.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/ios/xcode/FullStacked.xcodeproj/project.pbxproj b/platform/ios/xcode/FullStacked.xcodeproj/project.pbxproj index 6eff3ac2..fb88cff9 100644 --- a/platform/ios/xcode/FullStacked.xcodeproj/project.pbxproj +++ b/platform/ios/xcode/FullStacked.xcodeproj/project.pbxproj @@ -501,7 +501,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"FullStacked/Preview Content\""; DEVELOPMENT_TEAM = QD7Y9DQ5V4; ENABLE_PREVIEWS = YES; @@ -543,7 +543,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"FullStacked/Preview Content\""; DEVELOPMENT_TEAM = QD7Y9DQ5V4; ENABLE_PREVIEWS = YES;