Skip to content

Commit

Permalink
upgrade nx to 13.10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
imatiach-msft committed May 1, 2024
1 parent 6026326 commit 4a8880b
Show file tree
Hide file tree
Showing 23 changed files with 3,326 additions and 5,203 deletions.
2 changes: 1 addition & 1 deletion apps/dashboard/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion apps/widget/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/causality/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/core-ui/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/counterfactuals/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/dataset-explorer/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/e2e/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
4 changes: 4 additions & 0 deletions libs/e2e/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
},
"include": [
"**/*.spec.ts",
"**/*.test.ts",
"**/*.spec.tsx",
"**/*.test.tsx",
"**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion libs/error-analysis/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/fairness/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/forecasting/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
4 changes: 4 additions & 0 deletions libs/forecasting/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
},
"include": [
"**/*.spec.ts",
"**/*.test.ts",
"**/*.spec.tsx",
"**/*.test.tsx",
"**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion libs/interpret-text/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/interpret-vision/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/interpret/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/localization/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
4 changes: 4 additions & 0 deletions libs/localization/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
},
"include": [
"**/*.spec.ts",
"**/*.test.ts",
"**/*.spec.tsx",
"**/*.test.tsx",
"**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion libs/mlchartlib/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
2 changes: 1 addition & 1 deletion libs/model-assessment/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
129 changes: 71 additions & 58 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,74 +16,87 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"options": {}
"runner": "nx/tasks-runners/default",
"options": {
"parallel": 1
}
}
},
"projects": {
"causality": {
"tags": []
},
"core-ui": {
"tags": []
},
"counterfactuals": {
"tags": []
},
"dashboard": {
"tags": []
},
"dashboard-e2e": {
"tags": [],
"implicitDependencies": ["dashboard"]
},
"dataset-explorer": {
"tags": []
},
"e2e": {
"tags": []
},
"error-analysis": {
"tags": []
},
"fairness": {
"tags": []
},
"forecasting": {
"tags": []
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
},
"cli": {
"defaultCollection": "@nrwl/react"
},
"defaultProject": "dashboard",
"generators": {
"@nrwl/workspace": {
"library": {
"linter": "eslint"
}
},
"interpret": {
"tags": []
"@nrwl/cypress": {
"cypress-project": {
"linter": "eslint"
}
},
"interpret-text": {
"tags": []
"@nrwl/react": {
"application": {
"style": "none",
"linter": "eslint",
"babel": true
},
"library": {
"style": "none",
"linter": "eslint"
},
"storybook-configuration": {
"linter": "eslint"
},
"component": {
"style": "none"
}
},
"interpret-vision": {
"tags": []
"@nrwl/next": {
"application": {
"linter": "eslint"
}
},
"localization": {
"tags": []
"@nrwl/web": {
"application": {
"linter": "eslint"
}
},
"mlchartlib": {
"tags": []
"@nrwl/node": {
"application": {
"linter": "eslint"
},
"library": {
"linter": "eslint"
}
},
"model-assessment": {
"tags": []
"@nrwl/nx-plugin": {
"plugin": {
"linter": "eslint"
}
},
"widget": {
"tags": []
"@nrwl/nest": {
"application": {
"linter": "eslint"
}
},
"widget-e2e": {
"tags": [],
"implicitDependencies": ["widget"]
}
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
"@nrwl/express": {
"application": {
"linter": "eslint"
},
"library": {
"linter": "eslint"
}
]
}
}
}
36 changes: 19 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@
"pyodide": "^0.21.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "18.0.0",
"react-plotly.js": "^2.6.0",
"react-router-dom": "^5.0.1",
"react-router-dom": "5.3.0",
"regenerator-runtime": "0.13.7",
"socket.io-client": "^4.7.2",
"tslib": "^2.5.0",
Expand All @@ -80,17 +81,16 @@
"@babel/preset-env": "7.11.0",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "7.10.4",
"@nrwl/cli": "12.10.0",
"@nrwl/cypress": "12.10.0",
"@nrwl/eslint-plugin-nx": "12.10.0",
"@nrwl/jest": "12.10.0",
"@nrwl/react": "12.10.0",
"@nrwl/tao": "12.10.0",
"@nrwl/web": "12.10.0",
"@nrwl/workspace": "12.10.0",
"@nrwl/cli": "13.10.6",
"@nrwl/cypress": "13.10.6",
"@nrwl/eslint-plugin-nx": "13.10.6",
"@nrwl/jest": "13.10.6",
"@nrwl/react": "13.10.6",
"@nrwl/web": "13.10.6",
"@nrwl/workspace": "13.10.6",
"@rollup/plugin-json": "4.1.0",
"@svgr/rollup": "5.4.0",
"@testing-library/react": "11.2.6",
"@testing-library/react": "13.0.0",
"@types/d3-array": "^3.2.1",
"@types/d3-color": "^3.1.3",
"@types/d3-hierarchy": "^3.1.6",
Expand All @@ -109,10 +109,10 @@
"@types/node": "14.14.33",
"@types/node-fetch": "2.6.5",
"@types/plotly.js": "^2.12.32",
"@types/react": "17.0.3",
"@types/react-dom": "17.0.3",
"@types/react": "18.0.0",
"@types/react-dom": "18.0.0",
"@types/react-plotly.js": "^2.6.3",
"@types/react-router-dom": "5.1.7",
"@types/react-router-dom": "5.3.3",
"@types/uuid": "^8.3.0",
"@typescript-eslint/eslint-plugin": "4.28.4",
"@typescript-eslint/parser": "4.28.4",
Expand All @@ -130,19 +130,21 @@
"eslint-plugin-eslint-comments": "3.2.0",
"eslint-plugin-filenames": "1.3.2",
"eslint-plugin-header": "3.1.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.3.1",
"eslint-plugin-react": "7.23.1",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-react": "7.29.4",
"eslint-plugin-react-hooks": "4.4.0",
"eslint-plugin-unicorn": "21.0.0",
"jest": "27.2.3",
"jest-canvas-mock": "2.2.0",
"jszip": "3.10.1",
"moment-timezone": "0.5.35",
"node-fetch": "2.6.1",
"prettier": "2.3.1",
"nx": "13.10.6",
"prettier": "2.5.1",
"prettier-plugin-packagejson": "2.2.5",
"raw-loader": "^4.0.2",
"react-test-renderer": "18.0.0",
"semver": "7.3.2",
"serve": "11.3.2",
"ts-jest": "27.0.5",
Expand Down
Loading

0 comments on commit 4a8880b

Please sign in to comment.