diff --git a/jest.config.packages.js b/jest.config.packages.js index 07d24924..a7c6bc1e 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.js @@ -90,7 +90,6 @@ module.exports = { // so in that case use their published versions '/../../node_modules/@metamask/$1', ], - '^uuid$': require.resolve('uuid'), }, // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader diff --git a/jest.config.scripts.js b/jest.config.scripts.js index 5ee8419d..517b1dde 100644 --- a/jest.config.scripts.js +++ b/jest.config.scripts.js @@ -33,10 +33,6 @@ module.exports = { }, }, - moduleNameMapper: { - '^uuid$': require.resolve('uuid'), - }, - preset: 'ts-jest', // The path to the Prettier executable used to format snapshots diff --git a/merged-packages/bitcoin-wallet-snap/README.md b/merged-packages/bitcoin-wallet-snap/README.md index 8849a024..dc926e71 100644 --- a/merged-packages/bitcoin-wallet-snap/README.md +++ b/merged-packages/bitcoin-wallet-snap/README.md @@ -27,9 +27,3 @@ yarn start ```bash yarn build:snap ``` - -Further reading: - -- [Development](../../docs/development.md) -- [Contributing](../../docs/contributing.md) -- [Releasing](../../docs/release.md) diff --git a/merged-packages/bitcoin-wallet-snap/crowdin.yml b/merged-packages/bitcoin-wallet-snap/crowdin.yml new file mode 100644 index 00000000..e74ec165 --- /dev/null +++ b/merged-packages/bitcoin-wallet-snap/crowdin.yml @@ -0,0 +1,17 @@ +'project_id_env': CROWDIN_PROJECT_ID +'api_token_env': CROWDIN_PERSONAL_TOKEN +'base_path': '.' + +'preserve_hierarchy': true + +'files': + [ + { + 'source': 'locales/en.json', + 'translation': 'locales/%locale_with_underscore%.json', + }, + { + 'source': 'locales/en.json', + 'translation': 'locales/%two_letters_code%.json', + }, + ] diff --git a/merged-packages/bitcoin-wallet-snap/package.json b/merged-packages/bitcoin-wallet-snap/package.json index 377c3b1b..ce34a7e1 100644 --- a/merged-packages/bitcoin-wallet-snap/package.json +++ b/merged-packages/bitcoin-wallet-snap/package.json @@ -4,7 +4,11 @@ "description": "A Bitcoin wallet Snap.", "repository": { "type": "git", - "url": "https://github.com/MetaMask/snap-bitcoin-wallet.git" + "url": "https://github.com/MetaMask/internal-snaps.git" + }, + "homepage": "https://github.com/MetaMask/internal-snaps/tree/main/packages/bitcoin-wallet-snap#readme", + "bugs": { + "url": "https://github.com/MetaMask/internal-snaps/issues" }, "license": "(MIT-0 OR Apache-2.0)", "main": "./dist/bundle.js", @@ -23,6 +27,7 @@ "build:locale:watch": "npx nodemon --watch packages/snap/messages.json --exec \"node ./scripts/populate-en-locale.js && prettier 'locales/**/*.json' -w\"", "changelog:update": "../../scripts/update-changelog.sh @metamask/bitcoin-wallet-snap", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/bitcoin-wallet-snap", + "since-latest-release": "../../scripts/since-latest-release.sh", "clean": "rimraf dist", "lint": "yarn lint:eslint && yarn lint:misc && yarn lint:deps && yarn lint:types", "lint:deps": "depcheck && yarn dedupe --check", @@ -39,8 +44,8 @@ "test:integration": "./integration-test/run-integration.sh" }, "devDependencies": { - "@jest/globals": "^30.0.5", - "@metamask/auto-changelog": "^3.4.4", + "@jest/globals": "^29.5.0", + "@metamask/auto-changelog": "^6.1.0", "@metamask/bitcoindevkit": "^0.1.13", "@metamask/key-tree": "^10.1.1", "@metamask/keyring-api": "^22.0.0", @@ -53,7 +58,7 @@ "bip322-js": "^3.0.0", "concurrently": "^9.2.1", "dotenv": "^17.2.1", - "jest": "^30.0.5", + "jest": "^29.7.0", "jest-mock-extended": "^4.0.0", "jest-transform-stub": "2.0.0", "superstruct": "^2.0.2", diff --git a/package.json b/package.json index f7ed6324..58545934 100644 --- a/package.json +++ b/package.json @@ -81,14 +81,14 @@ "rimraf": "^5.0.5", "semver": "^7.6.3", "simple-git-hooks": "^2.8.0", - "ts-jest": "^29.2.5", + "ts-jest": "^29.4.1", "tsx": "^4.20.5", "typescript": "~5.7.3", "typescript-eslint": "^8.48.0", - "uuid": "^8.3.2", "yargs": "^17.7.2" }, "resolutions": { + "@metamask/snaps-sdk": "^11.0.0", "elliptic@6.5.4": "^6.5.7", "fast-xml-parser@^4.3.4": "^4.4.1", "ws@7.4.6": "^7.5.10" diff --git a/packages/sample-snap/snap.manifest.json b/packages/sample-snap/snap.manifest.json index 96cef9f8..6f147900 100644 --- a/packages/sample-snap/snap.manifest.json +++ b/packages/sample-snap/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/internal-snaps.git" }, "source": { - "shasum": "GALf8du1qrGRyB3VLmG9mkxx9yC0ijCSFCJdQL8AKag=", + "shasum": "7jzuMWjDr1T5dgRV5M6B8ZtNPxPBNmGV2JGWgkvtTdA=", "location": { "npm": { "filePath": "dist/bundle.js", @@ -23,6 +23,6 @@ "snaps": false } }, - "platformVersion": "10.3.0", + "platformVersion": "11.1.1", "manifestVersion": "0.1" } diff --git a/yarn.lock b/yarn.lock index a4fefb80..48c2f13c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2218,11 +2218,10 @@ __metadata: rimraf: "npm:^5.0.5" semver: "npm:^7.6.3" simple-git-hooks: "npm:^2.8.0" - ts-jest: "npm:^29.2.5" + ts-jest: "npm:^29.4.1" tsx: "npm:^4.20.5" typescript: "npm:~5.7.3" typescript-eslint: "npm:^8.48.0" - uuid: "npm:^8.3.2" yargs: "npm:^17.7.2" languageName: unknown linkType: soft @@ -3046,21 +3045,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-sdk@npm:^10.3.0, @metamask/snaps-sdk@npm:^10.4.0": - version: 10.4.0 - resolution: "@metamask/snaps-sdk@npm:10.4.0" - dependencies: - "@metamask/key-tree": "npm:^10.1.1" - "@metamask/providers": "npm:^22.1.1" - "@metamask/rpc-errors": "npm:^7.0.3" - "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.9.0" - luxon: "npm:^3.5.0" - checksum: 10/215a73f41f5043ca9767241da83308bb25b3faae96521ed71a63a9d29078461bcf278a01799e014bb20b49e34d96a05ea1822648c9bcf81e92f22e8c9b6c0f94 - languageName: node - linkType: hard - -"@metamask/snaps-sdk@npm:^11.0.0, @metamask/snaps-sdk@npm:^11.1.0, @metamask/snaps-sdk@npm:^11.1.1": +"@metamask/snaps-sdk@npm:^11.0.0": version: 11.1.1 resolution: "@metamask/snaps-sdk@npm:11.1.1" dependencies: @@ -3074,20 +3059,6 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-sdk@npm:~10.3.0": - version: 10.3.0 - resolution: "@metamask/snaps-sdk@npm:10.3.0" - dependencies: - "@metamask/key-tree": "npm:^10.1.1" - "@metamask/providers": "npm:^22.1.1" - "@metamask/rpc-errors": "npm:^7.0.3" - "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.8.1" - luxon: "npm:^3.5.0" - checksum: 10/24efa7af91557d2365cd2199e0572566675efadbcc51a350938cb57e4b5c0861188c30d26a9ec3a42cb9059b37bba0f44a5486ec3ed32ac2e956cf48213d6485 - languageName: node - linkType: hard - "@metamask/snaps-simulation@npm:^3.8.0": version: 3.8.0 resolution: "@metamask/snaps-simulation@npm:3.8.0" @@ -12098,7 +12069,7 @@ __metadata: languageName: node linkType: hard -"ts-jest@npm:^29.2.5": +"ts-jest@npm:^29.4.1": version: 29.4.11 resolution: "ts-jest@npm:29.4.11" dependencies: