From 6479fe3cf43ba159738620f5913f1a215312af37 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 1 Mar 2023 17:52:36 +0100 Subject: [PATCH 1/5] chore: migrate to node 16 --- .codesandbox/ci.json | 2 +- .devops/templates/tools.yml | 2 +- .github/workflows/check-packages.yml | 6 +++--- .github/workflows/docsite-publish-chromatic.yml | 2 +- .github/workflows/docsite-publish-ghpages.yml | 2 +- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index ca72bb41e8229..2cd7dc2ea27a1 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -2,5 +2,5 @@ "buildCommand": "build:codesandbox", "packages": ["packages/react", "packages/react-components/react-components"], "sandboxes": ["x5u3t", "spnyu"], - "node": "14" + "node": "16" } diff --git a/.devops/templates/tools.yml b/.devops/templates/tools.yml index 5b8b5d5004929..fdd9709339239 100644 --- a/.devops/templates/tools.yml +++ b/.devops/templates/tools.yml @@ -2,7 +2,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '14.18.1' + versionSpec: '16.16.0' checkLatest: false displayName: 'Install Node.js' diff --git a/.github/workflows/check-packages.yml b/.github/workflows/check-packages.yml index 26c19808851d0..2fdd00566607b 100644 --- a/.github/workflows/check-packages.yml +++ b/.github/workflows/check-packages.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14.18.1 + node-version: 16.16.0 cache: 'yarn' - uses: tj-actions/changed-files@v34 @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14.18.1 + node-version: 16.16.0 - uses: actions/github-script@v6 with: @@ -70,7 +70,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14.18.1 + node-version: 16.16.0 - uses: actions/github-script@v6 with: diff --git a/.github/workflows/docsite-publish-chromatic.yml b/.github/workflows/docsite-publish-chromatic.yml index fc8ef562d8eba..3dc8298950967 100644 --- a/.github/workflows/docsite-publish-chromatic.yml +++ b/.github/workflows/docsite-publish-chromatic.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14.18.1 + node-version: 16.16.0 cache: 'yarn' - name: Install packages diff --git a/.github/workflows/docsite-publish-ghpages.yml b/.github/workflows/docsite-publish-ghpages.yml index f358f4ce03052..ffdbcd83ce985 100644 --- a/.github/workflows/docsite-publish-ghpages.yml +++ b/.github/workflows/docsite-publish-ghpages.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 14.18.1 + node-version: 16.16.0 cache: 'yarn' - name: Install packages diff --git a/package.json b/package.json index e9621807e777e..c8f35b2f23e49 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/microsoft/fluentui" }, "engines": { - "node": "^14.18.1 || ^16.0.0" + "node": "^16.0.0" }, "scripts": { "build": "lage build --verbose", From cce698d5ed4bae9ba4774919ffe33ee73ee34136 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 1 Mar 2023 18:45:14 +0100 Subject: [PATCH 2/5] chore: bump to node 16.18.1 to be aligned with codesandbox CI --- .devops/templates/tools.yml | 2 +- .github/workflows/check-packages.yml | 6 +++--- .github/workflows/docsite-publish-chromatic.yml | 2 +- .github/workflows/docsite-publish-ghpages.yml | 2 +- package.json | 2 +- yarn.lock | 13 +++++++++---- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.devops/templates/tools.yml b/.devops/templates/tools.yml index fdd9709339239..808451359407f 100644 --- a/.devops/templates/tools.yml +++ b/.devops/templates/tools.yml @@ -2,7 +2,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '16.16.0' + versionSpec: '16.18.1' checkLatest: false displayName: 'Install Node.js' diff --git a/.github/workflows/check-packages.yml b/.github/workflows/check-packages.yml index 2fdd00566607b..fc352c1c4a715 100644 --- a/.github/workflows/check-packages.yml +++ b/.github/workflows/check-packages.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16.16.0 + node-version: 16.18.1 cache: 'yarn' - uses: tj-actions/changed-files@v34 @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16.16.0 + node-version: 16.18.1 - uses: actions/github-script@v6 with: @@ -70,7 +70,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16.16.0 + node-version: 16.18.1 - uses: actions/github-script@v6 with: diff --git a/.github/workflows/docsite-publish-chromatic.yml b/.github/workflows/docsite-publish-chromatic.yml index 3dc8298950967..20610ef7235f2 100644 --- a/.github/workflows/docsite-publish-chromatic.yml +++ b/.github/workflows/docsite-publish-chromatic.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16.16.0 + node-version: 16.18.1 cache: 'yarn' - name: Install packages diff --git a/.github/workflows/docsite-publish-ghpages.yml b/.github/workflows/docsite-publish-ghpages.yml index ffdbcd83ce985..6cc781319d398 100644 --- a/.github/workflows/docsite-publish-ghpages.yml +++ b/.github/workflows/docsite-publish-ghpages.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16.16.0 + node-version: 16.18.1 cache: 'yarn' - name: Install packages diff --git a/package.json b/package.json index c8f35b2f23e49..31c200f645dc6 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ "@types/lodash": "4.14.182", "@types/markdown-table": "2.0.0", "@types/micromatch": "4.0.2", - "@types/node": "14.18.32", + "@types/node": "16.18.1", "@types/node-fetch": "2.5.7", "@types/prettier": "2.7.2", "@types/progress": "2.0.5", diff --git a/yarn.lock b/yarn.lock index 2ce3a8d3ab13f..730a36ee10b92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5750,10 +5750,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@14.18.32", "@types/node@>=10.0.0", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^14.14.31": - version "14.18.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.32.tgz#8074f7106731f1a12ba993fe8bad86ee73905014" - integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow== +"@types/node@*", "@types/node@16.18.1", "@types/node@>=10.0.0", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": + version "16.18.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.1.tgz#fd860a5efc505a5417d25a99cbff78077447a391" + integrity sha512-Z659t5cj2Tt2SaqbJxXRo5EaU86E4l2CxtklCY1VftxYXhR81Z75UsugwdI7l5MUAR1I+l8sdt3B5Y++ZV76WQ== "@types/node@10.17.13", "@types/node@^10.12.18": version "10.17.13" @@ -5770,6 +5770,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.15.54.tgz#59ed60e7b0d56905a654292e8d73275034eb6283" integrity sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g== +"@types/node@^14.14.31": + version "14.18.32" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.32.tgz#8074f7106731f1a12ba993fe8bad86ee73905014" + integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" From bfa9fa155aa55351ff25c021d7fc993d99df0f8e Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 1 Mar 2023 19:41:42 +0100 Subject: [PATCH 3/5] fix(global-context): remove non-existend NodeJS.Glob after node 16 types migration --- packages/react-components/global-context/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-components/global-context/src/types.ts b/packages/react-components/global-context/src/types.ts index 0010ac80544e8..79a9007e8228b 100644 --- a/packages/react-components/global-context/src/types.ts +++ b/packages/react-components/global-context/src/types.ts @@ -1,3 +1,3 @@ import * as React from 'react'; -export type GlobalObject = (typeof globalThis | NodeJS.Global) & Record>; +export type GlobalObject = typeof globalThis & Record>; From b3c783b10b340641b6cd190d3c9f819afd4fa637 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 27 Apr 2023 12:13:40 +0200 Subject: [PATCH 4/5] fixup! chore: bump to node 16.18.1 to be aligned with codesandbox CI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31c200f645dc6..a86ad0a03c512 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/microsoft/fluentui" }, "engines": { - "node": "^16.0.0" + "node": "^16.18.1 || ^18.0.0" }, "scripts": { "build": "lage build --verbose", From 979d86fc5d5d5b1b0c38c95e3e8ece2ca021eeef Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Thu, 27 Apr 2023 12:17:00 +0200 Subject: [PATCH 5/5] generate changefile --- ...lobal-context-bd251f47-0c11-4359-86a3-0ddfbab981a4.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@fluentui-global-context-bd251f47-0c11-4359-86a3-0ddfbab981a4.json diff --git a/change/@fluentui-global-context-bd251f47-0c11-4359-86a3-0ddfbab981a4.json b/change/@fluentui-global-context-bd251f47-0c11-4359-86a3-0ddfbab981a4.json new file mode 100644 index 0000000000000..fe5f8da92b509 --- /dev/null +++ b/change/@fluentui-global-context-bd251f47-0c11-4359-86a3-0ddfbab981a4.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: update internal types to reflect node 16 types", + "packageName": "@fluentui/global-context", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +}