From 04e4a75995a43d90a0e02b8268e6beaf01196757 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 27 Dec 2021 11:07:23 -0500 Subject: [PATCH 1/3] Reduce install size for linux glibc/musl --- .../next-swc/crates/napi/npm/linux-arm64-gnu/install.js | 8 ++++++++ .../crates/napi/npm/linux-arm64-gnu/package.json | 9 ++++++++- .../next-swc/crates/napi/npm/linux-arm64-musl/install.js | 8 ++++++++ .../crates/napi/npm/linux-arm64-musl/package.json | 9 ++++++++- .../next-swc/crates/napi/npm/linux-x64-gnu/install.js | 8 ++++++++ .../next-swc/crates/napi/npm/linux-x64-gnu/package.json | 9 ++++++++- .../next-swc/crates/napi/npm/linux-x64-musl/install.js | 8 ++++++++ .../next-swc/crates/napi/npm/linux-x64-musl/package.json | 9 ++++++++- 8 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js create mode 100644 packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js create mode 100644 packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js create mode 100644 packages/next-swc/crates/napi/npm/linux-x64-musl/install.js diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js new file mode 100644 index 0000000000000..92d98e761ee89 --- /dev/null +++ b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js @@ -0,0 +1,8 @@ +const { family } = require('detect-libc'); +const { name } = require('./package.json'); + +if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { + process.exit(0); +} else { + process.exit(1); +} diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json index eb097c5a75d50..2c2eaea99f84e 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json +++ b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json @@ -9,8 +9,15 @@ ], "main": "next-swc.linux-arm64-gnu.node", "files": [ - "next-swc.linux-arm64-gnu.node" + "next-swc.linux-arm64-gnu.node", + "install.js" ], + "scripts": { + "install": "node install.js" + }, + "dependencies": { + "detect-libc": "1.0.3" + }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js new file mode 100644 index 0000000000000..92d98e761ee89 --- /dev/null +++ b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js @@ -0,0 +1,8 @@ +const { family } = require('detect-libc'); +const { name } = require('./package.json'); + +if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { + process.exit(0); +} else { + process.exit(1); +} diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json index ac0d638a6e482..700dbddce6d07 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json +++ b/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json @@ -9,8 +9,15 @@ ], "main": "next-swc.linux-arm64-musl.node", "files": [ - "next-swc.linux-arm64-musl.node" + "next-swc.linux-arm64-musl.node", + "install.js" ], + "scripts": { + "install": "node install.js" + }, + "dependencies": { + "detect-libc": "1.0.3" + }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js new file mode 100644 index 0000000000000..92d98e761ee89 --- /dev/null +++ b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js @@ -0,0 +1,8 @@ +const { family } = require('detect-libc'); +const { name } = require('./package.json'); + +if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { + process.exit(0); +} else { + process.exit(1); +} diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json index 07f4f9f039d19..f9d3e3829aca6 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json +++ b/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json @@ -9,8 +9,15 @@ ], "main": "next-swc.linux-x64-gnu.node", "files": [ - "next-swc.linux-x64-gnu.node" + "next-swc.linux-x64-gnu.node", + "install.js" ], + "scripts": { + "install": "node install.js" + }, + "dependencies": { + "detect-libc": "1.0.3" + }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js new file mode 100644 index 0000000000000..92d98e761ee89 --- /dev/null +++ b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js @@ -0,0 +1,8 @@ +const { family } = require('detect-libc'); +const { name } = require('./package.json'); + +if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { + process.exit(0); +} else { + process.exit(1); +} diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json index 031a573ed3f9f..1fae7fa2f3def 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json +++ b/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json @@ -9,8 +9,15 @@ ], "main": "next-swc.linux-x64-musl.node", "files": [ - "next-swc.linux-x64-musl.node" + "next-swc.linux-x64-musl.node", + "install.js" ], + "scripts": { + "install": "node install.js" + }, + "dependencies": { + "detect-libc": "1.0.3" + }, "license": "MIT", "engines": { "node": ">= 10" From 78935d3b194240c465ae6791bece8dad6b0d0346 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 29 Dec 2021 12:26:49 -0500 Subject: [PATCH 2/3] Use glibcVersionRuntime --- packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js | 4 ++-- .../next-swc/crates/napi/npm/linux-arm64-gnu/package.json | 3 --- packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js | 4 ++-- .../next-swc/crates/napi/npm/linux-arm64-musl/package.json | 3 --- packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js | 4 ++-- packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json | 3 --- packages/next-swc/crates/napi/npm/linux-x64-musl/install.js | 4 ++-- packages/next-swc/crates/napi/npm/linux-x64-musl/package.json | 3 --- 8 files changed, 8 insertions(+), 20 deletions(-) diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js index 92d98e761ee89..b94b59342b440 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js +++ b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js @@ -1,7 +1,7 @@ -const { family } = require('detect-libc'); +const { glibcVersionRuntime } = process.report.getReport().header; const { name } = require('./package.json'); -if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { +if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { process.exit(0); } else { process.exit(1); diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json index 2c2eaea99f84e..ef8c28f7a8c65 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json +++ b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json @@ -15,9 +15,6 @@ "scripts": { "install": "node install.js" }, - "dependencies": { - "detect-libc": "1.0.3" - }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js index 92d98e761ee89..b94b59342b440 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js +++ b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js @@ -1,7 +1,7 @@ -const { family } = require('detect-libc'); +const { glibcVersionRuntime } = process.report.getReport().header; const { name } = require('./package.json'); -if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { +if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { process.exit(0); } else { process.exit(1); diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json index 700dbddce6d07..e27020587cea4 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json +++ b/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json @@ -15,9 +15,6 @@ "scripts": { "install": "node install.js" }, - "dependencies": { - "detect-libc": "1.0.3" - }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js index 92d98e761ee89..b94b59342b440 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js +++ b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js @@ -1,7 +1,7 @@ -const { family } = require('detect-libc'); +const { glibcVersionRuntime } = process.report.getReport().header; const { name } = require('./package.json'); -if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { +if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { process.exit(0); } else { process.exit(1); diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json index f9d3e3829aca6..70fb20fa9bd6e 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json +++ b/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json @@ -15,9 +15,6 @@ "scripts": { "install": "node install.js" }, - "dependencies": { - "detect-libc": "1.0.3" - }, "license": "MIT", "engines": { "node": ">= 10" diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js index 92d98e761ee89..b94b59342b440 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js +++ b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js @@ -1,7 +1,7 @@ -const { family } = require('detect-libc'); +const { glibcVersionRuntime } = process.report.getReport().header; const { name } = require('./package.json'); -if (family === 'musl' && name.endsWith('-musl') || family !== 'musl' && !name.endsWith('-musl')) { +if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { process.exit(0); } else { process.exit(1); diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json index 1fae7fa2f3def..e4cfdba4ee1a7 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json +++ b/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json @@ -15,9 +15,6 @@ "scripts": { "install": "node install.js" }, - "dependencies": { - "detect-libc": "1.0.3" - }, "license": "MIT", "engines": { "node": ">= 10" From d195de9c3c23199ccaa09ebaca324d0f648c07ee Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 3 Jan 2022 15:26:27 -0500 Subject: [PATCH 3/3] Simplify with ternary --- .../next-swc/crates/napi/npm/linux-arm64-gnu/install.js | 8 +------- .../next-swc/crates/napi/npm/linux-arm64-musl/install.js | 8 +------- .../next-swc/crates/napi/npm/linux-x64-gnu/install.js | 8 +------- .../next-swc/crates/napi/npm/linux-x64-musl/install.js | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js index b94b59342b440..296ba2215f890 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js +++ b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/install.js @@ -1,8 +1,2 @@ const { glibcVersionRuntime } = process.report.getReport().header; -const { name } = require('./package.json'); - -if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { - process.exit(0); -} else { - process.exit(1); -} +process.exit(glibcVersionRuntime ? 0 : 1); \ No newline at end of file diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js index b94b59342b440..3cc50b7e18eda 100644 --- a/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js +++ b/packages/next-swc/crates/napi/npm/linux-arm64-musl/install.js @@ -1,8 +1,2 @@ const { glibcVersionRuntime } = process.report.getReport().header; -const { name } = require('./package.json'); - -if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { - process.exit(0); -} else { - process.exit(1); -} +process.exit(glibcVersionRuntime ? 1 : 0); \ No newline at end of file diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js index b94b59342b440..296ba2215f890 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js +++ b/packages/next-swc/crates/napi/npm/linux-x64-gnu/install.js @@ -1,8 +1,2 @@ const { glibcVersionRuntime } = process.report.getReport().header; -const { name } = require('./package.json'); - -if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { - process.exit(0); -} else { - process.exit(1); -} +process.exit(glibcVersionRuntime ? 0 : 1); \ No newline at end of file diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js index b94b59342b440..3cc50b7e18eda 100644 --- a/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js +++ b/packages/next-swc/crates/napi/npm/linux-x64-musl/install.js @@ -1,8 +1,2 @@ const { glibcVersionRuntime } = process.report.getReport().header; -const { name } = require('./package.json'); - -if (glibcVersionRuntime && name.endsWith('-gnu') || !glibcVersionRuntime && !name.endsWith('-gnu')) { - process.exit(0); -} else { - process.exit(1); -} +process.exit(glibcVersionRuntime ? 1 : 0); \ No newline at end of file