diff --git a/package.json b/package.json index d2f35769ac..2249f4b4cc 100644 --- a/package.json +++ b/package.json @@ -93,8 +93,8 @@ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7", "@pnpm/lockfile-types": "^6.0.0", "@reduxjs/toolkit": "1.9.0", - "@remix-run/dev": "^2.13.1", - "@remix-run/node": "^2.13.1", + "@remix-run/dev": "^2.14.0", + "@remix-run/node": "^2.14.0", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-image": "^3.0.3", diff --git a/packages/remix/migrations.json b/packages/remix/migrations.json index 6dd420c0ae..0a2b0b2ed2 100644 --- a/packages/remix/migrations.json +++ b/packages/remix/migrations.json @@ -133,31 +133,71 @@ } }, "20.1.0": { - "version": "20.1.0-beta.0", + "version": "20.1.0-beta.5", "packages": { "@remix-run/node": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true }, "@remix-run/react": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true }, "@remix-run/serve": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true }, "@remix-run/dev": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true }, "@remix-run/css-bundle": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true }, "@remix-run/eslint-config": { - "version": "^2.13.1", + "version": "^2.14.0", "alwaysAddToPackageJson": true + }, + "@remix-run/server-runtime": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/testing": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/express": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/cloudflare": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/cloudflare-pages": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/cloudflare-workers": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/architect": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/deno": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/route-config": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false + }, + "@remix-run/fs-routes": { + "version": "^2.14.0", + "alwaysAddToPackageJson": false } } } diff --git a/packages/remix/package.json b/packages/remix/package.json index b98b902165..d4bead6e31 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -36,7 +36,7 @@ "@phenomnomnominal/tsquery": "~5.0.1" }, "peerDependencies": { - "@remix-run/dev": "^2.13.1" + "@remix-run/dev": "^2.14.0" }, "publishConfig": { "access": "public" diff --git a/packages/remix/src/generators/init/init.spec.ts b/packages/remix/src/generators/init/init.spec.ts index 8fc1d44e83..e846bdc6be 100644 --- a/packages/remix/src/generators/init/init.spec.ts +++ b/packages/remix/src/generators/init/init.spec.ts @@ -18,13 +18,13 @@ describe('Remix Init Generator', () => { const pkgJson = readJson(tree, 'package.json'); expect(pkgJson.dependencies).toMatchInlineSnapshot(` { - "@remix-run/serve": "^2.13.1", + "@remix-run/serve": "^2.14.0", } `); expect(pkgJson.devDependencies).toMatchInlineSnapshot(` { "@nx/web": "0.0.1", - "@remix-run/dev": "^2.13.1", + "@remix-run/dev": "^2.14.0", } `); @@ -70,13 +70,13 @@ describe('Remix Init Generator', () => { const pkgJson = readJson(tree, 'package.json'); expect(pkgJson.dependencies).toMatchInlineSnapshot(` { - "@remix-run/serve": "^2.13.1", + "@remix-run/serve": "^2.14.0", } `); expect(pkgJson.devDependencies).toMatchInlineSnapshot(` { "@nx/web": "0.0.1", - "@remix-run/dev": "^2.13.1", + "@remix-run/dev": "^2.14.0", } `); }); diff --git a/packages/remix/src/utils/versions.ts b/packages/remix/src/utils/versions.ts index b399a2828f..840e5f4100 100644 --- a/packages/remix/src/utils/versions.ts +++ b/packages/remix/src/utils/versions.ts @@ -2,7 +2,7 @@ import { readJson, Tree } from '@nx/devkit'; export const nxVersion = require('../../package.json').version; -export const remixVersion = '^2.13.1'; +export const remixVersion = '^2.14.0'; export const isbotVersion = '^4.4.0'; export const reactVersion = '^18.2.0'; export const reactDomVersion = '^18.2.0'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10c855cae9..8cac4a012c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -368,11 +368,11 @@ importers: specifier: 1.9.0 version: 1.9.0(react-redux@8.0.5(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1))(react@18.3.1) '@remix-run/dev': - specifier: ^2.13.1 - version: 2.13.1(@remix-run/react@2.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(typescript@5.5.4))(typescript@5.5.4)(vite@5.0.8(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)) + specifier: ^2.14.0 + version: 2.14.0(@remix-run/react@2.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(typescript@5.5.4))(typescript@5.5.4)(vite@5.0.8(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)) '@remix-run/node': - specifier: ^2.13.1 - version: 2.13.1(typescript@5.5.4) + specifier: ^2.14.0 + version: 2.14.0(typescript@5.5.4) '@rollup/plugin-babel': specifier: ^6.0.4 version: 6.0.4(@babel/core@7.25.2)(@types/babel__core@7.20.5)(rollup@4.22.0) @@ -5323,13 +5323,13 @@ packages: react-redux: optional: true - '@remix-run/dev@2.13.1': - resolution: {integrity: sha512-7+06Dail6zMyRlRvgrZ4cmQjs2gUb+M24iP4jbmql+0B7VAAPwzCRU0x+BF5z8GSef13kDrH3iXv/BQ2O2yOgw==} + '@remix-run/dev@2.14.0': + resolution: {integrity: sha512-WMun4fy0ANh92WecufUNb3IV/R02uyfBslM7g7nCO1/lzDII+XmfEkZY5CWPaLmnkoAc1DR2G60+eTHRo480Ug==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@remix-run/react': ^2.13.1 - '@remix-run/serve': ^2.13.1 + '@remix-run/react': ^2.14.0 + '@remix-run/serve': ^2.14.0 typescript: ^5.1.0 vite: ^5.1.0 wrangler: ^3.28.2 @@ -5343,8 +5343,8 @@ packages: wrangler: optional: true - '@remix-run/node@2.13.1': - resolution: {integrity: sha512-2ly7bENj2n2FNBdEN60ZEbNCs5dAOex/QJoo6EZ8RNFfUQxVKAZkMwfQ4ETV2SLWDgkRLj3Jo5n/dx7O2ZGhGw==} + '@remix-run/node@2.14.0': + resolution: {integrity: sha512-ou16LMJYv0ElIToZ6dDqaLjv1T3iBEwuJTBahveEA8NkkACIWODJ2fgUYf1UKLMKHVdHjNImLzS37HdSZY0Q6g==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -5367,8 +5367,8 @@ packages: resolution: {integrity: sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==} engines: {node: '>=14.0.0'} - '@remix-run/router@1.20.0': - resolution: {integrity: sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==} + '@remix-run/router@1.21.0': + resolution: {integrity: sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==} engines: {node: '>=14.0.0'} '@remix-run/server-runtime@2.12.0': @@ -5380,8 +5380,8 @@ packages: typescript: optional: true - '@remix-run/server-runtime@2.13.1': - resolution: {integrity: sha512-2DfBPRcHKVzE4bCNsNkKB50BhCCKF73x+jiS836OyxSIAL+x0tguV2AEjmGXefEXc5AGGzoxkus0AUUEYa29Vg==} + '@remix-run/server-runtime@2.14.0': + resolution: {integrity: sha512-9Th9UzDaoFFBD7zA5mRI1KT8JktFLN4ij9jPygrKBhG/kYmNIvhcMtq9VyjcbMvFK5natTyhOhrrKRIHtijD4w==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -16478,6 +16478,14 @@ packages: resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==} engines: {node: '>=10.12.0'} + valibot@0.41.0: + resolution: {integrity: sha512-igDBb8CTYr8YTQlOKgaN9nSS0Be7z+WRuaeYqGf3Cjz3aKmSnqEmYnkfVjzIuumGqfHpa3fLIvMEAfhrpqN8ng==} + peerDependencies: + typescript: '>=5' + peerDependenciesMeta: + typescript: + optional: true + validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} @@ -22645,7 +22653,7 @@ snapshots: react: 18.3.1 react-redux: 8.0.5(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@4.2.1) - '@remix-run/dev@2.13.1(@remix-run/react@2.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(typescript@5.5.4))(typescript@5.5.4)(vite@5.0.8(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6))': + '@remix-run/dev@2.14.0(@remix-run/react@2.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6)(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(typescript@5.5.4))(typescript@5.5.4)(vite@5.0.8(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6))': dependencies: '@babel/core': 7.25.2 '@babel/generator': 7.25.6 @@ -22657,10 +22665,10 @@ snapshots: '@babel/types': 7.25.6 '@mdx-js/mdx': 2.3.0 '@npmcli/package-json': 4.0.1 - '@remix-run/node': 2.13.1(typescript@5.5.4) + '@remix-run/node': 2.14.0(typescript@5.5.4) '@remix-run/react': 2.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4) - '@remix-run/router': 1.20.0 - '@remix-run/server-runtime': 2.13.1(typescript@5.5.4) + '@remix-run/router': 1.21.0 + '@remix-run/server-runtime': 2.14.0(typescript@5.5.4) '@types/mdx': 2.0.13 '@vanilla-extract/integration': 6.5.0(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6) arg: 5.0.2 @@ -22700,6 +22708,8 @@ snapshots: set-cookie-parser: 2.7.0 tar-fs: 2.1.1 tsconfig-paths: 4.2.0 + valibot: 0.41.0(typescript@5.5.4) + vite-node: 1.6.0(@types/node@20.16.10)(less@4.1.3)(sass@1.55.0)(stylus@0.64.0)(terser@5.31.6) ws: 7.5.10 optionalDependencies: typescript: 5.5.4 @@ -22720,9 +22730,9 @@ snapshots: - ts-node - utf-8-validate - '@remix-run/node@2.13.1(typescript@5.5.4)': + '@remix-run/node@2.14.0(typescript@5.5.4)': dependencies: - '@remix-run/server-runtime': 2.13.1(typescript@5.5.4) + '@remix-run/server-runtime': 2.14.0(typescript@5.5.4) '@remix-run/web-fetch': 4.4.2 '@web3-storage/multipart-parser': 1.0.0 cookie-signature: 1.2.1 @@ -22746,7 +22756,7 @@ snapshots: '@remix-run/router@1.19.2': {} - '@remix-run/router@1.20.0': {} + '@remix-run/router@1.21.0': {} '@remix-run/server-runtime@2.12.0(typescript@5.5.4)': dependencies: @@ -22760,9 +22770,9 @@ snapshots: optionalDependencies: typescript: 5.5.4 - '@remix-run/server-runtime@2.13.1(typescript@5.5.4)': + '@remix-run/server-runtime@2.14.0(typescript@5.5.4)': dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0 '@types/cookie': 0.6.0 '@web3-storage/multipart-parser': 1.0.0 cookie: 0.6.0 @@ -36520,6 +36530,10 @@ snapshots: '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 + valibot@0.41.0(typescript@5.5.4): + optionalDependencies: + typescript: 5.5.4 + validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0