Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"program": "${workspaceRoot}/scripts/executors/src/debug-test.js",
"cwd": "${fileDirname}",
"stopOnEntry": false,
"args": ["-i", "--testPathPattern=\\b${fileBasenameNoExtension}", "--watch"],
"args": ["-i", "--testPathPatterns=\\b${fileBasenameNoExtension}", "--watch"],
"runtimeExecutable": null,
"runtimeArgs": ["--nolazy", "--inspect"],
"env": {
Expand All @@ -42,7 +42,7 @@
"program": "${workspaceRoot}/scripts/executors/src/debug-test.js",
"cwd": "${fileDirname}",
"stopOnEntry": false,
"args": ["-i", "--testPathPattern=\\b${fileBasenameNoExtension}", "--watch"],
"args": ["-i", "--testPathPatterns=\\b${fileBasenameNoExtension}", "--watch"],
"runtimeExecutable": null,
"runtimeArgs": ["--nolazy", "--inspect"],
"env": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: bump typescript-eslint",
"packageName": "@fluentui/eslint-plugin-react-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate to jest v30",
"packageName": "@fluentui/react-charting",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: migrate to jest v30",
"packageName": "@fluentui/react-charts",
"email": "[email protected]",
"dependentChangeType": "none"
}
73 changes: 50 additions & 23 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,68 @@
{
"migrations": [
{
"version": "20.0.0-beta.7",
"description": "Migration for v20.0.0-beta.7",
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-legacy-cache",
"package": "nx",
"name": "move-use-daemon-process"
"name": "remove-legacy-cache"
},
{
"version": "20.0.1",
"description": "Set `useLegacyCache` to true for migrating workspaces",
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
"x-repair-skip": true,
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner",
"package": "nx",
"name": "use-legacy-cache"
"name": "remove-custom-tasks-runner"
},
{
"version": "20.2.0-beta.5",
"description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
"implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
"package": "@nx/eslint",
"name": "update-typescript-eslint-v8.13.0"
"version": "21.0.0-beta.11",
"description": "Updates release version config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-version-config-changes",
"package": "nx",
"name": "release-version-config-changes"
},
{
"version": "20.3.0-beta.1",
"description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
"implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides",
"package": "@nx/eslint",
"name": "add-file-extensions-to-overrides"
"version": "21.0.0-beta.11",
"description": "Updates release changelog config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes",
"package": "nx",
"name": "release-changelog-config-changes"
},
{
"version": "21.1.0-beta.2",
"description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present",
"implementation": "./src/migrations/update-21-1-0/add-gitignore-entry",
"package": "nx",
"name": "21-1-0-add-ignore-entries-for-nx-rule-files"
},
{
"cli": "nx",
"version": "20.0.0-beta.5",
"description": "replace getJestProjects with getJestProjectsAsync",
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"version": "21.0.0-beta.9",
"description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.",
"implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync"
"name": "replace-getJestProjects-with-getJestProjectsAsync-v21"
},
{
"version": "21.0.0-beta.10",
"description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.",
"implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor",
"package": "@nx/jest",
"name": "remove-tsconfig-option-from-jest-executor"
},
{
"version": "21.3.0-beta.3",
"description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.",
"implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern",
"package": "@nx/jest",
"name": "rename-test-path-pattern"
},
{
"version": "21.5.0-beta.2",
"description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.",
"factory": "./src/migrations/update-21-5-0/migrate-development-custom-condition",
"package": "@nx/js",
"name": "migrate-development-custom-condition"
}
]
}
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
"parallel": 3,
"useInferencePlugins": false,
"defaultBase": "master",
"tui": {
"enabled": false
},
"plugins": [
{
"plugin": "./tools/workspace-plugin/src/plugins/workspace-plugin.ts",
Expand Down
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@babel/plugin-proposal-optional-chaining": "7.21.0",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-object-rest-spread": "7.8.3",
"@babel/plugin-transform-object-rest-spread": "7.24.6",
"@babel/plugin-transform-runtime": "7.24.6",
"@babel/preset-env": "7.24.6",
"@babel/preset-react": "7.24.6",
Expand All @@ -65,22 +66,22 @@
"@griffel/react": "^1.5.22",
"@griffel/shadow-dom": "0.2.2",
"@griffel/webpack-loader": "2.2.10",
"@jest/reporters": "29.7.0",
"@jest/reporters": "30.2.0",
"@mdx-js/loader": "2.3.0",
"@microsoft/api-extractor": "7.51.0",
"@microsoft/api-extractor-model": "7.31.2",
"@microsoft/eslint-plugin-sdl": "1.0.1",
"@microsoft/load-themed-styles": "1.10.26",
"@microsoft/loader-load-themed-styles": "2.0.17",
"@microsoft/tsdoc": "0.15.1",
"@nx/devkit": "20.8.1",
"@nx/eslint": "20.8.1",
"@nx/eslint-plugin": "20.8.1",
"@nx/jest": "20.8.1",
"@nx/js": "20.8.1",
"@nx/node": "20.8.1",
"@nx/plugin": "20.8.1",
"@nx/workspace": "20.8.1",
"@nx/devkit": "21.6.3",
"@nx/eslint": "21.6.3",
"@nx/eslint-plugin": "21.6.3",
"@nx/jest": "21.6.3",
"@nx/js": "21.6.3",
"@nx/node": "21.6.3",
"@nx/plugin": "21.6.3",
"@nx/workspace": "21.6.3",
"@octokit/rest": "18.12.0",
"@oddbird/css-anchor-positioning": "0.4.0",
"@phenomnomnominal/tsquery": "6.1.3",
Expand Down Expand Up @@ -134,7 +135,7 @@
"@types/express": "4.17.21",
"@types/fs-extra": "8.0.1",
"@types/glob": "7.1.1",
"@types/jest": "29.5.13",
"@types/jest": "30.0.0",
"@types/jest-axe": "3.5.9",
"@types/jju": "1.4.1",
"@types/json-schema": "^7.0.8",
Expand Down Expand Up @@ -166,7 +167,7 @@
"@typescript-eslint/rule-tester": "8.46.2",
"@typescript-eslint/eslint-plugin": "^8.46.2",
"autoprefixer": "10.2.1",
"babel-jest": "29.7.0",
"babel-jest": "30.2.0",
"babel-loader": "9.1.3",
"babel-plugin-annotate-pure-calls": "0.4.0",
"babel-plugin-annotate-pure-imports": "1.0.0-1",
Expand Down Expand Up @@ -235,14 +236,14 @@
"html-webpack-plugin": "5.6.0",
"ignore-not-found-export-webpack-plugin": "1.0.2",
"imports-loader": "1.2.0",
"jest": "29.7.0",
"jest": "30.2.0",
"jest-axe": "8.0.0",
"jest-cli": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-environment-node": "^29.7.0",
"jest-cli": "30.2.0",
"jest-environment-jsdom": "30.2.0",
"jest-environment-node": "30.2.0",
"jest-environment-node-single-context": "29.1.0",
"jest-snapshot": "29.7.0",
"jest-watch-typeahead": "2.2.2",
"jest-snapshot": "30.2.0",
"jest-watch-typeahead": "3.0.0",
"jju": "1.4.0",
"json-schema": "0.4.0",
"jsonc-eslint-parser": "2.4.1",
Expand All @@ -257,7 +258,7 @@
"monosize-bundler-webpack": "0.1.6",
"monosize-storage-azure": "0.0.16",
"node-plop": "0.25.0",
"nx": "20.8.1",
"nx": "21.6.3",
"p-queue": "6.6.2",
"parse-diff": "0.7.1",
"patch-package": "8.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
const reactDom = jest.genMockFromModule('react-dom');
const reactDom = jest.createMockFromModule('react-dom');

function mockCreatePortal(element, target) {
return (
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/react-charting/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"moduleResolution": "node",
"preserveConstEnums": true,
"skipLibCheck": true,
"lib": ["es5", "dom"],
"lib": ["es5", "dom", "ES2015.Symbol.WellKnown"],
"typeRoots": ["../../../node_modules/@types", "../../../typings"],
"types": ["jest", "node", "custom-global", "@testing-library/jest-dom"],
"isolatedModules": true
Expand Down
Loading
Loading