From 7dd754c6ec2e8a836575fb1377cb5310ced2f37f Mon Sep 17 00:00:00 2001 From: Will Binns-Smith Date: Mon, 12 Dec 2022 20:42:57 -0800 Subject: [PATCH] Use native fetch in node over node-fetch (#2985) --- .github/workflows/update-google-fonts.yml | 2 +- package.json | 1 - pnpm-lock.yaml | 41 ----------------------- scripts/fetch-google-font-data.js | 2 -- 4 files changed, 1 insertion(+), 45 deletions(-) diff --git a/.github/workflows/update-google-fonts.yml b/.github/workflows/update-google-fonts.yml index 5aa34dd70b57a..a021331456bb8 100644 --- a/.github/workflows/update-google-fonts.yml +++ b/.github/workflows/update-google-fonts.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-node - - run: node ./scripts/fetch-google-font-data.js > crates/next-core/src/next_font_google/__generated__/font-data.json + - run: node --experimental-fetch ./scripts/fetch-google-font-data.js > crates/next-core/src/next_font_google/__generated__/font-data.json - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: Update Google font-data.json (${{ github.sha }}) diff --git a/package.json b/package.json index e0fad04844de8..b6980f0e4471d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "husky": "^8.0.2", "lint-staged": "^13.1.0", "next": "^13.0.6", - "node-fetch": "^3.3.0", "prettier": "^2.8.1", "semver": "^7.3.8", "simple-git-hooks": "^2.8.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 928d4ea35f11a..815459237a584 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,7 +15,6 @@ importers: husky: ^8.0.2 lint-staged: ^13.1.0 next: ^13.0.6 - node-fetch: ^3.3.0 prettier: ^2.8.1 semver: ^7.3.8 simple-git-hooks: ^2.8.1 @@ -29,7 +28,6 @@ importers: husky: 8.0.2 lint-staged: 13.1.0 next: 13.0.6_biqbaboplfbrettd7655fr4n2y - node-fetch: 3.3.0 prettier: 2.8.1 semver: 7.3.8 simple-git-hooks: 2.8.1 @@ -3892,11 +3890,6 @@ packages: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true - /data-uri-to-buffer/4.0.0: - resolution: {integrity: sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==} - engines: {node: '>= 12'} - dev: true - /data-urls/2.0.0: resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==} engines: {node: '>=10'} @@ -5793,14 +5786,6 @@ packages: bser: 2.1.1 dev: true - /fetch-blob/3.2.0: - resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} - engines: {node: ^12.20 || >= 14.13} - dependencies: - node-domexception: 1.0.0 - web-streams-polyfill: 3.2.1 - dev: true - /fflate/0.7.4: resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==} dev: false @@ -5905,13 +5890,6 @@ packages: mime-types: 2.1.35 dev: false - /formdata-polyfill/4.0.10: - resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} - engines: {node: '>=12.20.0'} - dependencies: - fetch-blob: 3.2.0 - dev: true - /fraction.js/4.2.0: resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==} dev: true @@ -8935,11 +8913,6 @@ packages: resolution: {integrity: sha512-h25UdUN/g8U7y29TzQtRm/GvGr70lK37yQPvPKXXuVfs7gCm82WipYFZcksQfeKumtOemAzBIcT7lzzyK/edLw==} dev: true - /node-domexception/1.0.0: - resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} - engines: {node: '>=10.5.0'} - dev: true - /node-fetch/2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -8952,15 +8925,6 @@ packages: whatwg-url: 5.0.0 dev: false - /node-fetch/3.3.0: - resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - data-uri-to-buffer: 4.0.0 - fetch-blob: 3.2.0 - formdata-polyfill: 4.0.10 - dev: true - /node-int64/0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} dev: true @@ -11693,11 +11657,6 @@ packages: defaults: 1.0.3 dev: false - /web-streams-polyfill/3.2.1: - resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==} - engines: {node: '>= 8'} - dev: true - /webidl-conversions/3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: false diff --git a/scripts/fetch-google-font-data.js b/scripts/fetch-google-font-data.js index 5d9fce6814e95..bf78be3441754 100644 --- a/scripts/fetch-google-font-data.js +++ b/scripts/fetch-google-font-data.js @@ -2,8 +2,6 @@ // Only includes generating the font-data.json, as TypeScript typings are maintained in the `next` npm package in the Next.js repo. // This script writes the single file to stdout instead of directly to disk. -const fetch = require("node-fetch"); - (async () => { const { familyMetadataList } = await fetch( "https://fonts.google.com/metadata/fonts"