Skip to content
Open
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ certificates

.nx/self-healing
.react-email/

.nx/migrate-runs
2 changes: 1 addition & 1 deletion apps/jetstream-desktop-client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default defineConfig(() => ({
commonjsOptions: { transformMixedEsModules: true },
assetsDir: './',
emptyOutDir: true,
rollupOptions: {
rolldownOptions: {
input: {
// FIXME: for some reason this hangs if there are two entries here - works if either one is specified, but not both
// if both reference the same typescript file, then it works - tried a new nx sample project and that worked fine
Expand Down
2 changes: 1 addition & 1 deletion apps/jetstream-web-extension/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default defineConfig(({ mode }) => {
emptyOutDir: true,
sourcemap: mode === 'development' ? 'inline' : false,
minify: mode === 'development' ? false : 'esbuild',
rollupOptions: {
rolldownOptions: {
input: {
app: resolve(__dirname, 'app.html'),
popup: resolve(__dirname, 'popup.html'),
Expand Down
2 changes: 1 addition & 1 deletion apps/jetstream-web-extension/vite.plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export function extensionScriptsBuildPlugin(mode: string): PluginOption {
name,
fileName: () => `${name}.js`,
},
rollupOptions: {
rolldownOptions: {
output: {
inlineDynamicImports: true,
// Give CSS a predictable name based on the entry (e.g. contentScript.css)
Expand Down
2 changes: 1 addition & 1 deletion apps/jetstream/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default defineConfig(() => ({
assetsDir: './',
sourcemap: uploadSourcemaps ? ('hidden' as const) : false,
emptyOutDir: true,
rollupOptions: {},
rolldownOptions: {},
},
test: {
name: 'jetstream',
Expand Down
193 changes: 179 additions & 14 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,192 @@
{
"migrations": [
{
"cli": "nx",
"version": "22.7.0-beta.0",
"description": "Adds .nx/polygraph to .gitignore",
"implementation": "./dist/src/migrations/update-22-7-0/add-polygraph-to-git-ignore",
"version": "23.0.0-beta.16",
"description": "Consolidates any remaining legacy releaseTag* flat properties into the nested releaseTag object. The flat properties were removed in Nx 23.",
"implementation": "./dist/src/migrations/update-23-0-0/consolidate-release-tag-config",
"package": "nx",
"name": "22-7-0-add-polygraph-to-git-ignore"
"name": "23-0-0-consolidate-release-tag-config"
},
{
"cli": "nx",
"version": "22.7.0-beta.0",
"description": "Adds .nx/self-healing to .gitignore",
"implementation": "./dist/src/migrations/update-22-2-0/add-self-healing-to-gitignore",
"version": "23.0.0-beta.18",
"description": "Adds .nx/migrate-runs to .gitignore",
"implementation": "./dist/src/migrations/update-23-0-0/add-migrate-runs-to-git-ignore",
"package": "nx",
"name": "22-7-0-add-self-healing-to-gitignore"
"name": "23-0-0-add-migrate-runs-to-git-ignore"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/vitest` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/vitest",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.10",
"description": "Rewrites imports of `@nx/workspace/src/utilities/typescript/compilation` to `@nx/js/internal`, where the module now lives.",
"implementation": "./dist/src/migrations/update-23-0-0/move-typescript-compilation-import",
"package": "@nx/workspace",
"name": "23-0-0-move-typescript-compilation-import"
},
{
"version": "23.0.0-beta.25",
"description": "Rewrites `@nx/web/src/*` subpath imports now that the `./src/*` subpath is no longer exposed by `@nx/web`'s exports map. Named imports/exports of public symbols are routed to `@nx/web` and the rest to the new `@nx/web/internal` entry; `require`, dynamic `import` and `jest.mock` calls reference the whole module and are routed to `@nx/web/internal`.",
"implementation": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports",
"package": "@nx/web",
"name": "rewrite-web-internal-subpath-imports"
},
{
"cli": "nx",
"version": "23.0.0-beta.10",
"description": "Rewrites imports of NxReactWebpackPlugin from '@nx/react' to the sub-path '@nx/react/webpack-plugin'.",
"factory": "./dist/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import",
"documentation": "./dist/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import.md",
"package": "@nx/react",
"name": "update-23-0-0-remove-nx-react-webpack-plugin-import"
},
{
"version": "22.7.0-beta.12",
"description": "Add missing inputs to @nx/eslint:lint executor target defaults",
"implementation": "./src/migrations/update-21-6-0/update-executor-lint-inputs",
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/react/router-plugin` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/react",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.25",
"description": "Rewrites `@nx/react/src/*` subpath imports now that the `./src/*` subpath is no longer exposed by `@nx/react`'s exports map. Named imports/exports of public symbols are routed to `@nx/react` and the rest to the new `@nx/react/internal` entry; `require`, dynamic `import` and `jest.mock` calls reference the whole module and are routed to `@nx/react/internal`.",
"implementation": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports",
"package": "@nx/react",
"name": "rewrite-react-internal-subpath-imports"
},
{
"version": "23.0.0-beta.25",
"description": "Rewrites `@nx/node/src/*` subpath imports now that the `./src/*` subpath is no longer exposed by `@nx/node`'s exports map. Named imports/exports of public symbols are routed to `@nx/node` and the rest to the new `@nx/node/internal` entry; `require`, dynamic `import` and `jest.mock` calls reference the whole module and are routed to `@nx/node/internal`.",
"implementation": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports",
"package": "@nx/node",
"name": "rewrite-node-internal-subpath-imports"
},
{
"version": "23.0.0-beta.17",
"description": "Rewrites `@nx/eslint/src/*` subpath imports now that the `./src/*` subpath is no longer exposed by `@nx/eslint`'s exports map. Named imports/exports of public symbols are routed to `@nx/eslint` and the rest to the new `@nx/eslint/internal` entry; `require`, dynamic `import` and `jest.mock` calls reference the whole module and are routed to `@nx/eslint/internal`.",
"implementation": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports",
"package": "@nx/eslint",
"name": "update-executor-lint-inputs"
"name": "rewrite-eslint-internal-subpath-imports"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/eslint/plugin` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/eslint",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/next/plugin` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/next",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.6",
"description": "Rewrite imports from `@nx/devkit/src/...` to `@nx/devkit` (for public symbols) or `@nx/devkit/internal` (for the rest), since deep imports are no longer reachable through the package's `exports` map.",
"implementation": "./dist/src/migrations/update-23-0-0/update-deep-imports",
"documentation": "./dist/src/migrations/update-23-0-0/update-deep-imports.md",
"package": "@nx/devkit",
"name": "update-devkit-deep-imports"
},
{
"version": "23.0.0-beta.24",
"description": "Rename deprecated CreateNodes `V2` type imports (CreateNodesV2, CreateNodesContextV2, CreateNodesResultV2, CreateNodesFunctionV2, NxPluginV2) from `@nx/devkit` to their canonical names.",
"implementation": "./dist/src/migrations/update-23-0-0/rename-create-nodes-v2-types",
"documentation": "./dist/src/migrations/update-23-0-0/rename-create-nodes-v2-types.md",
"package": "@nx/devkit",
"name": "update-23-0-0-rename-create-nodes-v2-types"
},
{
"version": "23.0.0-beta.10",
"description": "Safety net: ensure any remaining @nx/vite:test executor usages are swapped to @nx/vitest:test and @nx/vitest is installed.",
"implementation": "./dist/src/migrations/update-23-0-0/ensure-vitest-package-migration",
"documentation": "./dist/src/migrations/update-23-0-0/ensure-vitest-package-migration.md",
"package": "@nx/vite",
"name": "ensure-vitest-package-migration-23"
},
{
"version": "23.0.0-beta.10",
"requires": {
"vite": ">=8.0.0"
},
"description": "Rename `rollupOptions` to `rolldownOptions` in vite config files (top-level and inside `environments`). Vite 8 replaced Rollup with Rolldown.",
"implementation": "./dist/src/migrations/update-23-0-0/rename-rollup-options-to-rolldown-options",
"documentation": "./dist/src/migrations/update-23-0-0/rename-rollup-options-to-rolldown-options.md",
"package": "@nx/vite",
"name": "rename-rollup-options-to-rolldown-options"
},
{
"version": "23.0.0-beta.10",
"requires": {
"vite": ">=8.0.0"
},
"description": "Create AI Instructions to help migrate users workspaces past breaking changes for Vite 8.",
"prompt": "./dist/src/migrations/update-23-0-0/ai-instructions-for-vite-8.md",
"package": "@nx/vite",
"name": "create-ai-instructions-for-vite-8"
},
{
"version": "23.0.0-beta.22",
"requires": {
"vitest": ">=3.0.0"
},
"description": "Migrate workspaces past breaking changes for Vitest 3.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-to-vitest-3",
"prompt": "./dist/src/migrations/update-23-0-0/ai-instructions-for-vitest-3.md",
"package": "@nx/vite",
"name": "migrate-to-vitest-3"
},
{
"version": "23.0.0-beta.22",
"requires": {
"vitest": ">=4.0.0"
},
"description": "Migrate workspaces past breaking changes for Vitest 4.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-to-vitest-4",
"prompt": "./dist/src/migrations/update-23-0-0/ai-instructions-for-vitest-4.md",
"package": "@nx/vite",
"name": "migrate-to-vitest-4"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/vite/plugin` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/vite",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/playwright/plugin` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/playwright",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
},
{
"version": "23.0.0-beta.14",
"description": "Rewrites `@nx/js/src/*` subpath imports to the new `@nx/js/internal` entry. The `./src/*` wildcard has been removed from `@nx/js`'s exports map; `@nx/js/src/release/version-actions` is preserved as a non-wildcard entry for back-compat with existing nx.json release configs. If a rewritten import resolves to a symbol that lives on the public `@nx/js` entry (e.g. `libraryGenerator`, `extractTsConfigBase`, `resolvePathsBaseUrl`), change the specifier to `@nx/js`.",
"factory": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports",
"package": "@nx/js",
"name": "23-0-0-rewrite-internal-subpath-imports"
},
{
"version": "23.0.0-beta.24",
"description": "Rename imports of `createNodesV2` from `@nx/js/typescript` to the canonical `createNodes` export.",
"implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
"documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md",
"package": "@nx/js",
"name": "update-23-0-0-migrate-create-nodes-v2-import"
}
]
}
7 changes: 1 addition & 6 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,7 @@
},
"@nx/eslint:lint": {
"cache": true,
"inputs": [
"default",
"^default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/eslint.config.js"
]
"inputs": ["default", "^default", "{workspaceRoot}/.eslintrc.json", "{workspaceRoot}/eslint.config.js"]
},
"@nx/vitest:test": {
"cache": true,
Expand Down
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,27 +145,27 @@
"@eslint/js": "~8.57.0",
"@inquirer/prompts": "8.4.2",
"@maxim_mazurok/gapi.client.drive-v3": "0.2.20260602",
"@nx/devkit": "22.7.2",
"@nx/esbuild": "22.7.2",
"@nx/eslint": "22.7.2",
"@nx/eslint-plugin": "22.7.2",
"@nx/express": "22.7.2",
"@nx/js": "22.7.2",
"@nx/next": "22.7.2",
"@nx/node": "22.7.2",
"@nx/playwright": "22.7.2",
"@nx/plugin": "22.7.2",
"@nx/react": "22.7.2",
"@nx/vite": "22.7.2",
"@nx/vitest": "22.7.2",
"@nx/web": "22.7.2",
"@nx/workspace": "22.7.2",
"@nx/devkit": "23.0.1",
"@nx/esbuild": "23.0.1",
"@nx/eslint": "23.0.1",
"@nx/eslint-plugin": "23.0.1",
"@nx/express": "23.0.1",
"@nx/js": "23.0.1",
"@nx/next": "23.0.1",
"@nx/node": "23.0.1",
"@nx/playwright": "23.0.1",
"@nx/plugin": "23.0.1",
"@nx/react": "23.0.1",
"@nx/vite": "23.0.1",
"@nx/vitest": "23.0.1",
"@nx/web": "23.0.1",
"@nx/workspace": "23.0.1",
"@playwright/test": "^1.60.0",
"@release-it/bumper": "^7.0.6",
"@release-it/conventional-changelog": "^11.0.1",
"@sentry/vite-plugin": "^5.2.0",
"@swc-node/register": "1.11.1",
"@swc/cli": "0.7.10",
"@swc/cli": "0.8.1",
"@swc/core": "1.15.8",
"@swc/helpers": "0.5.18",
"@tailwindcss/aspect-ratio": "^0.4.2",
Expand Down Expand Up @@ -203,8 +203,8 @@
"@types/unzipper": "^0.10.11",
"@types/webextension-polyfill": "^0.12.5",
"@types/write-file-atomic": "^4.0.3",
"@typescript-eslint/eslint-plugin": "8.46.2",
"@typescript-eslint/parser": "8.46.2",
"@typescript-eslint/eslint-plugin": "8.62.1",
"@typescript-eslint/parser": "8.62.1",
"@vitejs/plugin-react": "^6.0.2",
"@vitest/coverage-v8": "4.1.7",
"archiver": "^8.0.0",
Expand Down Expand Up @@ -233,7 +233,7 @@
"minimist": "1.2.8",
"next-sitemap": "^4.2.3",
"npm-run-all": "^4.1.5",
"nx": "22.7.2",
"nx": "23.0.1",
"postcss": "^8.5.8",
"postcss-preset-env": "7",
"prettier": "^3.8.4",
Expand All @@ -244,8 +244,9 @@
"tailwindcss": "^4.1.17",
"ts-node": "^10.9.2",
"tsx": "^4.22.4",
"typescript": "6.0.3",
"typescript-eslint": "8.61.0",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"typescript-eslint": "8.62.1",
Comment on lines +247 to +249
"vite": "^8.0.16",
"vite-plugin-dts": "4.5.4",
"vite-plugin-eslint": "^1.8.1",
Expand Down
Loading
Loading