Skip to content

Commit

Permalink
Merge pull request #12453 from OfficeDev/yiqingzhao/sdk
Browse files Browse the repository at this point in the history
feat: remove deprecated codes and upgrade dependency versions
  • Loading branch information
MSFT-yiz authored Oct 17, 2024
2 parents 7a98a1a + 7995175 commit fe7eea6
Show file tree
Hide file tree
Showing 106 changed files with 7,211 additions and 12,807 deletions.
25 changes: 5 additions & 20 deletions packages/sdk-react/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
"es6": true,
"jest/globals": true
},
"extends": [
"plugin:react/recommended",
"standard",
"plugin:jest/recommended"
],
"extends": ["plugin:react/recommended", "standard", "plugin:jest/recommended"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
Expand All @@ -25,22 +21,11 @@
},
"ecmaVersion": 2018
},
"plugins": [
"react",
"@typescript-eslint",
"react-hooks",
"jest"
],
"plugins": ["react", "@typescript-eslint", "react-hooks", "jest"],
"rules": {
"object-shorthand": 2,
"quotes": [
"error",
"double"
],
"semi": [
"error",
"always"
],
"quotes": ["error", "double"],
"semi": ["error", "always"],
"indent": [
"error",
4,
Expand All @@ -55,4 +40,4 @@
"react-hooks/rules-of-hooks": "error", // Checks rules of Hooks
"react-hooks/exhaustive-deps": "warn" // Checks effect dependencies
}
}
}
7 changes: 7 additions & 0 deletions packages/sdk-react/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
presets: [
["@babel/preset-env", { targets: { esmodules: true } }],
["@babel/preset-react", { runtime: "automatic" }],
"@babel/preset-typescript",
],
};
4 changes: 4 additions & 0 deletions packages/sdk-react/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ module.exports = {
},
},
],
"\\.jsx?$": "babel-jest",
},
transformIgnorePatterns: [
"<rootDir>/../sdk/node_modules/(?!@azure/core-auth|@azure/core-http|botbuilder|botbuilder-core|botframework-connector)",
],
moduleNameMapper: {
// Force module uuid to resolve with the CJS entry point, because Jest does not support package.json.exports. See https://github.com/uuidjs/uuid/issues/451
uuid: require.resolve("uuid"),
Expand Down
75 changes: 38 additions & 37 deletions packages/sdk-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/teamsfx-react",
"version": "3.1.2",
"version": "4.0.0-rc",
"description": "React helper functions for Microsoft TeamsFx",
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -28,52 +28,53 @@
"precommit": "npm run check-sensitive && lint-staged"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@testing-library/react": "^13.4.0",
"@types/enzyme": "^3.10.10",
"@types/jest": "^29.4.0",
"@types/node": "^14.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^6.5.0",
"eslint": "^8.15.0",
"eslint-config-standard": "^17.0.0",
"@testing-library/react": "^16.0.1",
"@types/enzyme": "^3.10.18",
"@types/jest": "^29.5.13",
"@types/node": "^18.0.0",
"@types/react": "^18.3.9",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"babel-jest": "^29.7.0",
"eslint": "^8.6.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-n": "^15.2.0",
"eslint-plugin-no-secrets": "^0.8.9",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.26.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-n": "^17.10.3",
"eslint-plugin-no-secrets": "^1.0.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-react": "^7.37.0",
"eslint-plugin-react-hooks": "^4.6.2",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.4.0",
"jest-environment-jsdom": "^29.4.1",
"jest-junit": "^15.0.0",
"jwt-decode": "^3.1.2",
"lint-staged": "^12.3.4",
"mocha": "^10.0.0",
"nyc": "^15.1.0",
"prettier": "^2.5.1",
"react-test-renderer": "^18.2.0",
"rimraf": "^3.0.2",
"scheduler": "^0.20.2",
"ts-jest": "29.1.0",
"tslib": "^2.3.1",
"typescript": "latest"
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-junit": "^16.0.0",
"jwt-decode": "^4.0.0",
"lint-staged": "^15.2.0",
"nyc": "^17.1.0",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"ts-jest": "29.2.5",
"tslib": "^2.7.0",
"typescript": "~5.4.2"
},
"peerDependencies": {
"@fluentui/react-components": "^9.15.0",
"@fluentui/react-components": "^9.54.16",
"@microsoft/microsoft-graph-client": "^3.0.7",
"@microsoft/teams-js": "^2.19.0",
"@microsoft/teamsfx": "^2.2.2",
"@microsoft/teams-js": "^2.28.0",
"@microsoft/teamsfx": "^3.0.0-alpha",
"react": ">=16.8.0 <19.0.0",
"react-dom": ">=16.8.0 <19.0.0"
},
"dependencies": {
"@fluentui/react": "^8.106.1",
"@fluentui/react": "^8.120.9",
"@microsoft/teamsfx": "workspace:*"
},
"publishConfig": {
Expand Down
Loading

0 comments on commit fe7eea6

Please sign in to comment.