diff --git a/authui/README.md b/authui/README.md index de5789088c..2e03e36e78 100644 --- a/authui/README.md +++ b/authui/README.md @@ -9,3 +9,11 @@ make generate-material-icons ``` After that, commit the changes in `scripts/python/material-icons.txt`, `authui/src/authflowv2/icons/material-symbols-outlined-subset.ttf` and `authui/src/authflowv2/icons/material-symbols-outlined-subset.woff2`. + +### @metamask/jazzicon + +In oursky/authgear-server, the connection to the URL `https://codeload.github.com/MetaMask/jazzicon/tar.gz/4fe23bbbe5088e128cb24082972e28d87e76d156` fails very often. +Therefore, we download the tarball, and use it directly. +We also updated to the latest commit. +See https://github.com/MetaMask/jazzicon/compare/d923914fda6a8795f74c2e66134f73cd72070667..4fe23bbbe5088e128cb24082972e28d87e76d156 for the changes. +The changes DO NOT cover runtime behavior changes, so it is safe to upgrade. diff --git a/authui/package-lock.json b/authui/package-lock.json index 5dc6e0c8cb..6167e25331 100644 --- a/authui/package-lock.json +++ b/authui/package-lock.json @@ -13,7 +13,7 @@ "@hotwired/stimulus": "3.2.2", "@hotwired/turbo": "7.3.0", "@metamask/detect-provider": "2.0.0", - "@metamask/jazzicon": "github:MetaMask/jazzicon#d923914fda6a8795f74c2e66134f73cd72070667", + "@metamask/jazzicon": "file:tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz", "@sentry/browser": "7.80.0", "@sentry/tracing": "7.80.0", "@tabler/icons": "1.107.0", @@ -2238,12 +2238,15 @@ } }, "node_modules/@metamask/jazzicon": { - "version": "2.1.0", - "resolved": "git+ssh://git@github.com/MetaMask/jazzicon.git#d923914fda6a8795f74c2e66134f73cd72070667", - "integrity": "sha512-XPeeSbhfL8TW2wjsJ0ayDh/KrWqd4IU6iPWZcMvY4SSYLJnP1rEXB4GMYoBLO35s9BrGwZH1eh0FmTs9QNA0gg==", + "version": "2.0.0", + "resolved": "file:tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz", + "integrity": "sha512-MRAS16noz1VASRr3rwPTVXZzlnQhijR01Ty2PQtzkCr32p0vo6x4doEW/IjnjThK/l3tGuBycZS9PHqkMxVTeQ==", "license": "ISC", "dependencies": { "mersenne-twister": "^1.1.0" + }, + "engines": { + "node": "^18.16 || >=20" } }, "node_modules/@microsoft/tsdoc": { @@ -16105,9 +16108,8 @@ "integrity": "sha512-sFpN+TX13E9fdBDh9lvQeZdJn4qYoRb/6QF2oZZK/Pn559IhCFacPMU1rMuqyXoFQF3JSJfii2l98B87QDPeCQ==" }, "@metamask/jazzicon": { - "version": "git+ssh://git@github.com/MetaMask/jazzicon.git#d923914fda6a8795f74c2e66134f73cd72070667", - "integrity": "sha512-XPeeSbhfL8TW2wjsJ0ayDh/KrWqd4IU6iPWZcMvY4SSYLJnP1rEXB4GMYoBLO35s9BrGwZH1eh0FmTs9QNA0gg==", - "from": "@metamask/jazzicon@github:MetaMask/jazzicon#d923914fda6a8795f74c2e66134f73cd72070667", + "version": "file:tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz", + "integrity": "sha512-MRAS16noz1VASRr3rwPTVXZzlnQhijR01Ty2PQtzkCr32p0vo6x4doEW/IjnjThK/l3tGuBycZS9PHqkMxVTeQ==", "requires": { "mersenne-twister": "^1.1.0" } diff --git a/authui/package.json b/authui/package.json index 6b89427f8a..2415d8712e 100644 --- a/authui/package.json +++ b/authui/package.json @@ -59,7 +59,7 @@ "@hotwired/stimulus": "3.2.2", "@hotwired/turbo": "7.3.0", "@metamask/detect-provider": "2.0.0", - "@metamask/jazzicon": "github:MetaMask/jazzicon#d923914fda6a8795f74c2e66134f73cd72070667", + "@metamask/jazzicon": "file:tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz", "@sentry/browser": "7.80.0", "@sentry/tracing": "7.80.0", "@tabler/icons": "1.107.0", diff --git a/authui/tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz b/authui/tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz new file mode 100644 index 0000000000..0b44d79658 Binary files /dev/null and b/authui/tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz differ diff --git a/cmd/authgear/Dockerfile b/cmd/authgear/Dockerfile index 250711edfa..5277cca7d4 100644 --- a/cmd/authgear/Dockerfile +++ b/cmd/authgear/Dockerfile @@ -27,6 +27,8 @@ WORKDIR /usr/src/app COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/ RUN cd ./scripts/npm && npm ci COPY ./authui/package.json ./authui/package-lock.json ./authui/ +# See /authui/README.md for the reason why we need to copy tarballs. +COPY ./authui/tarballs/. ./authui/tarballs/. RUN cd ./authui && npm ci COPY . . RUN make authui GIT_HASH=$GIT_HASH diff --git a/cmd/portal/Dockerfile b/cmd/portal/Dockerfile index f14b64572f..87d2280c82 100644 --- a/cmd/portal/Dockerfile +++ b/cmd/portal/Dockerfile @@ -27,6 +27,8 @@ WORKDIR /usr/src/app COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/ RUN cd ./scripts/npm && npm ci COPY ./authui/package.json ./authui/package-lock.json ./authui/ +# See /authui/README.md for the reason why we need to copy tarballs. +COPY ./authui/tarballs/. ./authui/tarballs/. RUN cd ./authui && npm ci COPY . . RUN make authui GIT_HASH=$GIT_HASH diff --git a/custombuild/cmd/authgearx/Dockerfile b/custombuild/cmd/authgearx/Dockerfile index d889a16bb5..9adc1084b0 100644 --- a/custombuild/cmd/authgearx/Dockerfile +++ b/custombuild/cmd/authgearx/Dockerfile @@ -45,6 +45,8 @@ WORKDIR /usr/src/app COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/ RUN cd ./scripts/npm && npm ci COPY ./authui/package.json ./authui/package-lock.json ./authui/ +# See /authui/README.md for the reason why we need to copy tarballs. +COPY ./authui/tarballs/. ./authui/tarballs/. RUN cd ./authui && npm ci COPY . . RUN make authui GIT_HASH=$GIT_HASH diff --git a/custombuild/cmd/portalx/Dockerfile b/custombuild/cmd/portalx/Dockerfile index cf67743599..47cdbae582 100644 --- a/custombuild/cmd/portalx/Dockerfile +++ b/custombuild/cmd/portalx/Dockerfile @@ -45,6 +45,8 @@ WORKDIR /usr/src/app COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/ RUN cd ./scripts/npm && npm ci COPY ./authui/package.json ./authui/package-lock.json ./authui/ +# See /authui/README.md for the reason why we need to copy tarballs. +COPY ./authui/tarballs/. ./authui/tarballs/. RUN cd ./authui && npm ci COPY . . RUN make authui GIT_HASH=$GIT_HASH