Skip to content

Commit

Permalink
Merge pull request #1062 from jetstreamapp/upgrade/nx-20.0.12
Browse files Browse the repository at this point in the history
Upgrade NX and other dependencies
  • Loading branch information
paustint authored Nov 11, 2024
2 parents a238c29 + 6ebea5c commit 182dbaf
Show file tree
Hide file tree
Showing 10 changed files with 3,533 additions and 3,806 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx/eslint-plugin"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended", "prettier"],
"rules": {
"@typescript-eslint/explicit-member-accessibility": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-parameter-properties": "off",
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"allow": [],
Expand Down Expand Up @@ -47,15 +47,15 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-unused-vars": "warn"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@ package-lock.json
**/playwright/.cache

.nx/cache
.nx/workspace-data
.nx/workspace-data
vite.config.*.timestamp*
24 changes: 12 additions & 12 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "^3.0.1",
"@docusaurus/plugin-ideal-image": "^3.0.1",
"@docusaurus/preset-classic": "^3.0.1",
"@docusaurus/theme-search-algolia": "^3.0.1",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"@docusaurus/core": "^3.6.1",
"@docusaurus/plugin-ideal-image": "^3.6.1",
"@docusaurus/preset-classic": "^3.6.1",
"@docusaurus/theme-search-algolia": "^3.6.1",
"@mdx-js/react": "^3.1.0",
"clsx": "^2.1.1",
"prism-react-renderer": "^2.4.0",
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "^3.0.1",
"@docusaurus/tsconfig": "^3.0.1",
"@docusaurus/types": "^3.0.1",
"@docusaurus/module-type-aliases": "^3.6.1",
"@docusaurus/tsconfig": "^3.6.1",
"@docusaurus/types": "^3.6.1",
"typescript": "^5.3.3"
},
"browserslist": {
Expand Down
4,323 changes: 1,945 additions & 2,378 deletions apps/docs/yarn.lock

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions apps/landing/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const { join } = require('path');

module.exports = {
plugins: {
'postcss-import': {},
Expand Down
4 changes: 2 additions & 2 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nx/jest');
const { getJestProjectsAsync } = require('@nx/jest');

export default { projects: getJestProjects() };
export default async () => ({ projects: await getJestProjectsAsync() });
76 changes: 25 additions & 51 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,67 +1,41 @@
{
"migrations": [
{
"cli": "nx",
"version": "19.6.3-beta.0",
"description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
"implementation": "./src/migrations/update-19-6-3/proxy-config",
"package": "@nx/webpack",
"name": "update-19-6-3-proxy-config"
"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",
"package": "nx",
"name": "move-use-daemon-process"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Ensure Module Federation DTS is turned off by default.",
"factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default",
"package": "@nx/react",
"name": "update-19-6-0-turn-module-federation-dts-off"
"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,
"package": "nx",
"name": "use-legacy-cache"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Update the server file for Module Federation SSR port value to be the same as the 'serve' target port value.",
"factory": "./src/migrations/update-19-6-0/update-ssr-server-port",
"package": "@nx/react",
"name": "update-module-federation-ssr-server-file"
"version": "20.0.0-beta.5",
"description": "replace getJestProjects with getJestProjectsAsync",
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync"
},
{
"cli": "nx",
"version": "19.6.1-beta.0",
"description": "Ensure Target Defaults are set correctly for Module Federation.",
"factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf",
"package": "@nx/react",
"name": "update-19-6-1-ensure-module-federation-target-defaults"
},
{
"cli": "nx",
"version": "19.6.0-beta.0",
"description": "Use serve-static or preview for webServerCommand.",
"implementation": "./src/migrations/update-19-6-0/use-serve-static-preview-for-command",
"package": "@nx/playwright",
"name": "19-6-0-use-serve-static-preview-for-command"
},
{
"cli": "nx",
"version": "19.6.0-beta.1",
"description": "Add inferred ciTargetNames to targetDefaults with dependsOn to ensure dependent application builds are scheduled before atomized tasks.",
"implementation": "./src/migrations/update-19-6-0/add-e2e-ci-target-defaults",
"package": "@nx/playwright",
"name": "update-19-6-0-add-e2e-ci-target-defaults"
},
{
"version": "19.6.0-beta.0",
"description": "Add dependsOn: [build] to preview targets using preview-server",
"implementation": "./src/migrations/update-19-6-0/add-depends-on-for-preview",
"version": "20.0.4-beta.0",
"description": "Add gitignore entry for temporary vite config files.",
"implementation": "./src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore",
"package": "@nx/vite",
"name": "update-19-6-0-add-depends-on-for-preview-server"
"name": "update-20-0-4"
},
{
"cli": "nx",
"version": "19.6.0-beta.0",
"description": "Update workspace to use Storybook v8",
"implementation": "./src/migrations/update-19-6-0/update-sb-8",
"package": "@nx/storybook",
"name": "update-19-6-0-add-nx-packages"
"version": "20.0.6-beta.0",
"description": "Add gitignore entry for temporary vite config files and remove previous incorrect glob.",
"implementation": "./src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore",
"package": "@nx/vite",
"name": "update-20-0-6"
}
]
}
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
}
}
],
"defaultBase": "main"
"defaultBase": "main",
"useLegacyCache": true
}
60 changes: 30 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,24 @@
"@babel/preset-typescript": "^7.24.1",
"@contentful/rich-text-react-renderer": "^15.12.1",
"@emotion/babel-plugin": "11.11.0",
"@nx/devkit": "19.6.5",
"@nx/esbuild": "19.6.5",
"@nx/eslint": "19.6.5",
"@nx/eslint-plugin": "19.6.5",
"@nx/express": "19.6.5",
"@nx/jest": "19.6.5",
"@nx/js": "19.6.5",
"@nx/next": "19.6.5",
"@nx/node": "19.6.5",
"@nx/playwright": "19.6.5",
"@nx/plugin": "19.6.5",
"@nx/react": "19.6.5",
"@nx/storybook": "19.6.5",
"@nx/vite": "19.6.5",
"@nx/web": "19.6.5",
"@nx/webpack": "19.6.5",
"@nx/workspace": "19.6.5",
"@playwright/test": "^1.48.1",
"@nx/devkit": "20.0.12",
"@nx/esbuild": "20.0.12",
"@nx/eslint": "20.0.12",
"@nx/eslint-plugin": "20.0.12",
"@nx/express": "20.0.12",
"@nx/jest": "20.0.12",
"@nx/js": "20.0.12",
"@nx/next": "20.0.12",
"@nx/node": "20.0.12",
"@nx/playwright": "20.0.12",
"@nx/plugin": "20.0.12",
"@nx/react": "20.0.12",
"@nx/storybook": "20.0.12",
"@nx/vite": "20.0.12",
"@nx/web": "20.0.12",
"@nx/webpack": "20.0.12",
"@nx/workspace": "20.0.12",
"@playwright/test": "^1.48.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@release-it/bumper": "^6.0.1",
"@salesforce-ux/design-system": "^2.25.1",
Expand Down Expand Up @@ -181,7 +181,7 @@
"eslint": "8.57.0",
"eslint-config-next": "14.2.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-playwright": "^0.15.3",
"eslint-plugin-react": "^7.34.1",
Expand All @@ -196,8 +196,8 @@
"jsonc-eslint-parser": "^2.1.0",
"next-sitemap": "^4.2.3",
"npm-run-all": "^4.1.5",
"nx": "19.6.5",
"postcss": "8.4.38",
"nx": "20.0.12",
"postcss": "^8.4.48",
"postcss-preset-env": "7",
"prettier": "2.7.0",
"prisma": "^5.9.1",
Expand All @@ -211,7 +211,7 @@
"stylus": "0.59.0",
"stylus-loader": "^7.1.0",
"swc-loader": "0.1.15",
"tailwindcss": "3.4.3",
"tailwindcss": "^3.4.14",
"ts-jest": "29.1.0",
"ts-node": "^10.9.2",
"typescript": "5.5.4",
Expand All @@ -236,10 +236,10 @@
"@jetstreamapp/soql-parser-js": "^6.1.0",
"@mdx-js/react": "^1.6.21",
"@monaco-editor/react": "^4.6.0",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/auto-instrumentations-node": "^0.45.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.51.0",
"@opentelemetry/sdk-node": "^0.51.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-node": "^0.52.1",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.54.2",
"@opentelemetry/sdk-node": "^0.54.2",
"@popperjs/core": "^2.11.8",
"@prisma/client": "^5.9.1",
"@react-aria/dialog": "^3.5.12",
Expand All @@ -251,7 +251,7 @@
"@tippyjs/react": "^4.2.6",
"@types/uuid": "^9.0.8",
"amplitude-js": "^8.21.9",
"axios": "^1.6.8",
"axios": "^1.7.7",
"body-parser": "^1.20.3",
"classnames": "^2.5.1",
"cloudinary": "^1.26.3",
Expand Down Expand Up @@ -322,13 +322,13 @@
"rollbar": "^2.26.4",
"rxjs": "^7.8.1",
"slack-notify": "^0.1.7",
"socket.io": "^4.2.0",
"socket.io-client": "^4.2.0",
"socket.io": "^4.8.1",
"socket.io-client": "^4.8.1",
"split.js": "^1.6.5",
"tiny-request-router": "^1.2.2",
"tslib": "^2.3.0",
"uuid": "^9.0.1",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
"xmlbuilder2": "^3.1.1",
"zod": "^3.23.4"
}
Expand Down
Loading

0 comments on commit 182dbaf

Please sign in to comment.