From 42346fdd78ad4aa91e65a5d0cd176ea716459f72 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Wed, 22 Dec 2021 20:30:11 +0800 Subject: [PATCH] fix: override the package name in generated index.js --- index.d.ts | 3 ++ index.js | 24 +++++------ package.json | 8 +++- yarn.lock | 116 +++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 133 insertions(+), 18 deletions(-) diff --git a/index.d.ts b/index.d.ts index 9e0b435..0f09811 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,5 +1,8 @@ +/* tslint:disable */ /* eslint-disable */ +/* auto-generated by NAPI-RS */ + export class ExternalObject { readonly '': { readonly '': unique symbol diff --git a/index.js b/index.js index 3ba17c1..a7c5fac 100644 --- a/index.js +++ b/index.js @@ -18,7 +18,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.android-arm64.node') } else { - nativeBinding = require('snappy-android-arm64') + nativeBinding = require('@napi-rs/snappy-android-arm64') } } catch (e) { loadError = e @@ -32,7 +32,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.win32-x64-msvc.node') } else { - nativeBinding = require('snappy-win32-x64-msvc') + nativeBinding = require('@napi-rs/snappy-win32-x64-msvc') } } catch (e) { loadError = e @@ -44,7 +44,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.win32-ia32-msvc.node') } else { - nativeBinding = require('snappy-win32-ia32-msvc') + nativeBinding = require('@napi-rs/snappy-win32-ia32-msvc') } } catch (e) { loadError = e @@ -56,7 +56,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.win32-arm64-msvc.node') } else { - nativeBinding = require('snappy-win32-arm64-msvc') + nativeBinding = require('@napi-rs/snappy-win32-arm64-msvc') } } catch (e) { loadError = e @@ -74,7 +74,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.darwin-x64.node') } else { - nativeBinding = require('snappy-darwin-x64') + nativeBinding = require('@napi-rs/snappy-darwin-x64') } } catch (e) { loadError = e @@ -86,7 +86,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.darwin-arm64.node') } else { - nativeBinding = require('snappy-darwin-arm64') + nativeBinding = require('@napi-rs/snappy-darwin-arm64') } } catch (e) { loadError = e @@ -105,7 +105,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.freebsd-x64.node') } else { - nativeBinding = require('snappy-freebsd-x64') + nativeBinding = require('@napi-rs/snappy-freebsd-x64') } } catch (e) { loadError = e @@ -121,7 +121,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.linux-x64-musl.node') } else { - nativeBinding = require('snappy-linux-x64-musl') + nativeBinding = require('@napi-rs/snappy-linux-x64-musl') } } catch (e) { loadError = e @@ -132,7 +132,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.linux-x64-gnu.node') } else { - nativeBinding = require('snappy-linux-x64-gnu') + nativeBinding = require('@napi-rs/snappy-linux-x64-gnu') } } catch (e) { loadError = e @@ -147,7 +147,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.linux-arm64-musl.node') } else { - nativeBinding = require('snappy-linux-arm64-musl') + nativeBinding = require('@napi-rs/snappy-linux-arm64-musl') } } catch (e) { loadError = e @@ -158,7 +158,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.linux-arm64-gnu.node') } else { - nativeBinding = require('snappy-linux-arm64-gnu') + nativeBinding = require('@napi-rs/snappy-linux-arm64-gnu') } } catch (e) { loadError = e @@ -171,7 +171,7 @@ switch (platform) { if (localFileExisted) { nativeBinding = require('./snappy.linux-arm-gnueabihf.node') } else { - nativeBinding = require('snappy-linux-arm-gnueabihf') + nativeBinding = require('@napi-rs/snappy-linux-arm-gnueabihf') } } catch (e) { loadError = e diff --git a/package.json b/package.json index 25ddd8d..679c9a7 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,9 @@ ], "napi": { "name": "snappy", + "package": { + "name": "@napi-rs/snappy" + }, "triples": { "defaults": true, "additional": [ @@ -56,13 +59,13 @@ "format:rs": "cargo fmt", "format:source": "prettier --config ./package.json --write .", "lint": "eslint -c ./.eslintrc.yml .", - "prepublishOnly": "napi prepublish -t npm && node ./rename-optional-deps.js", + "prepublishOnly": "napi prepublish -t npm && node ./rename-optional-deps.js && esbuild --minify --outfile=index.js --allow-overwrite index.js", "test": "ava", "test:mem": "node ./memory-leak-detect.mjs", "version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md" }, "devDependencies": { - "@napi-rs/cli": "^2.1.0", + "@napi-rs/cli": "^2.2.0", "@swc-node/register": "^1.4.2", "@types/node": "^17.0.2", "@typescript-eslint/eslint-plugin": "^5.8.0", @@ -71,6 +74,7 @@ "benny": "^3.7.1", "chalk": "^5.0.0", "conventional-changelog-cli": "^2.1.1", + "esbuild": "^0.14.7", "eslint": "^8.5.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.3", diff --git a/yarn.lock b/yarn.lock index 2bd314f..98da53a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -98,10 +98,10 @@ resolved "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== -"@napi-rs/cli@^2.1.0": - version "2.1.0" - resolved "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.1.0.tgz#c0d34051e7488d6e7f2ffd14ba06909fa68b491d" - integrity sha512-1qXXjODcXqYsBQcmIFxlsg8yh2JDRPg/GJryDxXFOu8L2tscmVPGiPgSfEX3MI1r7jPUxVePKk/Gbv9k22fASw== +"@napi-rs/cli@^2.2.0": + version "2.2.0" + resolved "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.2.0.tgz#0129406192c2dfff6e8fc3de0c8be1d2ec286e3f" + integrity sha512-lXOKq0EZWztzHIlpXhKG0Nrv/PDZAl/yBsqQTG0aDfdjGCJudtPgWLR7zzaJoYzkkdFJo0r+teYYzgC+cXB4KQ== "@napi-rs/triples@^1.0.3": version "1.1.0" @@ -1360,6 +1360,114 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +esbuild-android-arm64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.7.tgz#8c78cbb617f9f216abfb5a84cca453b51421a1b6" + integrity sha512-9/Q1NC4JErvsXzJKti0NHt+vzKjZOgPIjX/e6kkuCzgfT/GcO3FVBcGIv4HeJG7oMznE6KyKhvLrFgt7CdU2/w== + +esbuild-darwin-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.7.tgz#7424bdb64c104556d36b7429af79ab51415ab8f4" + integrity sha512-Z9X+3TT/Xj+JiZTVlwHj2P+8GoiSmUnGVz0YZTSt8WTbW3UKw5Pw2ucuJ8VzbD2FPy0jbIKJkko/6CMTQchShQ== + +esbuild-darwin-arm64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.7.tgz#6a243dc0132aeb11c1991f968a6a9e393f43c6bc" + integrity sha512-68e7COhmwIiLXBEyxUxZSSU0akgv8t3e50e2QOtKdBUE0F6KIRISzFntLe2rYlNqSsjGWsIO6CCc9tQxijjSkw== + +esbuild-freebsd-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.7.tgz#e7281e50522e724c4da502504dcd75be0db46c94" + integrity sha512-76zy5jAjPiXX/S3UvRgG85Bb0wy0zv/J2lel3KtHi4V7GUTBfhNUPt0E5bpSXJ6yMT7iThhnA5rOn+IJiUcslQ== + +esbuild-freebsd-arm64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.7.tgz#31e513098efd181d76a3ba3ea285836d37f018a3" + integrity sha512-lSlYNLiqyzd7qCN5CEOmLxn7MhnGHPcu5KuUYOG1i+t5A6q7LgBmfYC9ZHJBoYyow3u4CNu79AWHbvVLpE/VQQ== + +esbuild-linux-32@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.7.tgz#82cf96accbf55d3007c3338dc3b3144efa9ae108" + integrity sha512-Vk28u409wVOXqTaT6ek0TnfQG4Ty1aWWfiysIaIRERkNLhzLhUf4i+qJBN8mMuGTYOkE40F0Wkbp6m+IidOp2A== + +esbuild-linux-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.7.tgz#67bdfe23a6ca918a0bb8e9558a3ee0fdf98c0bc0" + integrity sha512-+Lvz6x+8OkRk3K2RtZwO+0a92jy9si9cUea5Zoru4yJ/6EQm9ENX5seZE0X9DTwk1dxJbjmLsJsd3IoowyzgVg== + +esbuild-linux-arm64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.7.tgz#f79c69ff0c176559c418de8e59aa3cf388fff992" + integrity sha512-kJd5beWSqteSAW086qzCEsH6uwpi7QRIpzYWHzEYwKKu9DiG1TwIBegQJmLpPsLp4v5RAFjea0JAmAtpGtRpqg== + +esbuild-linux-arm@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.7.tgz#3d665b35e1c27dbe1c9deb8bf956d7d1f191a21b" + integrity sha512-OzpXEBogbYdcBqE4uKynuSn5YSetCvK03Qv1HcOY1VN6HmReuatjJ21dCH+YPHSpMEF0afVCnNfffvsGEkxGJQ== + +esbuild-linux-mips64le@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.7.tgz#226114a0cc6649ba0ffd3428118a8f622872f16d" + integrity sha512-mFWpnDhZJmj/h7pxqn1GGDsKwRfqtV7fx6kTF5pr4PfXe8pIaTERpwcKkoCwZUkWAOmUEjMIUAvFM72A6hMZnA== + +esbuild-linux-ppc64le@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.7.tgz#5c67ae56517f2644d567b2ca5ecb97f9520cfc49" + integrity sha512-wM7f4M0bsQXfDL4JbbYD0wsr8cC8KaQ3RPWc/fV27KdErPW7YsqshZZSjDV0kbhzwpNNdhLItfbaRT8OE8OaKA== + +esbuild-netbsd-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.7.tgz#69dc0469ea089013956d8c6aa71c9e7fc25fc567" + integrity sha512-J/afS7woKyzGgAL5FlgvMyqgt5wQ597lgsT+xc2yJ9/7BIyezeXutXqfh05vszy2k3kSvhLesugsxIA71WsqBw== + +esbuild-openbsd-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.7.tgz#3a9d04ecf820708e2e5b7d26fa7332e3f19f6b6c" + integrity sha512-7CcxgdlCD+zAPyveKoznbgr3i0Wnh0L8BDGRCjE/5UGkm5P/NQko51tuIDaYof8zbmXjjl0OIt9lSo4W7I8mrw== + +esbuild-sunos-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.7.tgz#7c33a682f0fd9565cae7df165d0e8736b7b62623" + integrity sha512-GKCafP2j/KUljVC3nesw1wLFSZktb2FGCmoT1+730zIF5O6hNroo0bSEofm6ZK5mNPnLiSaiLyRB9YFgtkd5Xg== + +esbuild-windows-32@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.7.tgz#24ec706a5f25b4499048f56146bcff0ed3839dce" + integrity sha512-5I1GeL/gZoUUdTPA0ws54bpYdtyeA2t6MNISalsHpY269zK8Jia/AXB3ta/KcDHv2SvNwabpImeIPXC/k0YW6A== + +esbuild-windows-64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.7.tgz#dd6d5b5bace93cd7a9174d31fbd727ba21885abf" + integrity sha512-CIGKCFpQOSlYsLMbxt8JjxxvVw9MlF1Rz2ABLVfFyHUF5OeqHD5fPhGrCVNaVrhO8Xrm+yFmtjcZudUGr5/WYQ== + +esbuild-windows-arm64@0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.7.tgz#ecfd9ac289606f26760c4f737caaeeadfff3cfe3" + integrity sha512-eOs1eSivOqN7cFiRIukEruWhaCf75V0N8P0zP7dh44LIhLl8y6/z++vv9qQVbkBm5/D7M7LfCfCTmt1f1wHOCw== + +esbuild@^0.14.7: + version "0.14.7" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.14.7.tgz#e85cead55b0e1001abf1b2ce4a11c1d4d709d13c" + integrity sha512-+u/msd6iu+HvfysUPkZ9VHm83LImmSNnecYPfFI01pQ7TTcsFR+V0BkybZX7mPtIaI7LCrse6YRj+v3eraJSgw== + optionalDependencies: + esbuild-android-arm64 "0.14.7" + esbuild-darwin-64 "0.14.7" + esbuild-darwin-arm64 "0.14.7" + esbuild-freebsd-64 "0.14.7" + esbuild-freebsd-arm64 "0.14.7" + esbuild-linux-32 "0.14.7" + esbuild-linux-64 "0.14.7" + esbuild-linux-arm "0.14.7" + esbuild-linux-arm64 "0.14.7" + esbuild-linux-mips64le "0.14.7" + esbuild-linux-ppc64le "0.14.7" + esbuild-netbsd-64 "0.14.7" + esbuild-openbsd-64 "0.14.7" + esbuild-sunos-64 "0.14.7" + esbuild-windows-32 "0.14.7" + esbuild-windows-64 "0.14.7" + esbuild-windows-arm64 "0.14.7" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"