diff --git a/chip-testing/package.json b/chip-testing/package.json index f444c191c..0e42963ae 100644 --- a/chip-testing/package.json +++ b/chip-testing/package.json @@ -15,7 +15,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/compat/matter-node-ble.js/package.json b/compat/matter-node-ble.js/package.json index f1cc39a4b..75af83522 100644 --- a/compat/matter-node-ble.js/package.json +++ b/compat/matter-node-ble.js/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/compat/matter-node.js-examples/package.json b/compat/matter-node.js-examples/package.json index eca0e87ac..6b76672e6 100644 --- a/compat/matter-node.js-examples/package.json +++ b/compat/matter-node.js-examples/package.json @@ -21,7 +21,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", @@ -35,12 +35,12 @@ "matter-legacystorageconverter": "matter-run src/examples/LegacyStorageConverter.ts" }, "bin": { - "matter-device-legacy": "./dist/esm/examples/DeviceNodeLegacy.js", - "matter-bridge-legacy": "./dist/esm/examples/BridgedDevicesNodeLegacy.js", - "matter-composeddevice-legacy": "./dist/esm/examples/ComposedDeviceNodeLegacy.js", - "matter-multidevice-legacy": "./dist/esm/examples/MultiDeviceNodeLegacy.js", - "matter-controller-legacy": "./dist/esm/examples/ControllerNodeLegacy.js", - "matter-legacystorageconverter": "./dist/esm/examples/LegacyStorageConverter.js" + "matter-device-legacy": "dist/esm/examples/DeviceNodeLegacy.js", + "matter-bridge-legacy": "dist/esm/examples/BridgedDevicesNodeLegacy.js", + "matter-composeddevice-legacy": "dist/esm/examples/ComposedDeviceNodeLegacy.js", + "matter-multidevice-legacy": "dist/esm/examples/MultiDeviceNodeLegacy.js", + "matter-controller-legacy": "dist/esm/examples/ControllerNodeLegacy.js", + "matter-legacystorageconverter": "dist/esm/examples/LegacyStorageConverter.js" }, "devDependencies": { "typescript": "~5.5.3", diff --git a/compat/matter-node.js/package.json b/compat/matter-node.js/package.json index 73b336ab1..7156ab430 100644 --- a/compat/matter-node.js/package.json +++ b/compat/matter-node.js/package.json @@ -21,7 +21,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/package-lock.json b/package-lock.json index 01aee6b7a..d6b104b8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,10 +46,11 @@ "version": "0.0.0-git", "license": "Apache-2.0", "dependencies": { - "@matter.js/general": "*", - "@matter.js/nodejs": "*", - "@matter.js/tools": "*", + "@matter.js/main": "*", "@project-chip/matter.js": "*" + }, + "devDependencies": { + "@matter.js/tools": "*" } }, "codegen": { @@ -130,30 +131,6 @@ "node": ">=18.0.0" } }, - "compat/matter.js": { - "version": "0.0.0-git", - "extraneous": true, - "license": "Apache-2.0", - "dependencies": { - "@matter.js/general": "*", - "@matter.js/model": "*", - "@matter.js/node": "*", - "@matter.js/protocol": "*", - "@matter.js/types": "*", - "@noble/curves": "^1.5.0" - }, - "devDependencies": { - "@matter.js/codegen": "*", - "@matter.js/tools": "*", - "@types/chai": "^4.3.16", - "@types/mocha": "^10.0.7", - "@types/wtfnode": "^0.7.3", - "chai": "^4.4.1", - "embedme": "^1.22.1", - "mocha": "^10.7.3", - "typescript": "~5.5.3" - } - }, "models": { "name": "@matter.js/intermediate-models", "version": "0.0.0-git", @@ -3071,9 +3048,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "license": "MIT", "engines": { @@ -4486,9 +4463,9 @@ } }, "node_modules/@expo/vector-icons": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-14.0.2.tgz", - "integrity": "sha512-70LpmXQu4xa8cMxjp1fydgRPsalefnHaXLzIwaHMEzcZhnyjw2acZz8azRrZOslPVAWlxItOa2Dd7WtD/kI+CA==", + "version": "14.0.3", + "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-14.0.3.tgz", + "integrity": "sha512-UJAKOXPPi6ez/1QZfoFVopCH3+c12Sw+T+IIVkvONCEN7zjN1fLxxWHkZ7Spz4WO5EH2ObtaJfCe/k4rw+ftxA==", "license": "MIT", "dependencies": { "prop-types": "^15.8.1" @@ -4552,14 +4529,14 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -5986,46 +5963,47 @@ "optional": true }, "node_modules/@shikijs/core": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.17.6.tgz", - "integrity": "sha512-9ztslig6/YmCg/XwESAXbKjAjOhaq6HVced9NY6qcbDz1X5g/S90Wco2vMjBNX/6V71ASkzri76JewSGPa7kiQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.18.0.tgz", + "integrity": "sha512-VK4BNVCd2leY62Nm2JjyxtRLkyrZT/tv104O81eyaCjHq4Adceq2uJVFJJAIof6lT1mBwZrEo2qT/T+grv3MQQ==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/engine-javascript": "1.17.6", - "@shikijs/engine-oniguruma": "1.17.6", - "@shikijs/types": "1.17.6", + "@shikijs/engine-javascript": "1.18.0", + "@shikijs/engine-oniguruma": "1.18.0", + "@shikijs/types": "1.18.0", "@shikijs/vscode-textmate": "^9.2.2", "@types/hast": "^3.0.4", - "hast-util-to-html": "^9.0.2" + "hast-util-to-html": "^9.0.3" } }, "node_modules/@shikijs/engine-javascript": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.17.6.tgz", - "integrity": "sha512-5EEZj8tVcierNxm4V0UMS2PVoflb0UJPalWWV8l9rRg+oOfnr5VivqBJbkyq5grltVPvByIXvVbY8GSM/356jQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.18.0.tgz", + "integrity": "sha512-qoP/aO/ATNwYAUw1YMdaip/YVEstMZEgrwhePm83Ll9OeQPuxDZd48szZR8oSQNQBT8m8UlWxZv8EA3lFuyI5A==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "1.17.6", + "@shikijs/types": "1.18.0", + "@shikijs/vscode-textmate": "^9.2.2", "oniguruma-to-js": "0.4.3" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.17.6.tgz", - "integrity": "sha512-NLfWDMXFYe0nDHFbEoyZdz89aIIey3bTfF3zLYSUNTXks5s4uinZVmuPOFf1HfTeGqIn8uErJSBc3VnpJO7Alw==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.18.0.tgz", + "integrity": "sha512-B9u0ZKI/cud+TcmF8Chyh+R4V5qQVvyDOqXC2l2a4x73PBSBc6sZ0JRAX3eqyJswqir6ktwApUUGBYePdKnMJg==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "1.17.6", + "@shikijs/types": "1.18.0", "@shikijs/vscode-textmate": "^9.2.2" } }, "node_modules/@shikijs/types": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.17.6.tgz", - "integrity": "sha512-ndTFa2TJi2w51ddKQDn3Jy8f6K4E5Q2x3dA3Hmsd3+YmxDQ10UWHjcw7VbVbKzv3VcUvYPLy+z9neqytSzUMUg==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.18.0.tgz", + "integrity": "sha512-O9N36UEaGGrxv1yUrN2nye7gDLG5Uq0/c1LyfmxsvzNPqlHzWo9DI0A4+fhW2y3bGKuQu/fwS7EPdKJJCowcVA==", "dev": true, "license": "MIT", "dependencies": { @@ -6366,6 +6344,7 @@ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "license": "MIT", + "peer": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } @@ -7572,132 +7551,11 @@ } }, "node_modules/babel-plugin-react-compiler": { - "version": "0.0.0-experimental-de2cfda-20240912", - "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-0.0.0-experimental-de2cfda-20240912.tgz", - "integrity": "sha512-ASAiKVPBNVWe1NHGEpYESYDs41+RzAv/8ZziAgHO3bYtBNwp0+4SeUkMhji5ueRfo1pYtsodnESwgiVGhzf1ZQ==", - "license": "MIT", - "dependencies": { - "@babel/generator": "7.2.0", - "@babel/types": "^7.19.0", - "chalk": "4", - "invariant": "^2.2.4", - "pretty-format": "^24", - "zod": "^3.22.4", - "zod-validation-error": "^2.1.0" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/@babel/generator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz", - "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.2.0", - "jsesc": "^2.5.1", - "lodash": "^4.17.10", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/@types/istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*", - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/@types/yargs": { - "version": "13.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz", - "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==", - "license": "MIT", - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "license": "MIT" - }, - "node_modules/babel-plugin-react-compiler/node_modules/pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", - "license": "MIT", - "dependencies": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/babel-plugin-react-compiler/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-0.0.0.tgz", + "integrity": "sha512-Kigl0V36a/6hLVH7+CCe1CCtU3mFBqBd829V//VtuG7I/pyq+B2QZJqOefd63snQmdfCryNhO9XW1FbGPBvYDA==", "license": "MIT" }, - "node_modules/babel-plugin-react-compiler/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/babel-plugin-react-native-web": { "version": "0.19.12", "resolved": "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.12.tgz", @@ -8328,9 +8186,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001660", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", - "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", + "version": "1.0.30001662", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz", + "integrity": "sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==", "funding": [ { "type": "opencollective", @@ -9599,9 +9457,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.23", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz", - "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==", + "version": "1.5.25", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz", + "integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==", "license": "ISC" }, "node_modules/elliptic": { @@ -10048,17 +9906,17 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -11602,9 +11460,9 @@ } }, "node_modules/hast-util-to-html": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.2.tgz", - "integrity": "sha512-RP5wNpj5nm1Z8cloDv4Sl4RS8jH5HYa0v93YB6Wb4poEzgMo/dAAL0KcT4974dCjcNG5pkLqTImeFHHCwwfY3g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz", + "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==", "dev": true, "license": "MIT", "dependencies": { @@ -16776,9 +16634,9 @@ } }, "node_modules/react-native-quick-crypto": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/react-native-quick-crypto/-/react-native-quick-crypto-0.7.4.tgz", - "integrity": "sha512-Rg+XKmTIoH9V15PhwiCEatc+1XfO3i5+eIJ8NWRPMvGsrsWrmqakHk+Ik36HxdudFd7Rhm50As2HPA+n8bmXXg==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/react-native-quick-crypto/-/react-native-quick-crypto-0.7.5.tgz", + "integrity": "sha512-jFjvoUlgKhDXjwh4UMheW/MHO5TWL0UeRBuzPcLK5UlX5wZaLIChg5gdIw69h00BQHJojEprTboWCwulVGlNZg==", "license": "MIT", "dependencies": { "@craftzdog/react-native-buffer": "^6.0.5", @@ -17599,16 +17457,16 @@ } }, "node_modules/shiki": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.17.6.tgz", - "integrity": "sha512-RejGugKpDM75vh6YtF9R771acxHRDikC/01kxsUGW+Pnaz3pTY+c8aZB5CnD7p0vuFPs1HaoAIU/4E+NCfS+mQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.18.0.tgz", + "integrity": "sha512-8jo7tOXr96h9PBQmOHVrltnETn1honZZY76YA79MHheGQg55jBvbm9dtU+MI5pjC5NJCFuA6rvVTLVeSW5cE4A==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/core": "1.17.6", - "@shikijs/engine-javascript": "1.17.6", - "@shikijs/engine-oniguruma": "1.17.6", - "@shikijs/types": "1.17.6", + "@shikijs/core": "1.18.0", + "@shikijs/engine-javascript": "1.18.0", + "@shikijs/engine-oniguruma": "1.18.0", + "@shikijs/types": "1.18.0", "@shikijs/vscode-textmate": "^9.2.2", "@types/hast": "^3.0.4" } @@ -17929,9 +17787,9 @@ "optional": true }, "node_modules/ssh2": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.15.0.tgz", - "integrity": "sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -17942,8 +17800,8 @@ "node": ">=10.16.0" }, "optionalDependencies": { - "cpu-features": "~0.0.9", - "nan": "^2.18.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "node_modules/ssri": { @@ -18548,9 +18406,9 @@ } }, "node_modules/terser": { - "version": "5.32.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz", - "integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==", + "version": "5.33.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", + "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", "license": "BSD-2-Clause", "peer": true, "dependencies": { @@ -18838,15 +18696,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ts-api-utils": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", @@ -20106,27 +19955,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zod": { - "version": "3.23.8", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", - "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, - "node_modules/zod-validation-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-2.1.0.tgz", - "integrity": "sha512-VJh93e2wb4c3tWtGgTa0OF/dTt/zoPCPzXq4V11ZjxmEAFaPi/Zss1xIZdEB5RD8GD00U0/iVXgqkF77RV7pdQ==", - "license": "MIT", - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "zod": "^3.18.0" - } - }, "node_modules/zwitch": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", @@ -20203,31 +20031,6 @@ "@matter.js/react-native": "*" } }, - "packages/matter-node-shell.js": { - "name": "@project-chip/matter-node-shell.js", - "version": "0.0.0-git", - "extraneous": true, - "license": "Apache-2.0", - "dependencies": { - "@matter.js/general": "*", - "@matter.js/nodejs": "*", - "@matter.js/nodejs-ble": "*", - "@matter.js/tools": "*", - "@project-chip/matter.js": "*", - "child_process": "^1.0.2", - "readline": "^1.3.0", - "yargs": "^17.7.2" - }, - "bin": { - "matter-shell": "dist/cjs/app.js" - }, - "devDependencies": { - "typescript": "~5.5.3" - }, - "engines": { - "node": ">=18.0.0" - } - }, "packages/matter.js": { "name": "@project-chip/matter.js", "version": "0.0.0-git", @@ -20252,31 +20055,6 @@ "typescript": "~5.5.3" } }, - "packages/matter.js-react-native": { - "name": "@matter.js/react-native", - "version": "0.0.0-git", - "extraneous": true, - "license": "Apache-2.0", - "dependencies": { - "@matter.js/general": "*", - "@matter.js/nodejs": "*", - "@matter.js/protocol": "*", - "@react-native-async-storage/async-storage": "^2.0.0", - "@react-native-community/netinfo": "^11.3.2", - "@types/jwk-to-pem": "^2.0.3", - "@types/node": "^22.5.2", - "jwk-to-pem": "^2.0.5", - "react-native-ble-plx": "^3.2.1", - "react-native-polyfill-globals": "^3.1.0", - "react-native-quick-crypto": "^0.7.4", - "react-native-udp": "^4.1.7" - }, - "devDependencies": { - "@matter.js/tools": "*", - "ts-node": "^10.9.2", - "typescript": "~5.5.3" - } - }, "packages/model": { "name": "@matter.js/model", "version": "0.0.0-git", diff --git a/packages/examples/package.json b/packages/examples/package.json index 3691f49e0..5bc32826f 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", @@ -46,20 +46,20 @@ "matter-device-bundled": "node --enable-source-maps build/bundle/DeviceNode.cjs" }, "bin": { - "matter-light": "./dist/esm/examples/LightDevice.ts", - "matter-excelsior1000": "./dist/esm/examples/IlluminatedRollerShade.ts", - "matter-sensor": "./dist/esm/examples/SensorDeviceNode.js", - "matter-device": "./dist/esm/examples/DeviceNode.js", - "matter-bridge": "./dist/esm/examples/BridgedDevicesNode.js", - "matter-composeddevice": "./dist/esm/examples/ComposedDeviceNode.js", - "matter-multidevice": "./dist/esm/examples/MultiDeviceNode.js", - "matter-controller": "./dist/esm/examples/ControllerNode.js", - "matter-device-legacy": "./dist/esm/examples/DeviceNodeLegacy.js", - "matter-bridge-legacy": "./dist/esm/examples/BridgedDevicesNodeLegacy.js", - "matter-composeddevice-legacy": "./dist/esm/examples/ComposedDeviceNodeLegacy.js", - "matter-multidevice-legacy": "./dist/esm/examples/MultiDeviceNodeLegacy.js", - "matter-controller-legacy": "./dist/esm/examples/ControllerNodeLegacy.js", - "matter-legacystorageconverter": "./dist/esm/examples/LegacyStorageConverter.js" + "matter-light": "dist/esm/examples/LightDevice.ts", + "matter-excelsior1000": "dist/esm/examples/IlluminatedRollerShade.ts", + "matter-sensor": "dist/esm/examples/SensorDeviceNode.js", + "matter-device": "dist/esm/examples/DeviceNode.js", + "matter-bridge": "dist/esm/examples/BridgedDevicesNode.js", + "matter-composeddevice": "dist/esm/examples/ComposedDeviceNode.js", + "matter-multidevice": "dist/esm/examples/MultiDeviceNode.js", + "matter-controller": "dist/esm/examples/ControllerNode.js", + "matter-device-legacy": "dist/esm/examples/DeviceNodeLegacy.js", + "matter-bridge-legacy": "dist/esm/examples/BridgedDevicesNodeLegacy.js", + "matter-composeddevice-legacy": "dist/esm/examples/ComposedDeviceNodeLegacy.js", + "matter-multidevice-legacy": "dist/esm/examples/MultiDeviceNodeLegacy.js", + "matter-controller-legacy": "dist/esm/examples/ControllerNodeLegacy.js", + "matter-legacystorageconverter": "dist/esm/examples/LegacyStorageConverter.js" }, "devDependencies": { "typescript": "~5.5.3", diff --git a/packages/general/package.json b/packages/general/package.json index 5a0c4f844..6debc5e78 100644 --- a/packages/general/package.json +++ b/packages/general/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/main/package.json b/packages/main/package.json index 2881026df..d61984cb3 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -19,7 +19,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/matter.js/package.json b/packages/matter.js/package.json index 64d8d3a97..3e7ca6e2d 100644 --- a/packages/matter.js/package.json +++ b/packages/matter.js/package.json @@ -21,7 +21,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/model/package.json b/packages/model/package.json index 96ad2d9a0..0a2d88ba4 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/node/package.json b/packages/node/package.json index ebc8c2317..6569dea64 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", @@ -72,7 +72,6 @@ "default": "./dist/cjs/index.js" } }, - "./behaviors": { "import": { "types": "./dist/esm/behaviors/index.d.ts", @@ -83,7 +82,6 @@ "default": "./dist/cjs/behaviors/index.js" } }, - "./behaviors/*": { "import": { "types": "./dist/esm/behaviors/*/index.d.ts", @@ -94,7 +92,6 @@ "default": "./dist/cjs/behaviors/*/index.js" } }, - "./devices": { "import": { "types": "./dist/esm/devices/index.d.ts", @@ -105,7 +102,6 @@ "default": "./dist/cjs/devices/index.js" } }, - "./devices/*": { "import": { "types": "./dist/esm/devices/*.d.ts", @@ -116,7 +112,6 @@ "default": "./dist/cjs/devices/*.js" } }, - "./endpoints": { "import": { "types": "./dist/esm/endpoints/index.d.ts", @@ -127,7 +122,6 @@ "default": "./dist/cjs/endpoints/index.js" } }, - "./endpoints/*": { "import": { "types": "./dist/esm/endpoints/*.d.ts", diff --git a/packages/nodejs-ble/package.json b/packages/nodejs-ble/package.json index 147da598e..f8d121138 100644 --- a/packages/nodejs-ble/package.json +++ b/packages/nodejs-ble/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/nodejs-shell/package.json b/packages/nodejs-shell/package.json index 5dfcaf215..05566a781 100644 --- a/packages/nodejs-shell/package.json +++ b/packages/nodejs-shell/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", @@ -29,7 +29,7 @@ "shell": "matter-run src/app.ts" }, "bin": { - "matter-shell": "./dist/cjs/app.js" + "matter-shell": "dist/cjs/app.js" }, "devDependencies": { "typescript": "~5.5.3" diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json index ee79638d2..6242ee995 100644 --- a/packages/nodejs/package.json +++ b/packages/nodejs/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "engines": { "node": ">=18.0.0" diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 01466ed81..a02c228ca 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/react-native/package.json b/packages/react-native/package.json index d51c1b769..2d2ddf785 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", diff --git a/packages/tools/package.json b/packages/tools/package.json index 76a91b976..3e4536a0c 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -11,10 +11,10 @@ "version": "node bin/version.js" }, "bin": { - "matter-build": "./bin/build.js", - "matter-test": "./bin/test.js", - "matter-run": "./bin/run.js", - "matter-version": "./bin/version.js" + "matter-build": "bin/build.js", + "matter-test": "bin/test.js", + "matter-run": "bin/run.js", + "matter-version": "bin/version.js" }, "exports": { ".": { diff --git a/packages/tools/src/util/package.ts b/packages/tools/src/util/package.ts index 3ae0ce6be..7a32850e6 100644 --- a/packages/tools/src/util/package.ts +++ b/packages/tools/src/util/package.ts @@ -7,7 +7,7 @@ import { readFileSync, statSync } from "fs"; import { readdir, stat, writeFile } from "fs/promises"; import { glob } from "glob"; -import { dirname, relative, resolve } from "path"; +import { dirname, join, relative, resolve } from "path"; import { ignoreError, ignoreErrorSync } from "./errors.js"; import { Progress } from "./progress.js"; import { toolsPath } from "./tools-path.cjs"; @@ -235,7 +235,7 @@ export class Package { } async save() { - await this.writeFile("package.json", JSON.stringify(this.json, undefined, 4)); + await this.writeFile(join(this.path, "package.json"), JSON.stringify(this.json, undefined, 4)); } #maybeStat(path: string) { diff --git a/packages/types/package.json b/packages/types/package.json index 36f95c299..ed197b6a1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/project-chip/matter.js", "repository": { "type": "git", - "url": "https://github.com/project-chip/matter.js.git" + "url": "git+https://github.com/project-chip/matter.js.git" }, "scripts": { "clean": "matter-build clean", @@ -61,7 +61,6 @@ "default": "./dist/cjs/index.js" } }, - "./clusters/*": { "import": { "types": "./dist/esm/clusters/*.d.ts", @@ -72,7 +71,6 @@ "default": "./dist/cjs/clusters/*.js" } }, - "./*": { "import": { "types": "./dist/esm/*/index.d.ts",