Skip to content

Commit

Permalink
chore: migrate from nx 15.6.3 to 15.9.5 (#28032)
Browse files Browse the repository at this point in the history
* chore: migrate to nx 15.9.4

* chore: apply nx migrations

* chore: update nxignore and codeowners to reflect nx migrations

* fix(tools): update unhandled async calls and make all test pass after migration

* fix: accomodate nx workspace.json replaced by project.json in all apis

* feat(tools): update v8,v9 migration generators to update npmignore

* fix: make in memory transpilation work again

* chore: update all v9 .npmignore to exclude project.json

* chore: update all v8 .npmignore to exclude project.json and project.json with tags and source root

* generate changefiles

* chore: pin tslib to 2.5.0 as higher version adds +3kb to v8 bundle
  • Loading branch information
Hotell authored Jun 27, 2023
1 parent 0d59eb9 commit fbe878e
Show file tree
Hide file tree
Showing 431 changed files with 3,096 additions and 2,275 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@

#### NX related files
/nx.json @microsoft/fluentui-react-build
/workspace.json @microsoft/fluentui-react-build
/migrations.json @microsoft/fluentui-react-build

#### Meta and License stuff
Expand Down Expand Up @@ -300,6 +299,7 @@ packages/react-experiments/src/components/Tile @ThomasMichon
packages/react-experiments/src/components/TileList @ThomasMichon

### generic rules for v-build. Might be tweaked based on needs.
**/project.json @microsoft/fluentui-react-build
**/just.config.ts @microsoft/fluentui-react-build
**/jest.config.js @microsoft/fluentui-react-build
**/webpack.*.js @microsoft/fluentui-react-build
Expand Down
5 changes: 4 additions & 1 deletion .nxignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Northstar files that doesn't belong to actual project to make nx workspace-lint pass
# Northstar files that doesn't belong to actual project to make nx workspace-lint pass

packages/fluentui/add-a-feature.md
packages/fluentui/document-a-feature.md
packages/fluentui/test-a-feature.md
Expand All @@ -8,3 +9,5 @@ packages/fluentui/CONTRIBUTING.md
packages/fluentui/README.md
packages/fluentui/lerna.json
packages/fluentui/package.json

**/dist/**
6 changes: 6 additions & 0 deletions apps/perf-test-react-components/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/perf-test-react-components",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/perf-test/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/perf-test",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/pr-deploy-site/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/pr-deploy-site",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/public-docsite-resources/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/public-docsite-resources",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
7 changes: 7 additions & 0 deletions apps/public-docsite-v9/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "@fluentui/public-docsite-v9",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": [],
"tags": ["platform:web"]
}
6 changes: 6 additions & 0 deletions apps/public-docsite/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/public-docsite",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/react-18-tests-v8/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/react-18-tests-v8",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/react-18-tests-v9/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/react-18-tests-v9",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
8 changes: 8 additions & 0 deletions apps/recipes-react-components/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@fluentui/recipes-react-components",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": [],
"sourceRoot": "apps/recipes-react-components/src",
"tags": ["vNext"]
}
8 changes: 8 additions & 0 deletions apps/ssr-tests-v9/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@fluentui/ssr-tests-v9",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": [],
"sourceRoot": "apps/ssr-tests-v9/src",
"tags": ["vNext", "platform:node"]
}
6 changes: 6 additions & 0 deletions apps/ssr-tests/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/ssr-tests",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/stress-test/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/stress-test",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/test-bundles/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/test-bundles",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/theming-designer/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/theming-designer",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
5 changes: 5 additions & 0 deletions apps/ts-minbar-test-react-components/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "@fluentui/ts-minbar-test-react-components",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application"
}
5 changes: 5 additions & 0 deletions apps/ts-minbar-test-react/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "@fluentui/ts-minbar-test-react",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application"
}
6 changes: 6 additions & 0 deletions apps/vr-tests-react-components/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/vr-tests-react-components",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
6 changes: 6 additions & 0 deletions apps/vr-tests/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@fluentui/vr-tests",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"implicitDependencies": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/api-docs",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/azure-themes",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/babel-preset-global-context",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/codemods",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/common-styles",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/cra-template",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/date-time-utilities",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/dom-utilities",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/eslint-plugin",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/example-data",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/fluent2-theme",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/font-icons-mdl2",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/foundation-legacy",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/global-context",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/jest-serializer-merge-styles",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/keyboard-key",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/keyboard-keys",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/merge-styles",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/monaco-editor",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/priority-overflow",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/public-docsite-setup",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-accordion",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-alert",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-aria",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-avatar",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-badge",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-button",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-card",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-cards",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: update .npmignore to unify v8 packages and exclude project.json",
"packageName": "@fluentui/react-charting",
"email": "[email protected]",
"dependentChangeType": "none"
}
Loading

0 comments on commit fbe878e

Please sign in to comment.