diff --git a/.husky/pre-commit b/.husky/pre-commit index 025dfbc24bc..9cbb8b4dd63 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -6,6 +6,4 @@ if [ "$branch" = "main" ]; then exit 1 fi -. "$(dirname "$0")/_/husky.sh" - npx lint-staged diff --git a/package.json b/package.json index 6b3f5fd7290..b678f934888 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,7 @@ { "private": true, + "packageManager": "yarn@1.22.22", + "name": "@aws-amplify/ui-monorepo", "scripts": { "build": "turbo run build --filter=./packages/* --filter=!./packages/angular --filter=./packages/angular/projects/ui-angular", "clean": "turbo run clean && rimraf node_modules", @@ -30,7 +32,7 @@ "vue-example": "yarn workspace @aws-amplify/ui-vue-example", "e2e": "yarn workspace @aws-amplify/ui-e2e", "environments": "yarn workspace @aws-amplify/ui-environments", - "prepare": "husky install", + "prepare": "husky", "version:next": "yarn changeset version --snapshot next-$(git rev-parse --short=7 HEAD) && yarn generateVersions && yarn angular build", "publish:next": "yarn changeset publish --tag next", "version:liveness": "yarn changeset version --snapshot liveness-$(git rev-parse --short=7 HEAD) && yarn generateVersions && yarn angular build", @@ -77,6 +79,7 @@ "@types/react-dom": "^18.2.7", "browserslist": "^4.16.15", "docs/next-plugin-preval/webpack": "^5.76.0", + "fast-xml-parser": "^4.4.1", "follow-redirects": "^1.15.6", "json5": "^2.2.1", "loader-utils": "2.0.4", @@ -115,7 +118,7 @@ "esbuild-register": "^3.5.0", "eslint": "^8.44.0", "fs-extra": "^11.1.1", - "husky": ">=6", + "husky": "^9.1.4", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "lint-staged": ">=10", @@ -127,7 +130,7 @@ "rollup-plugin-styles": "^4.0.0", "ts-jest": "^29.1.1", "ts-morph": "^17.0.0", - "turbo": "^1.2.8", + "turbo": "^2.0.11", "typescript": "^5.2.2", "vite": "^5.2.8", "vue-tsc": "^2.0.7" diff --git a/turbo.json b/turbo.json index 484c869a900..0534e3998fa 100644 --- a/turbo.json +++ b/turbo.json @@ -1,7 +1,6 @@ { "$schema": "https://turborepo.org/schema.json", - "baseBranch": "origin/main", - "pipeline": { + "tasks": { "build": { "outputs": [".next/**", "dist/**"], "dependsOn": ["^build"] diff --git a/yarn.lock b/yarn.lock index 98c34031874..2081ed864fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14284,34 +14284,13 @@ fast-url-parser@1.1.3: dependencies: punycode "^1.3.2" -fast-xml-parser@4.2.5: - version "4.2.5" - resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz#a6747a09296a6cb34f2ae634019bf1738f3b421f" - integrity sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g== - dependencies: - strnum "^1.0.5" - -fast-xml-parser@4.4.1: +fast-xml-parser@4.2.5, fast-xml-parser@4.4.1, fast-xml-parser@^4.0.12, fast-xml-parser@^4.2.5, fast-xml-parser@^4.4.1: version "4.4.1" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" + resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw== dependencies: strnum "^1.0.5" -fast-xml-parser@^4.0.12: - version "4.3.2" - resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz#761e641260706d6e13251c4ef8e3f5694d4b0d79" - integrity sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg== - dependencies: - strnum "^1.0.5" - -fast-xml-parser@^4.2.5: - version "4.3.0" - resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.0.tgz#fdaec352125c9f2157e472cd9894e84f91fd6da4" - integrity sha512-5Wln/SBrtlN37aboiNNFHfSALwLzpUx1vJhDgDVPKKG3JrNe8BWTUoNKqkeKk/HqNbKxC8nEAJaBydq30yHoLA== - dependencies: - strnum "^1.0.5" - fastparse@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" @@ -15406,10 +15385,10 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@>=6: - version "8.0.3" - resolved "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" - integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== +husky@^9.1.4: + version "9.1.4" + resolved "https://registry.npmjs.org/husky/-/husky-9.1.4.tgz#926fd19c18d345add5eab0a42b2b6d9a80259b34" + integrity sha512-bho94YyReb4JV7LYWRWxZ/xr6TtOTt8cMfmQ39MQYJ7f/YE268s3GdghGwi+y4zAeqewE5zYLvuhV0M0ijsDEA== iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" @@ -23931,47 +23910,47 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -turbo-darwin-64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.9.1.tgz#1f04e716ad6cf071822f0c1a499f4fcd7bd40f4b" - integrity sha512-IX/Ph4CO80lFKd9pPx3BWpN2dynt6mcUFifyuHUNVkOP1Usza/G9YuZnKQFG6wUwKJbx40morFLjk1TTeLe04w== +turbo-darwin-64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.0.11.tgz#9734155718c2980e49d0f69de874c792691dcdc2" + integrity sha512-YlHEEhcm+jI1BSZoLugGHUWDfRXaNaQIv7tGQBfadYjo9kixBnqoTOU6s1ubOrQMID+lizZZQs79GXwqM6vohg== -turbo-darwin-arm64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.1.tgz#19ec161858fb26dfbd529e0ec9d6c9b4484e91b0" - integrity sha512-6tCbmIboy9dTbhIZ/x9KIpje73nvxbiyVnHbr9xKnsxLJavD0xqjHZzbL5U2tHp8chqmYf0E4WYOXd+XCNg+OQ== +turbo-darwin-arm64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.0.11.tgz#31277b9cd1d927da881016e1893374099e3f582c" + integrity sha512-K/YW+hWzRQ/wGmtffxllH4M1tgy8OlwgXODrIiAGzkSpZl9+pIsem/F86UULlhsIeavBYK/LS5+dzV3DPMjJ9w== -turbo-linux-64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.9.1.tgz#5b47e0f0912f709a9a2e325feaa7e260aa76cf49" - integrity sha512-ti8XofnJFO1XaadL92lYJXgxb0VBl03Yu9VfhxkOTywFe7USTLBkJcdvQ4EpFk/KZwLiTdCmT2NQVxsG4AxBiQ== +turbo-linux-64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.0.11.tgz#c0639719d5d8e1ccf99cdecc0a8a4abe1836b74b" + integrity sha512-mv8CwGP06UPweMh1Vlp6PI6OWnkuibxfIJ4Vlof7xqjohAaZU5FLqeOeHkjQflH/6YrCVuS9wrK0TFOu+meTtA== -turbo-linux-arm64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.9.1.tgz#db035061760e8512a408a64cc2d7d568f5102ab7" - integrity sha512-XYvIbeiCCCr+ENujd2Jtck/lJPTKWb8T2MSL/AEBx21Zy3Sa7HgrQX6LX0a0pNHjaleHz00XXt1D0W5hLeP+tA== +turbo-linux-arm64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.0.11.tgz#2fdd73e006f5220ef30c060ea7ecaa3a47589b25" + integrity sha512-wLE5tl4oriTmHbuayc0ki0csaCplmVLj+uCWtecM/mfBuZgNS9ICNM9c4sB+Cfl5tlBBFeepqRNgvRvn8WeVZg== -turbo-windows-64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.9.1.tgz#56ad98e4701b4523f118397d98d64ebef5dab88f" - integrity sha512-x7lWAspe4/v3XQ0gaFRWDX/X9uyWdhwFBPEfb8BA0YKtnsrPOHkV0mRHCRrXzvzjA7pcDCl2agGzb7o863O+Jg== +turbo-windows-64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.0.11.tgz#5362884c625e1c02736552ec970a86830cb70bfe" + integrity sha512-tja3zvVCSWu3HizOoeQv0qDJ+GeWGWRFOOM6a8i3BYnXLgGKAaDZFcjwzgC50tWiAw4aowIVR4OouwIyRhLBaQ== -turbo-windows-arm64@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.9.1.tgz#f0c780cc906dedff85eef20f063f59a9b2a865fc" - integrity sha512-QSLNz8dRBLDqXOUv/KnoesBomSbIz2Huef/a3l2+Pat5wkQVgMfzFxDOnkK5VWujPYXz+/prYz+/7cdaC78/kw== +turbo-windows-arm64@2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.0.11.tgz#4e871f273754018df0ec170908ef29a5ac04af9a" + integrity sha512-sYjXP6k94Bqh99R+y3M1Ks6LRIEZybMz+7enA8GKl6JJ2ZFaXxTnS6q+/2+ii1+rRwxohj5OBb4gxODcF8Jd4w== -turbo@^1.2.8: - version "1.9.1" - resolved "https://registry.npmjs.org/turbo/-/turbo-1.9.1.tgz#7ff6252cb7271142f82cff36cada918eaae67025" - integrity sha512-Rqe8SP96e53y4Pk29kk2aZbA8EF11UtHJ3vzXJseadrc1T3V6UhzvAWwiKJL//x/jojyOoX1axnoxmX3UHbZ0g== +turbo@^2.0.11: + version "2.0.11" + resolved "https://registry.npmjs.org/turbo/-/turbo-2.0.11.tgz#de8bb6558b00199867db992066fbb0c5dec582d4" + integrity sha512-imDlFFAvitbCm1JtDFJ6eG882qwxHUmVT2noPb3p2jq5o5DuXOchMbkVS9kUeC3/4WpY5N0GBZ3RvqNyjHZw1Q== optionalDependencies: - turbo-darwin-64 "1.9.1" - turbo-darwin-arm64 "1.9.1" - turbo-linux-64 "1.9.1" - turbo-linux-arm64 "1.9.1" - turbo-windows-64 "1.9.1" - turbo-windows-arm64 "1.9.1" + turbo-darwin-64 "2.0.11" + turbo-darwin-arm64 "2.0.11" + turbo-linux-64 "2.0.11" + turbo-linux-arm64 "2.0.11" + turbo-windows-64 "2.0.11" + turbo-windows-arm64 "2.0.11" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5"