From 3b66c68e921baeff8ee66fa7e11fb046d6a34c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Fri, 29 Oct 2021 17:21:01 +0200 Subject: [PATCH] feat: Support Node 17 (#5814) --- .github/workflows/v2-tests-e2e.yml | 2 +- .github/workflows/v2-tests-windows.yml | 2 +- .github/workflows/v2-tests.yml | 2 +- packages/docusaurus-mdx-loader/package.json | 2 +- .../docusaurus-plugin-content-blog/package.json | 2 +- .../docusaurus-plugin-content-docs/package.json | 2 +- .../docusaurus-plugin-content-pages/package.json | 2 +- .../docusaurus-plugin-ideal-image/package.json | 2 +- packages/docusaurus-plugin-pwa/package.json | 2 +- packages/docusaurus-types/package.json | 2 +- packages/docusaurus/package.json | 2 +- packages/docusaurus/src/webpack/base.ts | 1 + yarn.lock | 14 +++++++------- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/v2-tests-e2e.yml b/.github/workflows/v2-tests-e2e.yml index de9aac821a08..0db28c4c7b12 100644 --- a/.github/workflows/v2-tests-e2e.yml +++ b/.github/workflows/v2-tests-e2e.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['14', '16'] + node: ['14', '16', '17'] steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node }} diff --git a/.github/workflows/v2-tests-windows.yml b/.github/workflows/v2-tests-windows.yml index e1440d6d61d4..d9c046914012 100644 --- a/.github/workflows/v2-tests-windows.yml +++ b/.github/workflows/v2-tests-windows.yml @@ -11,7 +11,7 @@ jobs: runs-on: windows-latest strategy: matrix: - node: ['14', '16'] + node: ['14', '16', '17'] steps: - name: Support longpaths run: git config --system core.longpaths true diff --git a/.github/workflows/v2-tests.yml b/.github/workflows/v2-tests.yml index b48a10343430..b31a93451465 100644 --- a/.github/workflows/v2-tests.yml +++ b/.github/workflows/v2-tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['14', '16'] + node: ['14', '16', '17'] steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node }} diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json index c2f9d3464319..509882278b99 100644 --- a/packages/docusaurus-mdx-loader/package.json +++ b/packages/docusaurus-mdx-loader/package.json @@ -35,7 +35,7 @@ "stringify-object": "^3.3.0", "unist-util-visit": "^2.0.2", "url-loader": "^4.1.1", - "webpack": "^5.60.0" + "webpack": "^5.61.0" }, "devDependencies": { "@docusaurus/types": "2.0.0-beta.8", diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json index 25b653e148e6..0ca589f63e38 100644 --- a/packages/docusaurus-plugin-content-blog/package.json +++ b/packages/docusaurus-plugin-content-blog/package.json @@ -35,7 +35,7 @@ "remark-admonitions": "^1.2.1", "tslib": "^2.3.1", "utility-types": "^3.10.0", - "webpack": "^5.60.0" + "webpack": "^5.61.0" }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json index f1f259431809..ea54fd4b8581 100644 --- a/packages/docusaurus-plugin-content-docs/package.json +++ b/packages/docusaurus-plugin-content-docs/package.json @@ -45,7 +45,7 @@ "shelljs": "^0.8.4", "tslib": "^2.3.1", "utility-types": "^3.10.0", - "webpack": "^5.60.0" + "webpack": "^5.61.0" }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index e7017d9aa686..2c4ae84dd7b2 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -27,7 +27,7 @@ "lodash": "^4.17.20", "remark-admonitions": "^1.2.1", "tslib": "^2.3.1", - "webpack": "^5.60.0" + "webpack": "^5.61.0" }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json index ee9349a04742..26a2b4a4d759 100644 --- a/packages/docusaurus-plugin-ideal-image/package.json +++ b/packages/docusaurus-plugin-ideal-image/package.json @@ -29,7 +29,7 @@ "react-waypoint": "^10.1.0", "sharp": "^0.29.1", "tslib": "^2.3.1", - "webpack": "^5.60.0" + "webpack": "^5.61.0" }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json index 28ebdde40614..802bd323c8da 100644 --- a/packages/docusaurus-plugin-pwa/package.json +++ b/packages/docusaurus-plugin-pwa/package.json @@ -24,7 +24,7 @@ "clsx": "^1.1.1", "core-js": "^2.6.5", "terser-webpack-plugin": "^5.2.4", - "webpack": "^5.60.0", + "webpack": "^5.61.0", "webpack-merge": "^5.7.3", "workbox-build": "^6.1.1", "workbox-precaching": "^6.1.1", diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json index 200ffab71fea..1a13e75f8675 100644 --- a/packages/docusaurus-types/package.json +++ b/packages/docusaurus-types/package.json @@ -20,7 +20,7 @@ "joi": "^17.4.2", "querystring": "0.2.0", "utility-types": "^3.10.0", - "webpack": "^5.60.0", + "webpack": "^5.61.0", "webpack-merge": "^5.8.0" } } diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index 4f932828b828..949061688381 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -116,7 +116,7 @@ "update-notifier": "^5.1.0", "url-loader": "^4.1.1", "wait-on": "^6.0.0", - "webpack": "^5.60.0", + "webpack": "^5.61.0", "webpack-bundle-analyzer": "^4.4.2", "webpack-dev-server": "^4.4.0", "webpack-merge": "^5.8.0", diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts index cc2d4995e774..afad6bc61c90 100644 --- a/packages/docusaurus/src/webpack/base.ts +++ b/packages/docusaurus/src/webpack/base.ts @@ -129,6 +129,7 @@ export function createBaseConfig( ? 'assets/js/[name].[contenthash:8].js' : '[name].js', publicPath: baseUrl, + hashFunction: 'xxhash64', }, // Don't throw warning when asset created is over 250kb performance: { diff --git a/yarn.lock b/yarn.lock index 5a917e36c8d4..f41e4555e44d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12886,9 +12886,9 @@ loader-utils@^1.4.0: json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e" + integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -20221,10 +20221,10 @@ webpack-sources@^3.2.0: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.1.tgz#251a7d9720d75ada1469ca07dbb62f3641a05b6d" integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA== -webpack@*, webpack@^5, webpack@^5.1.0, webpack@^5.37.0, webpack@^5.38.1, webpack@^5.60.0: - version "5.60.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.60.0.tgz#9c26f38a57c9688b0a8c5c885e05197344eae67d" - integrity sha512-OL5GDYi2dKxnwJPSOg2tODgzDxAffN0osgWkZaBo/l3ikCxDFP+tuJT3uF7GyBE3SDBpKML/+a8EobyWAQO3DQ== +webpack@*, webpack@^5, webpack@^5.1.0, webpack@^5.37.0, webpack@^5.38.1, webpack@^5.61.0: + version "5.61.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.61.0.tgz#fa827f0ee9bdfd141dd73c3e891e955ebd52fe7f" + integrity sha512-fPdTuaYZ/GMGFm4WrPi2KRCqS1vDp773kj9S0iI5Uc//5cszsFEDgHNaX4Rj1vobUiU1dFIV3mA9k1eHeluFpw== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50"