From 10c51575dfab40f97d80e301b161a9ef04908a22 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 23 Sep 2023 22:52:48 +0800 Subject: [PATCH] Node.js: sync with upstream source Signed-off-by: Tianling Shen --- lang/node-argon2/Makefile | 4 +- lang/node-aws-crt/Makefile | 9 +- lang/node-aws-sdk/Makefile | 4 +- lang/node-ffi-napi/Makefile | 3 +- lang/node-ffmpeg-for-homebridge/Makefile | 4 +- .../patches/000-remove_depends.patch | 7 +- .../patches/000-use_openwrt_package.patch | 18 +-- lang/node-gyp-build/Makefile | 111 ++++++++++++++ lang/node-homebridge-cmd4/Makefile | 5 +- lang/node-javascript-obfuscator/Makefile | 4 +- lang/node-mocha/Makefile | 8 +- lang/node-mqtt/Makefile | 4 +- .../patches/000-remove_depends.patch | 2 +- lang/node-npm-check-updates/Makefile | 4 +- lang/node-npm-run-all2/Makefile | 117 +++++++++++++++ lang/node-red-dashboard/Makefile | 4 +- lang/node-red-node-sqlite/Makefile | 4 +- .../patches/000-remove_depends.patch | 4 +- lang/node-red/Makefile | 6 +- lang/node-shx/Makefile | 107 ++++++++++++++ lang/node-twilio/Makefile | 4 +- lang/node-ws/Makefile | 4 +- lang/node-zeromq/Makefile | 139 ++++++++++++++++++ .../patches/001-modify_compile_options.patch | 77 ++++++++++ lang/node-zigbee2mqtt/Makefile | 4 +- lang/node-zwave-js/Makefile | 7 +- .../patches/000-remove_depends.patch | 4 +- lang/node/Makefile | 27 ++-- .../012-changing-default-npm-settings.patch | 8 +- .../v18.x/999-localhost-no-addrconfig.patch | 2 +- lang/node/patches/v20.x/003-path.patch | 2 +- .../012-changing-default-npm-settings.patch | 4 +- lang/node/patches/v20.x/200-uv_gyp.patch | 2 +- lang/node/patches/v20.x/202-node_gyp.patch | 2 +- lang/node/patches/v20.x/204-v8_gyp.patch | 2 +- lang/ts-node/Makefile | 7 +- 36 files changed, 652 insertions(+), 72 deletions(-) create mode 100644 lang/node-gyp-build/Makefile create mode 100644 lang/node-npm-run-all2/Makefile create mode 100644 lang/node-shx/Makefile create mode 100644 lang/node-zeromq/Makefile create mode 100644 lang/node-zeromq/patches/001-modify_compile_options.patch diff --git a/lang/node-argon2/Makefile b/lang/node-argon2/Makefile index 0198b61a9e..7b91d97629 100644 --- a/lang/node-argon2/Makefile +++ b/lang/node-argon2/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=argon2 PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=0.31.0 +PKG_VERSION:=0.31.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=7189d39349947edfa467e1e54913e2f56d85622b673efcaeeb27e09a53e26a94 +PKG_HASH:=31e997c2cd1896c8c0e6fc49d70cfe232ffdeceeb28e6258a532ae19a969afdb PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-aws-crt/Makefile b/lang/node-aws-crt/Makefile index 627ac7bfff..665dbda0f4 100644 --- a/lang/node-aws-crt/Makefile +++ b/lang/node-aws-crt/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=aws-crt PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=1.18.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ @@ -104,6 +104,13 @@ define Build/Compile CROSS_COMPILE="$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-" \ TARGET_CROSS="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)" \ npm run install --no-save --no-package-lock + rm -rf $(PKG_BUILD_DIR)/node_modules + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts --legacy-peer-deps rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json find $(PKG_BUILD_DIR)/node_modules -type d -empty -delete || true diff --git a/lang/node-aws-sdk/Makefile b/lang/node-aws-sdk/Makefile index b1bb09a251..8238a662be 100644 --- a/lang/node-aws-sdk/Makefile +++ b/lang/node-aws-sdk/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=aws-sdk PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=2.1448.0 +PKG_VERSION:=2.1462.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=47e2da83d72652074ea10e9fffdca894a39515c224706d4f7a88716dce0ebde9 +PKG_HASH:=20bd7edeae7ef07f39ac09677d49e4aab26c11a7b75f4d8657c1e2840b0ddbba PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-ffi-napi/Makefile b/lang/node-ffi-napi/Makefile index 47eb945a75..fcf9aae977 100644 --- a/lang/node-ffi-napi/Makefile +++ b/lang/node-ffi-napi/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=node/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 +PKG_LIBFFI_VERSION:=3.4.2 include $(INCLUDE_DIR)/package.mk @@ -44,7 +45,7 @@ NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst TMPNPM:=$(shell mktemp -u XXXXXXXXXX) NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) -TARGET_CFLAGS+=$(FPIC) +TARGET_CFLAGS+=$(FPIC) -I$(BUILD_DIR)/libffi-$(PKG_LIBFFI_VERSION)/$(GNU_TARGET_NAME)-gnu -I$(BUILD_DIR)/libffi-$(PKG_LIBFFI_VERSION)/$(GNU_TARGET_NAME)-$(TARGET_SUFFIX) TARGET_CPPFLAGS+=$(FPIC) define Build/Compile diff --git a/lang/node-ffmpeg-for-homebridge/Makefile b/lang/node-ffmpeg-for-homebridge/Makefile index 7fd296d788..8f8c3a11a4 100644 --- a/lang/node-ffmpeg-for-homebridge/Makefile +++ b/lang/node-ffmpeg-for-homebridge/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=ffmpeg-for-homebridge PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=0.1.4 +PKG_VERSION:=2.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=6e9d496d8845a2200f10f55a33930c7cccc9ad00ddaa47394fecf22aa159558f +PKG_HASH:=922887c30d4e57efdfb2e1672797280346bf0043dda46fb86c5632c294f4861f PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=none diff --git a/lang/node-ffmpeg-for-homebridge/patches/000-remove_depends.patch b/lang/node-ffmpeg-for-homebridge/patches/000-remove_depends.patch index 3cf6c7d038..a7d7434066 100644 --- a/lang/node-ffmpeg-for-homebridge/patches/000-remove_depends.patch +++ b/lang/node-ffmpeg-for-homebridge/patches/000-remove_depends.patch @@ -1,12 +1,11 @@ --- a/package.json +++ b/package.json -@@ -31,9 +31,5 @@ +@@ -37,8 +37,5 @@ "h264_omx" ], "dependencies": { -- "detect-libc": "^2.0.1", -- "dotenv": "^16.0.1", +- "dotenv": "^16.3.1", - "simple-get": "^4.0.1", -- "tar": "^6.1.11" +- "tar": "^6.2.0" } } diff --git a/lang/node-ffmpeg-for-homebridge/patches/000-use_openwrt_package.patch b/lang/node-ffmpeg-for-homebridge/patches/000-use_openwrt_package.patch index a6ddb98dc9..a777af8402 100644 --- a/lang/node-ffmpeg-for-homebridge/patches/000-use_openwrt_package.patch +++ b/lang/node-ffmpeg-for-homebridge/patches/000-use_openwrt_package.patch @@ -1,17 +1,17 @@ --- a/index.js +++ b/index.js @@ -1,10 +1,11 @@ - 'use strict'; + "use strict"; --const os = require('os'); --const path = require('path'); -+// const os = require('os'); -+// const path = require('path'); - const fs = require('fs'); + const os = require("os"); +-const path = require("path"); +-const fs = require("fs"); ++// const path = require("path"); ++// const fs = require("fs"); --const ffmpegPath = path.resolve(__dirname, os.platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'); -+// const ffmpegPath = path.resolve(__dirname, os.platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'); +-const ffmpegPath = path.resolve(__dirname, os.platform() === "win32" ? "ffmpeg.exe" : "ffmpeg"); ++// const ffmpegPath = path.resolve(__dirname, os.platform() === "win32" ? "ffmpeg.exe" : "ffmpeg"); +const ffmpegPath = '/usr/bin/ffmpeg'; if (fs.existsSync(ffmpegPath)) { - module.exports = ffmpegPath; + diff --git a/lang/node-gyp-build/Makefile b/lang/node-gyp-build/Makefile new file mode 100644 index 0000000000..303b750178 --- /dev/null +++ b/lang/node-gyp-build/Makefile @@ -0,0 +1,111 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_NAME:=node-gyp-build +PKG_NAME:=$(PKG_NPM_NAME) +PKG_VERSION:=4.6.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ + https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=b34dddd54327fe46e3e868b79cbce6b57988c735f4986201e11ca1c7656140bf + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +HOST_BUILD_DEPENDS:=node/host +HOST_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=node/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/node-gyp-build + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=Build tool and bindings loader for node-gyp that supports prebuilds + URL:=https://www.npmjs.com/package/node-gyp-build + DEPENDS:=+node +endef + +define Package/node-gyp-build/description + Build tool and bindings loader for node-gyp that supports prebuilds +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Package/node-gyp-build/install + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{*.js,*.md} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/$(PKG_NPM_NAME)/bin.js $(1)/usr/bin/node-gyp-build + $(LN) ../lib/node/$(PKG_NPM_NAME)/optional.js $(1)/usr/bin/node-gyp-build-optional + $(LN) ../lib/node/$(PKG_NPM_NAME)/build-test.js $(1)/usr/bin/node-gyp-build-test + $(INSTALL_DIR) $(1)/usr/lib/node_modules + $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) +endef + +define Package/node-gyp-build/postrm +#!/bin/sh +rm /usr/lib/node_modules/node-gyp-build || true +rm -rf /usr/lib/node/node-gyp-build || true +endef + +define Host/Compile + cd $(HOST_BUILD_DIR); \ + $(HOST_MAKE_VARS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/host-npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM) + rm -f $(HOST_BUILD_DIR)/node_modules/.package-lock.json + find $(HOST_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Host/Install + $(INSTALL_DIR) $(1)/lib/node_modules/$(PKG_NPM_NAME) + $(CP) $(HOST_BUILD_DIR)/{package.json,LICENSE} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(CP) $(HOST_BUILD_DIR)/{*.js,*.md} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/bin + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin.js $(1)/bin/node-gyp-build + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/optional.js $(1)/bin/node-gyp-build-optional + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/build-test.js $(1)/bin/node-gyp-build-test +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,node-gyp-build)) diff --git a/lang/node-homebridge-cmd4/Makefile b/lang/node-homebridge-cmd4/Makefile index da9ced4090..685c7a99c6 100644 --- a/lang/node-homebridge-cmd4/Makefile +++ b/lang/node-homebridge-cmd4/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge-cmd4 PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=7.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ @@ -57,6 +57,9 @@ define Build/Compile rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true + rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min + rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src + rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale endef define Package/node-homebridge-cmd4/install diff --git a/lang/node-javascript-obfuscator/Makefile b/lang/node-javascript-obfuscator/Makefile index 588f7b34c8..89d04522a1 100644 --- a/lang/node-javascript-obfuscator/Makefile +++ b/lang/node-javascript-obfuscator/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=javascript-obfuscator PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=4.0.2 +PKG_VERSION:=4.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=a7da0955ad965f750bf828eed8b820f8fec38c6658751355445138548f8222be +PKG_HASH:=5335ccc1e7923593167150b25bd89d8ea60317fb3553a580d5a4200835d2f010 PKG_MAINTAINER:=Zbynek Kocur PKG_LICENSE:=BSD-2-Clause diff --git a/lang/node-mocha/Makefile b/lang/node-mocha/Makefile index 293e8b0fc3..45033311d8 100644 --- a/lang/node-mocha/Makefile +++ b/lang/node-mocha/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=mocha PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=10.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ @@ -73,10 +73,11 @@ define Package/node-mocha/install $(CP) $(PKG_BUILD_DIR)/{node_modules,bin,lib} \ $(1)/usr/lib/node/$(PKG_NPM_NAME)/ $(INSTALL_DIR) $(1)/usr/bin - $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/mocha $(1)/usr/bin/mocha + $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/mocha.js $(1)/usr/bin/mocha $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/_mocha $(1)/usr/bin/_mocha $(INSTALL_DIR) $(1)/usr/lib/node_modules $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/bin/mocha.js endef define Package/node-mocha/postrm @@ -105,8 +106,9 @@ define Host/Install $(CP) $(HOST_BUILD_DIR)/{node_modules,bin,lib} \ $(1)/lib/node_modules/$(PKG_NPM_NAME)/ $(INSTALL_DIR) $(1)/bin - $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/mocha $(1)/bin/mocha + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/mocha.js $(1)/bin/mocha $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/_mocha $(1)/bin/_mocha + chmod +x $(1)/lib/node_modules/$(PKG_NPM_NAME)/bin/mocha.js endef $(eval $(call HostBuild)) diff --git a/lang/node-mqtt/Makefile b/lang/node-mqtt/Makefile index 9f0a725e0c..626ff63574 100644 --- a/lang/node-mqtt/Makefile +++ b/lang/node-mqtt/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=mqtt PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=5.0.3 +PKG_VERSION:=5.0.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=69df09e351b7fe67bc014e0f78e4248ed273dc43f13c07525e94317fadd1159d +PKG_HASH:=ac7be66a7e642d380f5f46bc5e78adc05bcde8240e9ca4b3cf9f12ca06b5d204 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-mqtt/patches/000-remove_depends.patch b/lang/node-mqtt/patches/000-remove_depends.patch index 0e55cf2da1..8188c76c71 100644 --- a/lang/node-mqtt/patches/000-remove_depends.patch +++ b/lang/node-mqtt/patches/000-remove_depends.patch @@ -1,6 +1,6 @@ --- a/package.json +++ b/package.json -@@ -112,8 +112,7 @@ +@@ -115,8 +115,7 @@ "readable-stream": "^4.4.2", "reinterval": "^1.1.0", "rfdc": "^1.3.0", diff --git a/lang/node-npm-check-updates/Makefile b/lang/node-npm-check-updates/Makefile index 2da8273f63..97445bfffe 100644 --- a/lang/node-npm-check-updates/Makefile +++ b/lang/node-npm-check-updates/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=npm-check-updates PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=16.13.2 +PKG_VERSION:=16.14.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=7897e1cf648c9b93106f07b18b2be0a55d6788e35f2139087cd5cdcb6200e810 +PKG_HASH:=e6729f1bbd9a37f40d027c2178b9f53b78163e2638965d3def5b4feec4766a0d PKG_MAINTAINER:=Hirokazu MORIKAWA , Patrik Laszlo PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-npm-run-all2/Makefile b/lang/node-npm-run-all2/Makefile new file mode 100644 index 0000000000..cb2a31a41c --- /dev/null +++ b/lang/node-npm-run-all2/Makefile @@ -0,0 +1,117 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_NAME:=npm-run-all2 +PKG_NAME:=node-$(PKG_NPM_NAME) +PKG_VERSION:=6.0.6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ + https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=2fa564a2e01c98c4187595113dc30498feefaa7d7baa3d30a34ab2affea978d9 + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +HOST_BUILD_DEPENDS:=node/host +HOST_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=node/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/node-npm-run-all2 + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=A CLI tool to run multiple npm-scripts in parallel or sequential. + URL:=https://www.npmjs.com/package/npm-run-all2 + DEPENDS:=+node +endef + +define Package/node-npm-run-all2/description + A CLI tool to run multiple npm-scripts in parallel or sequential. (Maintainence fork) +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Package/node-npm-run-all2/install + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{bin,lib,node_modules,docs} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/run-p/index.js $(1)/usr/bin/run-p + $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/run-s/index.js $(1)/usr/bin/run-s + $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/npm-run-all/index.js $(1)/usr/bin/npm-run-all + $(INSTALL_DIR) $(1)/usr/lib/node_modules + $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/bin/run-p/index.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/bin/run-s/index.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/bin/npm-run-all/index.js +endef + +define Package/node-npm-run-all2/postrm +#!/bin/sh +rm /usr/lib/node_modules/npm-run-all2 || true +rm -rf /usr/lib/node/npm-run-all2 || true +endef + +define Host/Compile + cd $(HOST_BUILD_DIR); \ + $(HOST_MAKE_VARS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/host-npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM) + rm -f $(HOST_BUILD_DIR)/node_modules/.package-lock.json + find $(HOST_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Host/Install + $(INSTALL_DIR) $(1)/lib/node_modules/$(PKG_NPM_NAME) + $(CP) $(HOST_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(CP) $(HOST_BUILD_DIR)/{bin,lib,node_modules,docs} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/bin + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/run-p/index.js $(1)/bin/run-p + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/run-s/index.js $(1)/bin/run-s + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/npm-run-all/index.js $(1)/bin/npm-run-all + chmod +x $(1)/lib/node_modules/$(PKG_NPM_NAME)/bin/run-p/index.js + chmod +x $(1)/lib/node_modules/$(PKG_NPM_NAME)/bin/run-s/index.js + chmod +x $(1)/lib/node_modules/$(PKG_NPM_NAME)/bin/npm-run-all/index.js +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,node-npm-run-all2)) diff --git a/lang/node-red-dashboard/Makefile b/lang/node-red-dashboard/Makefile index 386b586542..dc3954effb 100644 --- a/lang/node-red-dashboard/Makefile +++ b/lang/node-red-dashboard/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red-dashboard PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=3.5.0 +PKG_VERSION:=3.6.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=9946489876c40c00f972948b61bbb1c745704e44d0af386f12ab5328daef9f03 +PKG_HASH:=e2d6389c46aff9f5a92e7432b25ca0b1d2606ca0807223434abd2a705d670689 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red-node-sqlite/Makefile b/lang/node-red-node-sqlite/Makefile index f528c3d0ec..dbf7918c7e 100644 --- a/lang/node-red-node-sqlite/Makefile +++ b/lang/node-red-node-sqlite/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red-node-sqlite PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=1.0.3 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=c20a5d9a6b5855b40b18bdca9842520c6ea5fca72f72648839f43a7a2823fe00 +PKG_HASH:=bc19564d9c9c089e4f3e865acffed03badae6927618aaa1ed96fa1745df5fdce PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red-node-sqlite/patches/000-remove_depends.patch b/lang/node-red-node-sqlite/patches/000-remove_depends.patch index 60883ea84b..beaa9815d4 100644 --- a/lang/node-red-node-sqlite/patches/000-remove_depends.patch +++ b/lang/node-red-node-sqlite/patches/000-remove_depends.patch @@ -2,10 +2,10 @@ +++ b/package.json @@ -2,9 +2,6 @@ "name": "node-red-node-sqlite", - "version": "1.0.3", + "version": "1.1.0", "description": "A sqlite node for Node-RED", - "dependencies": { -- "sqlite3": "^5.0.2" +- "sqlite3": "^5.1.6" - }, "repository": { "type": "git", diff --git a/lang/node-red/Makefile b/lang/node-red/Makefile index a18b9763f8..2693735d54 100644 --- a/lang/node-red/Makefile +++ b/lang/node-red/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=3.0.2 -PKG_RELEASE:=2 +PKG_VERSION:=3.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=5803053d74fabf328ef20e7712ce35532f7efe571a2d11fb063d0db69fb5d8d2 +PKG_HASH:=3b981ef1f3c65f54a58ecac0cbe37468f032f959e5aa3fb164c6a535ccf4e31c PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-shx/Makefile b/lang/node-shx/Makefile new file mode 100644 index 0000000000..0f7b9c33a6 --- /dev/null +++ b/lang/node-shx/Makefile @@ -0,0 +1,107 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_NAME:=shx +PKG_NAME:=node-$(PKG_NPM_NAME) +PKG_VERSION:=0.3.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ + https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=5e1f3733b150ec2f80d32544067546f52a3ab7b05219d73e2af195c16ce23834 + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +HOST_BUILD_DEPENDS:=node/host +HOST_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=node/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/node-shx + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=Portable Shell Commands for Node + URL:=https://www.npmjs.com/package/shx + DEPENDS:=+node +endef + +define Package/node-shx/description + Portable Shell Commands for Node +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Package/node-shx/install + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{lib,node_modules} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/$(PKG_NPM_NAME)/lib/cli.js $(1)/usr/bin/shx + $(INSTALL_DIR) $(1)/usr/lib/node_modules + $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) +endef + +define Package/node-shx/postrm +#!/bin/sh +rm /usr/lib/node_modules/shx || true +rm -rf /usr/lib/node/shx || true +endef + +define Host/Compile + cd $(HOST_BUILD_DIR); \ + $(HOST_MAKE_VARS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/host-npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM) + rm -f $(HOST_BUILD_DIR)/node_modules/.package-lock.json + find $(HOST_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Host/Install + $(INSTALL_DIR) $(1)/lib/node_modules/$(PKG_NPM_NAME) + $(CP) $(HOST_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(CP) $(HOST_BUILD_DIR)/{lib,node_modules} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/bin + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/lib/cli.js $(1)/bin/shx +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,node-shx)) diff --git a/lang/node-twilio/Makefile b/lang/node-twilio/Makefile index c26646e59c..cca6ef6aee 100644 --- a/lang/node-twilio/Makefile +++ b/lang/node-twilio/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=twilio PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=4.16.0 +PKG_VERSION:=4.17.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=1aa8dab4fcade819b07f7b17f55dfe040f28fc703efaef438581ff27ebf09d72 +PKG_HASH:=9a795399842ab8d1017d7254c2c693c3f93556b8c53cb539d614acd60ef865ce PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-ws/Makefile b/lang/node-ws/Makefile index 080f9490c3..67cd239953 100644 --- a/lang/node-ws/Makefile +++ b/lang/node-ws/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=ws PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=8.13.0 +PKG_VERSION:=8.14.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=d80be0fd521feecd43908a487645fd2f69af7a7a82e9ee0661b0bf15a67eca4f +PKG_HASH:=271cacc731d6062b969aab40360c82c621ad7a238f49aba93aebd6429dbfc625 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-zeromq/Makefile b/lang/node-zeromq/Makefile new file mode 100644 index 0000000000..c4dd0a7654 --- /dev/null +++ b/lang/node-zeromq/Makefile @@ -0,0 +1,139 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_NAME:=zeromq +PKG_NAME:=node-$(PKG_NPM_NAME) +PKG_VERSION:=6.0.0-beta.17 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ + https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=529b41f79596fc8a7165f57a2cff9ccb00fd53308807a10c6766c309d6702691 + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_DEPENDS:=node/host node-shx/host node-npm-run-all2/host node-gyp-build/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/node-zeromq + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=Next-generation ZeroMQ bindings for Node.js + URL:=https://www.npmjs.org/package/zeromq + DEPENDS:=+node +endef + +define Package/node-zeromq/description + Next-generation ZeroMQ bindings for Node.js +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Configure +endef + +define Build/Install +endef + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --no-save --no-package-lock --ignore-scripts + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + CMAKE_SYSTEM_NAME=Linux \ + CMAKE_SYSTEM_VERSION=1 \ + CMAKE_SYSTEM_PROCESSOR=$(ARCH) \ + CMAKE_BUILD_TYPE=Release \ + CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \ + CMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \ + CMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \ + CMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \ + CMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \ + CMAKE_CXX_COMPILER_LAUNCHER="$(CMAKE_CXX_COMPILER_LAUNCHER)" \ + CMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \ + CMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \ + CMAKE_ASM_COMPILER="$(TARGET_CC_NOCACHE)" \ + CMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \ + CMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \ + CMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \ + CMAKE_AR="$(CMAKE_AR)" \ + CMAKE_NM="$(CMAKE_NM)" \ + CMAKE_RANLIB="$(CMAKE_RANLIB)" \ + CMAKE_FIND_ROOT_PATH="$(CMAKE_FIND_ROOT_PATH)" \ + CMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \ + CMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ + CMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + CMAKE_INSTALL_PREFIX=/usr \ + DL_LIBRARY=$(STAGING_DIR) \ + CMAKE_PREFIX_PATH=$(STAGING_DIR) \ + CMAKE_SKIP_RPATH=TRUE \ + CMAKE_EXPORT_PACKAGE_REGISTRY=FALSE \ + CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE \ + CMAKE_FIND_USE_PACKAGE_REGISTRY=FALSE \ + CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \ + CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \ + CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \ + CMAKE_SYSROOT="$(STAGING_DIR_ROOT)" \ + CROSS_COMPILE="$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-" \ + TARGET_CROSS="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)" \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) + rm -rf $(PKG_BUILD_DIR)/node_modules + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts --legacy-peer-deps + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -delete || true +endef + +define Package/node-zeromq/install + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/package.json \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{*.md,*.js} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{lib,node_modules} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME)/build/Release + $(CP) $(PKG_BUILD_DIR)/build/Release/zeromq.node \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/build/Release/ + $(INSTALL_DIR) $(1)/usr/lib/node_modules + $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) +endef + +define Package/node-zeromq/postrm +#!/bin/sh +rm /usr/lib/node_modules/zeromq || true +rm -rf /usr/lib/node/zeromq || true +endef + +$(eval $(call BuildPackage,node-zeromq)) diff --git a/lang/node-zeromq/patches/001-modify_compile_options.patch b/lang/node-zeromq/patches/001-modify_compile_options.patch new file mode 100644 index 0000000000..87854208a9 --- /dev/null +++ b/lang/node-zeromq/patches/001-modify_compile_options.patch @@ -0,0 +1,77 @@ +--- a/script/build.js ++++ b/script/build.js +@@ -7,7 +7,7 @@ const root = (0, path_1.dirname)(__dirna + function main() { + const zmq_rev = + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions +- process.env.ZMQ_VERSION || "20de92ac0a2b2b9a1869782a429df68f93c3625e"; ++ process.env.ZMQ_VERSION || "de5ee18203f4ba472812fd08665603cd3f88955d"; + const src_url = `https://github.com/zeromq/libzmq/archive/${zmq_rev}.tar.gz`; + const libzmq_build_prefix = `${root}/build/libzmq-staging`; + const libzmq_install_prefix = `${root}/build/libzmq`; +@@ -26,12 +26,12 @@ function main() { + build_options += " -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL"; + } + } +- build_options += archCMakeOptions(); +- if (process.platform === "darwin") { +- const MACOSX_DEPLOYMENT_TARGET = "10.15"; +- process.env.MACOSX_DEPLOYMENT_TARGET = MACOSX_DEPLOYMENT_TARGET; +- build_options += ` -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}`; +- } ++ // build_options += archCMakeOptions(); ++ // if (process.platform === "darwin") { ++ // const MACOSX_DEPLOYMENT_TARGET = "10.15"; ++ // process.env.MACOSX_DEPLOYMENT_TARGET = MACOSX_DEPLOYMENT_TARGET; ++ // build_options += ` -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}`; ++ // } + (0, shelljs_1.mkdir)("-p", libzmq_build_prefix); + (0, shelljs_1.cd)(libzmq_build_prefix); + if ((0, fs_1.existsSync)(installed_artifact)) { +@@ -59,6 +59,46 @@ function main() { + if ((0, fs_1.existsSync)(clang_format_file)) { + (0, fs_1.writeFileSync)(clang_format_file, ""); + } ++ ++ build_options += " -DCMAKE_CROSSCOMPILING=true"; ++ build_options += " -DCMAKE_SYSTEM_NAME=" + process.env.CMAKE_SYSTEM_NAME; ++ build_options += " -DCMAKE_SYSTEM_VERSION=" + process.env.CMAKE_SYSTEM_VERSION; ++ build_options += " -DCMAKE_SYSTEM_PROCESSOR=" + process.env.CMAKE_SYSTEM_PROCESSOR; ++ build_options += " -DCMAKE_BUILD_TYPE=" + process.env.CMAKE_BUILD_TYPE; ++ build_options += " -DCMAKE_C_FLAGS_RELEASE=\"" + process.env.CMAKE_C_FLAGS_RELEASE + "\""; ++ build_options += " -DCMAKE_CXX_FLAGS_RELEASE=\"" + process.env.CMAKE_CXX_FLAGS_RELEASE + "\""; ++ build_options += " -DCMAKE_C_COMPILER_LAUNCHER=" + process.env.CMAKE_C_COMPILER_LAUNCHER; ++ build_options += " -DCMAKE_C_COMPILER=" + process.env.CMAKE_C_COMPILER; ++ build_options += " -DCMAKE_C_COMPILER_ARG1=" + process.env.CMAKE_C_COMPILER_ARG1; ++ build_options += " -DCMAKE_CXX_COMPILER_LAUNCHER=" + process.env.CMAKE_CXX_COMPILER_LAUNCHER; ++ build_options += " -DCMAKE_CXX_COMPILER=" + process.env.CMAKE_CXX_COMPILER; ++ build_options += " -DCMAKE_CXX_COMPILER_ARG1=" + process.env.CMAKE_CXX_COMPILER_ARG1; ++ build_options += " -DCMAKE_ASM_COMPILER=" + process.env.CMAKE_ASM_COMPILER; ++ build_options += " -DCMAKE_EXE_LINKER_FLAGS=\"" + process.env.CMAKE_EXE_LINKER_FLAGS + "\""; ++ build_options += " -DCMAKE_MODULE_LINKER_FLAGS=\"" + process.env.CMAKE_MODULE_LINKER_FLAGS + "\""; ++ build_options += " -DCMAKE_SHARED_LINKER_FLAGS=\"" + process.env.CMAKE_SHARED_LINKER_FLAGS + "\""; ++ build_options += " -DCMAKE_AR=" + process.env.CMAKE_AR; ++ build_options += " -DCMAKE_NM=" + process.env.CMAKE_NM; ++ build_options += " -DCMAKE_RANLIB=" + process.env.CMAKE_RANLIB; ++ build_options += " -DCMAKE_FIND_ROOT_PATH=\"" + process.env.CMAKE_FIND_ROOT_PATH + "\""; ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM; ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY; ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE; ++ build_options += " -DDL_LIBRARY=\"" + process.env.DL_LIBRARY + "\""; ++ build_options += " -DCMAKE_SKIP_RPATH=" + process.env.CMAKE_SKIP_RPATH; ++ build_options += " -DCMAKE_EXPORT_PACKAGE_REGISTRY=" + process.env.CMAKE_EXPORT_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=" + process.env.CMAKE_EXPORT_NO_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_FIND_USE_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_USE_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY; ++ build_options += " -DCMAKE_SYSROOT=" + process.env.CMAKE_SYSROOT; ++ build_options += " -DCROSS_COMPILE=" + process.env.CROSS_COMPILE; ++ build_options += " -DCMAKE_OBJCOPY=" + process.env.TARGET_CROSS + "objcopy"; ++ build_options += " -DCMAKE_STRIP=" + process.env.TARGET_CROSS + "strip"; ++ build_options += " -DCMAKE_DISABLE_FIND_BSD=ON"; ++ build_options += " -DWITH_LIBBSD=OFF"; ++ + const cmake_configure = `cmake -S "${src_dir}" -B ./build ${build_options} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${libzmq_install_prefix}" -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_STATIC=ON -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DWITH_DOCS=OFF -DWITH_LIBSODIUM=ON -DWITH_LIBSODIUM_STATIC=ON`; + console.log(cmake_configure); + (0, shelljs_1.exec)(cmake_configure, execOptions); diff --git a/lang/node-zigbee2mqtt/Makefile b/lang/node-zigbee2mqtt/Makefile index 5aba0fc86a..47fc2bc99b 100644 --- a/lang/node-zigbee2mqtt/Makefile +++ b/lang/node-zigbee2mqtt/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zigbee2mqtt PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=1.32.2 +PKG_VERSION:=1.33.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=e8bbf47df2df09ac0290c71cea7b3e7d3cf0d960b0f89a683149f591a396d257 +PKG_HASH:=02224194ee14608ec2fafd57f99c55d97603a2979dfd25c0a01f0ebc4d5e1160 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=GPL-3.0 diff --git a/lang/node-zwave-js/Makefile b/lang/node-zwave-js/Makefile index 1e1c4772a3..e15ae32620 100644 --- a/lang/node-zwave-js/Makefile +++ b/lang/node-zwave-js/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zwave-js PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=11.13.1 +PKG_VERSION:=11.14.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=f1f373fc6495cc195da65a60e1fdcf5d6b636bf965e72d286fd05b2d59285910 +PKG_HASH:=a6218b92661c1179de2bdacbd14138d5919ecceaf05abd979bd363640d4ef310 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT @@ -58,6 +58,9 @@ define Build/Compile rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true rm -rf $(PKG_BUILD_DIR)/node_modules/serialport/node_modules/@serialport/bindings-cpp/prebuilds + rm -rf $(PKG_BUILD_DIR)/node_modules/@zwave-js/core/node_modules/moment/min + rm -rf $(PKG_BUILD_DIR)/node_modules/@zwave-js/core/node_modules/moment/src + rm -rf $(PKG_BUILD_DIR)/node_modules/@zwave-js/core/node_modules/moment/locale endef define Package/node-zwave-js/install diff --git a/lang/node-zwave-js/patches/000-remove_depends.patch b/lang/node-zwave-js/patches/000-remove_depends.patch index c1dbc4cf77..7bd4a0479d 100644 --- a/lang/node-zwave-js/patches/000-remove_depends.patch +++ b/lang/node-zwave-js/patches/000-remove_depends.patch @@ -1,6 +1,6 @@ --- a/package.json +++ b/package.json -@@ -110,24 +110,5 @@ +@@ -108,24 +108,5 @@ "xstate": "4.38.0" }, "devDependencies": { @@ -13,7 +13,7 @@ - "@types/sinon": "^10.0.14", - "@types/source-map-support": "^0.5.6", - "@xstate/test": "^0.5.1", -- "@zwave-js/maintenance": "11.13.1", +- "@zwave-js/maintenance": "11.14.0", - "@zwave-js/transformers": "11.13.1", - "ava": "^4.3.3", - "del-cli": "^5.0.0", diff --git a/lang/node/Makefile b/lang/node/Makefile index 5bc4d3c7d9..84d14cfb06 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -14,17 +14,17 @@ PATCH_DIR:=./patches/v16.x NODEJS_BIN_SUM:=874463523f26ed528634580247f403d200ba17a31adf2de98a7b124c6eb33d87 else ifeq ($(CONFIG_NODEJS_20),y) -PKG_VERSION:=v20.5.1 +PKG_VERSION:=v20.7.0 PKG_RELEASE:=1 -PKG_HASH:=439c71aa2f38c2861657bfa538e99191a571258066cbfd4548586049c8134190 +PKG_HASH:=3fcfdcd05c461517480596596674df85b35cfce597dd0ae33f5416fc4df12bea PATCH_DIR:=./patches/v20.x -NODEJS_BIN_SUM:=a4a700bbca51ac26538eda2250e449955a9cc49638a45b38d5501e97f5b020b4 +NODEJS_BIN_SUM:=a4251c24c6bf6d3bdee4521ca294bc0897a6c466137e02caa2521af5d456f55e else -PKG_VERSION:=v18.17.1 +PKG_VERSION:=v18.18.0 PKG_RELEASE:=1 -PKG_HASH:=f215cf03d0f00f07ac0b674c6819f804c1542e16f152da04980022aeccf5e65a +PKG_HASH:=e4d4dbac3634d99f892f00db47da78f98493c339582e8a95fb2dd59f5cfe0f90 PATCH_DIR:=./patches/v18.x -NODEJS_BIN_SUM:=07e76408ddb0300a6f46fcc9abc61f841acde49b45020ec4e86bb9b25df4dced +NODEJS_BIN_SUM:=3008408e9098f2462f7b1a0f6a48b8a46079beb1c92b6ec43b04713265c96978 endif endif @@ -96,7 +96,7 @@ define Package/node/config The host package version is also the same. config NODEJS_16 - bool "16.x Maintenance" + bool "16.x End-of-Life" config NODEJS_18 bool "18.x Active LTS" @@ -240,13 +240,22 @@ define Host/Compile endef define Host/Install + rm -f $(1)/bin/npm + rm -f $(1)/bin/npx + rm -rf $(1)/lib/node_modules/npm + rm -f $(1)/bin/corepack + rm -rf $(1)/lib/node_modules/corepack $(TAR) xvfJ $(DL_DIR)/$(NODEJS_BIN) -C $(1) --strip-components=1 - $(RM) $(1)/{CHANGELOG.md,LICENSE,README.md} + rm -f $(1)/{CHANGELOG.md,LICENSE,README.md} endef else define Host/Install - $(RM) -rf $(1)/lib/node_modules/npm + rm -f $(1)/bin/npm + rm -f $(1)/bin/npx + rm -rf $(1)/lib/node_modules/npm + rm -f $(1)/bin/corepack + rm -rf $(1)/lib/node_modules/corepack $(call Host/Install/Default) endef endif diff --git a/lang/node/patches/v18.x/012-changing-default-npm-settings.patch b/lang/node/patches/v18.x/012-changing-default-npm-settings.patch index 09fc491d17..caa933a4f2 100644 --- a/lang/node/patches/v18.x/012-changing-default-npm-settings.patch +++ b/lang/node/patches/v18.x/012-changing-default-npm-settings.patch @@ -1,6 +1,6 @@ ---- a/deps/npm/lib/utils/config/definitions.js -+++ b/deps/npm/lib/utils/config/definitions.js -@@ -1269,7 +1269,7 @@ define('lockfile-version', { +--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js ++++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js +@@ -1266,7 +1266,7 @@ define('lockfile-version', { }) define('loglevel', { @@ -9,7 +9,7 @@ type: [ 'silent', 'error', -@@ -2049,7 +2049,7 @@ define('strict-peer-deps', { +@@ -2066,7 +2066,7 @@ define('strict-peer-deps', { }) define('strict-ssl', { diff --git a/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch b/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch index 54b1a3a001..dadfd14ecd 100644 --- a/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch +++ b/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch @@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816 // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the -@@ -1266,13 +1267,6 @@ function lookupAndConnect(self, options) +@@ -1321,13 +1322,6 @@ function lookupAndConnect(self, options) hints: options.hints || 0, }; diff --git a/lang/node/patches/v20.x/003-path.patch b/lang/node/patches/v20.x/003-path.patch index f63e2246cf..011b024897 100644 --- a/lang/node/patches/v20.x/003-path.patch +++ b/lang/node/patches/v20.x/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1370,7 +1370,8 @@ Module._initPaths = function() { +@@ -1378,7 +1378,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); diff --git a/lang/node/patches/v20.x/012-changing-default-npm-settings.patch b/lang/node/patches/v20.x/012-changing-default-npm-settings.patch index caa933a4f2..b7585d2c7b 100644 --- a/lang/node/patches/v20.x/012-changing-default-npm-settings.patch +++ b/lang/node/patches/v20.x/012-changing-default-npm-settings.patch @@ -1,6 +1,6 @@ --- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js +++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js -@@ -1266,7 +1266,7 @@ define('lockfile-version', { +@@ -1270,7 +1270,7 @@ define('lockfile-version', { }) define('loglevel', { @@ -9,7 +9,7 @@ type: [ 'silent', 'error', -@@ -2066,7 +2066,7 @@ define('strict-peer-deps', { +@@ -2070,7 +2070,7 @@ define('strict-peer-deps', { }) define('strict-ssl', { diff --git a/lang/node/patches/v20.x/200-uv_gyp.patch b/lang/node/patches/v20.x/200-uv_gyp.patch index 75bc8f2e5b..9e3961763a 100644 --- a/lang/node/patches/v20.x/200-uv_gyp.patch +++ b/lang/node/patches/v20.x/200-uv_gyp.patch @@ -1,6 +1,6 @@ --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp -@@ -155,6 +155,7 @@ +@@ -156,6 +156,7 @@ 'target_name': 'libuv', 'toolsets': ['host', 'target'], 'type': '<(uv_library)', diff --git a/lang/node/patches/v20.x/202-node_gyp.patch b/lang/node/patches/v20.x/202-node_gyp.patch index 63529dd883..87f69134e5 100644 --- a/lang/node/patches/v20.x/202-node_gyp.patch +++ b/lang/node/patches/v20.x/202-node_gyp.patch @@ -1,6 +1,6 @@ --- a/node.gyp +++ b/node.gyp -@@ -1190,6 +1190,7 @@ +@@ -1189,6 +1189,7 @@ 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host', ], diff --git a/lang/node/patches/v20.x/204-v8_gyp.patch b/lang/node/patches/v20.x/204-v8_gyp.patch index b9df293ad7..48108f3c9c 100644 --- a/lang/node/patches/v20.x/204-v8_gyp.patch +++ b/lang/node/patches/v20.x/204-v8_gyp.patch @@ -136,7 +136,7 @@ 'include_dirs': [ '<(V8_ROOT)/include', ], -@@ -2019,15 +2040,19 @@ +@@ -1961,15 +1982,19 @@ }], ], 'direct_dependent_settings': { diff --git a/lang/ts-node/Makefile b/lang/ts-node/Makefile index dd479ed881..2f4261e7e5 100644 --- a/lang/ts-node/Makefile +++ b/lang/ts-node/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=ts-node PKG_NAME:=$(PKG_NPM_NAME) PKG_VERSION:=10.9.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ @@ -76,6 +76,11 @@ define Package/ts-node/install $(LN) ../lib/node/$(PKG_NPM_NAME)/dist/bin-transpile.js $(1)/usr/bin/ts-node-transpile-only $(INSTALL_DIR) $(1)/usr/lib/node_modules $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/dist/bin.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/dist/bin-script-deprecated.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/dist/bin-script.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/dist/bin-cwd.js + chmod +x $(1)/usr/lib/node/$(PKG_NPM_NAME)/dist/bin-transpile.js endef define Package/ts-node/postrm