From f5ddaf22fed4097bdbc5eb27fdac3d4b6e122e8e Mon Sep 17 00:00:00 2001 From: Sergey Rubanov Date: Mon, 8 Jan 2024 11:52:56 +0100 Subject: [PATCH 1/2] Drop Socket versions before 0.5 --- index.js | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/index.js b/index.js index f3de379..b52f6a9 100755 --- a/index.js +++ b/index.js @@ -170,21 +170,8 @@ async function main (argv) { ...templates[templateName]?.deps ?? [] ] - // remove eventually - let isSocket05orGreater = true - try { - const { stdout } = await exec('ssc --version') - - try { - const sscVersion = stdout.trim().split(' ')[0] - // split by dot - .split('.') - // convert to numbers - .map(s => parseInt(s)) - - isSocket05orGreater = sscVersion[0] >= 1 || sscVersion[1] >= 5 - } catch (err) {} + await exec('ssc --version') } catch (err) { process.stdout.write('Installing \'@socketsupply/socket\' locally (ssc not in PATH)\n') deps.push('@socketsupply/socket') @@ -210,7 +197,6 @@ async function main (argv) { } pkg.type = 'module' - pkg.scripts['init-project'] = `ssc init${isSocket05orGreater ? ' --config' : ''}` pkg.scripts.start = 'ssc build -r -o' pkg.scripts.build = 'ssc build -o' pkg.scripts.test = 'ssc build -r -o --test=./test/index.js --headless' @@ -231,8 +217,8 @@ async function main (argv) { process.stdout.write('Creating socket files...') // Use spawn so we can pass stdio, fte is interactive const initProcess = spawn( - `npm${os.platform() === 'win32' ? '.cmd' : ''}`, - ['run', 'init-project'], + 'ssc', + ['init', '--config'], { stdio: [process.stdin, process.stdout, process.stderr] }) @@ -299,10 +285,6 @@ async function main (argv) { if (line.includes('script = ')) { return line.replace(line, 'script = "node build.js"') } - // Socket 0.5 compatibility - if (isSocket05orGreater && line.includes('forward_arguments = ')) { - return line.replace(line, 'forward_arguments = true') - } return line }).join('\n') From b7e1683e375af6678c34b5e035a9193b427b0c83 Mon Sep 17 00:00:00 2001 From: Sergey Rubanov Date: Fri, 12 Jan 2024 08:12:48 +0100 Subject: [PATCH 2/2] fix win --- index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index b52f6a9..232979b 100755 --- a/index.js +++ b/index.js @@ -197,6 +197,7 @@ async function main (argv) { } pkg.type = 'module' + pkg.scripts['init-project'] = 'ssc init --config' pkg.scripts.start = 'ssc build -r -o' pkg.scripts.build = 'ssc build -o' pkg.scripts.test = 'ssc build -r -o --test=./test/index.js --headless' @@ -217,8 +218,8 @@ async function main (argv) { process.stdout.write('Creating socket files...') // Use spawn so we can pass stdio, fte is interactive const initProcess = spawn( - 'ssc', - ['init', '--config'], + `npm${os.platform() === 'win32' ? '.cmd' : ''}`, + ['run', 'init-project'], { stdio: [process.stdin, process.stdout, process.stderr] })