diff --git a/.pnp.cjs b/.pnp.cjs index 16631879..22cdfd8c 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -55,6 +55,7 @@ const RAW_RUNTIME_STATE = ["@types/react", "npm:18.3.12"],\ ["@types/react-dom", "npm:18.3.1"],\ ["@types/seamless-immutable", "npm:7.1.19"],\ + ["@types/shell-escape", "npm:0.2.3"],\ ["@types/styled-jsx", "npm:2.2.9"],\ ["@types/uuid", "npm:10.0.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.0.0"],\ @@ -133,6 +134,7 @@ const RAW_RUNTIME_STATE = ["seamless-immutable", "npm:7.1.4"],\ ["semver", "npm:7.6.3"],\ ["shebang-loader", "npm:0.0.1"],\ + ["shell-escape", "npm:0.2.0"],\ ["style-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:4.0.0"],\ ["styled-jsx", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:5.1.6"],\ ["stylis", "npm:3.5.4"],\ @@ -2527,6 +2529,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@types/shell-escape", [\ + ["npm:0.2.3", {\ + "packageLocation": "./.yarn/cache/@types-shell-escape-npm-0.2.3-4d809b6aa3-4f153f4241.zip/node_modules/@types/shell-escape/",\ + "packageDependencies": [\ + ["@types/shell-escape", "npm:0.2.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@types/styled-jsx", [\ ["npm:2.2.9", {\ "packageLocation": "./.yarn/cache/@types-styled-jsx-npm-2.2.9-0a99f1f354-5c673ad533.zip/node_modules/@types/styled-jsx/",\ @@ -8058,6 +8069,7 @@ const RAW_RUNTIME_STATE = ["@types/react", "npm:18.3.12"],\ ["@types/react-dom", "npm:18.3.1"],\ ["@types/seamless-immutable", "npm:7.1.19"],\ + ["@types/shell-escape", "npm:0.2.3"],\ ["@types/styled-jsx", "npm:2.2.9"],\ ["@types/uuid", "npm:10.0.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.0.0"],\ @@ -8136,6 +8148,7 @@ const RAW_RUNTIME_STATE = ["seamless-immutable", "npm:7.1.4"],\ ["semver", "npm:7.6.3"],\ ["shebang-loader", "npm:0.0.1"],\ + ["shell-escape", "npm:0.2.0"],\ ["style-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:4.0.0"],\ ["styled-jsx", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:5.1.6"],\ ["stylis", "npm:3.5.4"],\ @@ -12346,6 +12359,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["shell-escape", [\ + ["npm:0.2.0", {\ + "packageLocation": "./.yarn/cache/shell-escape-npm-0.2.0-38c5261c29-501616713d.zip/node_modules/shell-escape/",\ + "packageDependencies": [\ + ["shell-escape", "npm:0.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["shell-quote", [\ ["npm:1.8.2", {\ "packageLocation": "./.yarn/cache/shell-quote-npm-1.8.2-6153748703-85fdd44f2a.zip/node_modules/shell-quote/",\ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index f999ce1d..ac8ff847 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/package.json b/package.json index aabd184c..9533284d 100644 --- a/package.json +++ b/package.json @@ -106,6 +106,7 @@ "@types/react": "18.3.12", "@types/react-dom": "18.3.1", "@types/seamless-immutable": "7.1.19", + "@types/shell-escape": "^0", "@types/styled-jsx": "2.2.9", "@types/uuid": "10.0.0", "@typescript-eslint/eslint-plugin": "7.0.0", @@ -146,6 +147,7 @@ "plist": "3.1.0", "prettier": "3.3.3", "proxyquire": "2.1.3", + "shell-escape": "^0.2.0", "style-loader": "4.0.0", "terser": "5.36.0", "terser-webpack-plugin": "^5.3.10", diff --git a/scripts/mk-snapshot.js b/scripts/mk-snapshot.js index 0ffd844d..484c5a48 100644 --- a/scripts/mk-snapshot.js +++ b/scripts/mk-snapshot.js @@ -4,6 +4,7 @@ const path = require("path"); const pnp = require("pnpapi"); const shellescape = require('shell-escape'); + const version = pkg.devDependencies.electron; if (!version) { console.error("Electron not found in devDependencies."); @@ -16,7 +17,7 @@ process.env.ELECTRON_CUSTOM_VERSION = version; const downloadScript = pnp.resolveToUnqualified("electron-mksnapshot/download-mksnapshot.js", __filename); const mkSnapshotScript = path.resolve(__dirname, "../bin/mk-snapshot.js"); -execSync(shellescape(['node', downloadScript]), { +execSync(`node ${downloadScript}`, { stdio: "inherit", }); -execSync(shellescape(['node', mkSnapshotScript]), { stdio: "inherit" }); +execSync(`node ${mkSnapshotScript}`, { stdio: "inherit" }); diff --git a/yarn.lock b/yarn.lock index b86ee832..d5ff22d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1812,6 +1812,13 @@ __metadata: languageName: node linkType: hard +"@types/shell-escape@npm:^0": + version: 0.2.3 + resolution: "@types/shell-escape@npm:0.2.3" + checksum: 10c0/4f153f424138339fff4be34a8316402b8866cbf94cad40667affacc50547f85a702554c99c9c3d25a69434c2911312e86d4ea37616a216a9074d39c24221559c + languageName: node + linkType: hard + "@types/styled-jsx@npm:2.2.9": version: 2.2.9 resolution: "@types/styled-jsx@npm:2.2.9" @@ -6402,6 +6409,7 @@ __metadata: "@types/react": "npm:18.3.12" "@types/react-dom": "npm:18.3.1" "@types/seamless-immutable": "npm:7.1.19" + "@types/shell-escape": "npm:^0" "@types/styled-jsx": "npm:2.2.9" "@types/uuid": "npm:10.0.0" "@typescript-eslint/eslint-plugin": "npm:7.0.0" @@ -6479,6 +6487,7 @@ __metadata: seamless-immutable: "npm:7.1.4" semver: "npm:7.6.3" shebang-loader: "npm:0.0.1" + shell-escape: "npm:^0.2.0" style-loader: "npm:4.0.0" styled-jsx: "npm:5.1.6" stylis: "npm:3.5.4" @@ -10226,6 +10235,13 @@ __metadata: languageName: node linkType: hard +"shell-escape@npm:^0.2.0": + version: 0.2.0 + resolution: "shell-escape@npm:0.2.0" + checksum: 10c0/501616713d13fd053b3858da18b613d83bfcdc8368e62be393dc563cc9fe2550492d403f73211e9a84429f39c8b9617f1e016dabee177b0ebdcb298fa47fc612 + languageName: node + linkType: hard + "shell-quote@npm:^1.8.1": version: 1.8.2 resolution: "shell-quote@npm:1.8.2"