diff --git a/.pnp.cjs b/.pnp.cjs index 718baae0..16631879 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -75,6 +75,8 @@ const RAW_RUNTIME_STATE = ["chalk", "npm:5.3.0"],\ ["clsx", "npm:2.1.1"],\ ["color", "npm:4.2.3"],\ + ["color-convert", "npm:2.0.1"],\ + ["color-string", "npm:1.9.0"],\ ["columnify", "npm:1.6.0"],\ ["concurrently", "npm:9.1.0"],\ ["copy-webpack-plugin", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:12.0.2"],\ @@ -109,6 +111,7 @@ const RAW_RUNTIME_STATE = ["ms", "npm:2.1.3"],\ ["node-addon-api", "npm:8.2.2"],\ ["node-gyp", "npm:10.3.1"],\ + ["normalize-url", "npm:6.0.1"],\ ["null-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:4.0.1"],\ ["open", "npm:8.4.2"],\ ["ora", "npm:8.1.1"],\ @@ -4975,7 +4978,7 @@ const RAW_RUNTIME_STATE = ]],\ ["color", [\ ["npm:4.2.3", {\ - "packageLocation": "./.yarn/cache/color-npm-4.2.3-4a23227581-7fbe7cfb81.zip/node_modules/color/",\ + "packageLocation": "./.yarn/unplugged/color-npm-4.2.3-4a23227581/node_modules/color/",\ "packageDependencies": [\ ["color", "npm:4.2.3"],\ ["color-convert", "npm:2.0.1"],\ @@ -5019,6 +5022,15 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["color-string", [\ + ["npm:1.9.0", {\ + "packageLocation": "./.yarn/cache/color-string-npm-1.9.0-75382c0441-db3442bcc6.zip/node_modules/color-string/",\ + "packageDependencies": [\ + ["color-name", "npm:1.1.4"],\ + ["color-string", "npm:1.9.0"],\ + ["simple-swizzle", "npm:0.2.2"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:1.9.1", {\ "packageLocation": "./.yarn/cache/color-string-npm-1.9.1-dc020e56be-b0bfd74c03.zip/node_modules/color-string/",\ "packageDependencies": [\ @@ -8066,6 +8078,8 @@ const RAW_RUNTIME_STATE = ["chalk", "npm:5.3.0"],\ ["clsx", "npm:2.1.1"],\ ["color", "npm:4.2.3"],\ + ["color-convert", "npm:2.0.1"],\ + ["color-string", "npm:1.9.0"],\ ["columnify", "npm:1.6.0"],\ ["concurrently", "npm:9.1.0"],\ ["copy-webpack-plugin", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:12.0.2"],\ @@ -8100,6 +8114,7 @@ const RAW_RUNTIME_STATE = ["ms", "npm:2.1.3"],\ ["node-addon-api", "npm:8.2.2"],\ ["node-gyp", "npm:10.3.1"],\ + ["normalize-url", "npm:6.0.1"],\ ["null-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:4.0.1"],\ ["open", "npm:8.4.2"],\ ["ora", "npm:8.1.1"],\ @@ -10361,6 +10376,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["normalize-url", [\ + ["npm:6.0.1", {\ + "packageLocation": "./.yarn/cache/normalize-url-npm-6.0.1-1df8202fbc-f4d46c6694.zip/node_modules/normalize-url/",\ + "packageDependencies": [\ + ["normalize-url", "npm:6.0.1"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:6.1.0", {\ "packageLocation": "./.yarn/cache/normalize-url-npm-6.1.0-b95bc12ece-95d948f9bd.zip/node_modules/normalize-url/",\ "packageDependencies": [\ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index a8298346..d2bd4dec 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/bin/mk-snapshot.js b/bin/mk-snapshot.js index 3829139c..d1532325 100644 --- a/bin/mk-snapshot.js +++ b/bin/mk-snapshot.js @@ -36,7 +36,8 @@ async function main() { await mkdirp(outputBlobPath); if (process.platform !== 'darwin') { - const mksnapshotBinPath = `${baseDirPath}/node_modules/electron-mksnapshot/bin`; + // TODO non-darwin + const mksnapshotBinPath = path.dirname(require.resolve('electron-mksnapshot/bin/mksnapshot')); const matchingDirs = crossArchDirs.map((dir) => `${mksnapshotBinPath}/${dir}`).filter((dir) => fs.existsSync(dir)); for (const dir of matchingDirs) { if (fs.existsSync(`${mksnapshotBinPath}/gen/v8/embedded.S`)) { @@ -50,7 +51,7 @@ async function main() { console.log(`Generating startup blob in "${outputBlobPath}"`); const res = childProcess.execFileSync( - path.resolve(__dirname, '..', 'node_modules', 'electron-mksnapshot', 'bin', 'mksnapshot' + (process.platform === 'win32' ? '.exe' : '')), + require.resolve(`electron-mksnapshot/bin/mksnapshot${process.platform === 'win32' ? '.exe' : ''}`), [ '--startup-src=' + snapshotScriptPath, '--startup-blob=' + startupBlobPath, diff --git a/package.json b/package.json index c2564680..9476ca89 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,8 @@ "@typescript-eslint/parser": "6.21.0", "acorn": "^8.14.1", "babel-loader": "9.2.1", + "color-convert": "2.0.1", + "color-string": "1.9.0", "concurrently": "9.1.0", "copy-webpack-plugin": "12.0.2", "cpy-cli": "^5.0.0", @@ -137,6 +139,7 @@ "inquirer": "10.1.8", "node-addon-api": "8.2.2", "node-gyp": "^10.2.0", + "normalize-url": "6.0.1", "null-loader": "4.0.1", "parse-url": "9.2.0", "playwright": "1.49.0", @@ -164,6 +167,9 @@ }, "packageManager": "yarn@4.9.1", "dependenciesMeta": { + "color@4.2.3": { + "unplugged": true + }, "electron-mksnapshot@34.5.1": { "unplugged": true } diff --git a/yarn.lock b/yarn.lock index 43f2760a..b86ee832 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3729,6 +3729,15 @@ __metadata: languageName: node linkType: hard +"color-convert@npm:2.0.1, color-convert@npm:^2.0.1": + version: 2.0.1 + resolution: "color-convert@npm:2.0.1" + dependencies: + color-name: "npm:~1.1.4" + checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 + languageName: node + linkType: hard + "color-convert@npm:^1.9.0": version: 1.9.3 resolution: "color-convert@npm:1.9.3" @@ -3738,15 +3747,6 @@ __metadata: languageName: node linkType: hard -"color-convert@npm:^2.0.1": - version: 2.0.1 - resolution: "color-convert@npm:2.0.1" - dependencies: - color-name: "npm:~1.1.4" - checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 - languageName: node - linkType: hard - "color-name@npm:1.1.3": version: 1.1.3 resolution: "color-name@npm:1.1.3" @@ -3761,6 +3761,16 @@ __metadata: languageName: node linkType: hard +"color-string@npm:1.9.0": + version: 1.9.0 + resolution: "color-string@npm:1.9.0" + dependencies: + color-name: "npm:^1.0.0" + simple-swizzle: "npm:^0.2.2" + checksum: 10c0/db3442bcc6f524845b546847d61781acd6f938b83d6eb75941000aa175a510f64d719ecc7913cd4e83e9dfdeda23c5e39c16045f3c4615ce94b89e1c634a375c + languageName: node + linkType: hard + "color-string@npm:^1.9.0": version: 1.9.1 resolution: "color-string@npm:1.9.1" @@ -6412,6 +6422,8 @@ __metadata: chalk: "npm:5.3.0" clsx: "npm:2.1.1" color: "npm:4.2.3" + color-convert: "npm:2.0.1" + color-string: "npm:1.9.0" columnify: "npm:1.6.0" concurrently: "npm:9.1.0" copy-webpack-plugin: "npm:12.0.2" @@ -6445,6 +6457,7 @@ __metadata: ms: "npm:2.1.3" node-addon-api: "npm:8.2.2" node-gyp: "npm:^10.2.0" + normalize-url: "npm:6.0.1" null-loader: "npm:4.0.1" open: "npm:8.4.2" ora: "npm:8.1.1" @@ -6479,6 +6492,8 @@ __metadata: webpack: "npm:5.96.1" webpack-cli: "npm:5.1.4" dependenciesMeta: + color@4.2.3: + unplugged: true electron-mksnapshot@34.5.1: unplugged: true languageName: unknown @@ -8509,6 +8524,13 @@ __metadata: languageName: node linkType: hard +"normalize-url@npm:6.0.1": + version: 6.0.1 + resolution: "normalize-url@npm:6.0.1" + checksum: 10c0/f4d46c6694eb20ea822f793ed594229637673873bda5c5ab28caa4856bbe8023dc285a5ae197cd253164d1c477dacbe9e4eaa9311d74f6341ab8539b45cad41e + languageName: node + linkType: hard + "normalize-url@npm:^6.0.1": version: 6.1.0 resolution: "normalize-url@npm:6.1.0"