feat(remix): upgrade to latest remix 2.6.0 (#21843)

This commit is contained in:
Colum Ferry 2024-02-16 14:56:46 +00:00 committed by GitHub
parent f29383dc31
commit 90ba36696e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 111 additions and 92 deletions

View File

@ -85,8 +85,8 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@pnpm/lockfile-types": "^5.0.0", "@pnpm/lockfile-types": "^5.0.0",
"@reduxjs/toolkit": "1.9.0", "@reduxjs/toolkit": "1.9.0",
"@remix-run/dev": "^2.3.0", "@remix-run/dev": "^2.6.0",
"@remix-run/node": "^2.3.0", "@remix-run/node": "^2.6.0",
"@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-commonjs": "^20.0.0",
"@rollup/plugin-image": "^2.1.0", "@rollup/plugin-image": "^2.1.0",

View File

@ -49,6 +49,59 @@
"alwaysAddToPackageJson": false "alwaysAddToPackageJson": false
} }
} }
},
"18.1.0": {
"version": "18.1.0-beta.1",
"packages": {
"@remix-run/node": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"@remix-run/react": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"@remix-run/serve": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"@remix-run/dev": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"@remix-run/css-bundle": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"@remix-run/eslint-config": {
"version": "^2.6.0",
"alwaysAddToPackageJson": true
},
"isbot": {
"version": "^4.4.0",
"alwaysAddToPackageJson": true
},
"eslint": {
"version": "^8.56.0",
"alwaysAddToPackageJson": true
},
"@testing-library/react": {
"version": "^14.1.2",
"alwaysAddToPackageJson": false
},
"@testing-library/jest-dom": {
"version": "^6.2.0",
"alwaysAddToPackageJson": false
},
"@testing-library/user-event": {
"version": "^14.5.2",
"alwaysAddToPackageJson": false
},
"typescript": {
"version": "^5.3.3",
"alwaysAddToPackageJson": false
}
}
} }
} }
} }

View File

@ -16,13 +16,13 @@ describe('Remix Init Generator', () => {
const pkgJson = readJson(tree, 'package.json'); const pkgJson = readJson(tree, 'package.json');
expect(pkgJson.dependencies).toMatchInlineSnapshot(` expect(pkgJson.dependencies).toMatchInlineSnapshot(`
{ {
"@remix-run/serve": "^2.3.0", "@remix-run/serve": "^2.6.0",
} }
`); `);
expect(pkgJson.devDependencies).toMatchInlineSnapshot(` expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
{ {
"@nx/web": "0.0.1", "@nx/web": "0.0.1",
"@remix-run/dev": "^2.3.0", "@remix-run/dev": "^2.6.0",
} }
`); `);
@ -67,13 +67,13 @@ describe('Remix Init Generator', () => {
const pkgJson = readJson(tree, 'package.json'); const pkgJson = readJson(tree, 'package.json');
expect(pkgJson.dependencies).toMatchInlineSnapshot(` expect(pkgJson.dependencies).toMatchInlineSnapshot(`
{ {
"@remix-run/serve": "^2.3.0", "@remix-run/serve": "^2.6.0",
} }
`); `);
expect(pkgJson.devDependencies).toMatchInlineSnapshot(` expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
{ {
"@nx/web": "0.0.1", "@nx/web": "0.0.1",
"@remix-run/dev": "^2.3.0", "@remix-run/dev": "^2.6.0",
} }
`); `);
}); });

View File

@ -2,18 +2,18 @@ import { readJson, Tree } from '@nx/devkit';
export const nxVersion = require('../../package.json').version; export const nxVersion = require('../../package.json').version;
export const remixVersion = '^2.3.0'; export const remixVersion = '^2.6.0';
export const isbotVersion = '^3.6.8'; export const isbotVersion = '^4.4.0';
export const reactVersion = '^18.2.0'; export const reactVersion = '^18.2.0';
export const reactDomVersion = '^18.2.0'; export const reactDomVersion = '^18.2.0';
export const typesReactVersion = '^18.2.0'; export const typesReactVersion = '^18.2.0';
export const typesReactDomVersion = '^18.2.0'; export const typesReactDomVersion = '^18.2.0';
export const eslintVersion = '^8.38.0'; export const eslintVersion = '^8.56.0';
export const typescriptVersion = '^5.1.6'; export const typescriptVersion = '^5.3.3';
export const tailwindVersion = '^3.3.0'; export const tailwindVersion = '^3.3.0';
export const testingLibraryReactVersion = '^14.1.2'; export const testingLibraryReactVersion = '^14.1.2';
export const testingLibraryJestDomVersion = '^6.1.4'; export const testingLibraryJestDomVersion = '^6.2.0';
export const testingLibraryUserEventsVersion = '^14.5.1'; export const testingLibraryUserEventsVersion = '^14.5.2';
export function getRemixVersion(tree: Tree): string { export function getRemixVersion(tree: Tree): string {
return getPackageVersion(tree, '@remix-run/dev') ?? remixVersion; return getPackageVersion(tree, '@remix-run/dev') ?? remixVersion;

120
pnpm-lock.yaml generated
View File

@ -333,11 +333,11 @@ devDependencies:
specifier: 1.9.0 specifier: 1.9.0
version: 1.9.0(react-redux@8.0.5)(react@18.2.0) version: 1.9.0(react-redux@8.0.5)(react@18.2.0)
'@remix-run/dev': '@remix-run/dev':
specifier: ^2.3.0 specifier: ^2.6.0
version: 2.3.0(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(ts-node@10.9.1)(typescript@5.3.3)(vite@5.0.8) version: 2.6.0(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(ts-node@10.9.1)(typescript@5.3.3)(vite@5.0.8)
'@remix-run/node': '@remix-run/node':
specifier: ^2.3.0 specifier: ^2.6.0
version: 2.3.0(typescript@5.3.3) version: 2.6.0(typescript@5.3.3)
'@rollup/plugin-babel': '@rollup/plugin-babel':
specifier: ^5.3.0 specifier: ^5.3.0
version: 5.3.1(@babel/core@7.23.2)(rollup@2.79.0) version: 5.3.1(@babel/core@7.23.2)(rollup@2.79.0)
@ -1706,16 +1706,6 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@babel/generator@7.23.0:
resolution: {integrity: sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/types': 7.23.9
'@jridgewell/gen-mapping': 0.3.3
'@jridgewell/trace-mapping': 0.3.21
jsesc: 2.5.2
dev: true
/@babel/generator@7.23.6: /@babel/generator@7.23.6:
resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
@ -2293,14 +2283,6 @@ packages:
chalk: 2.4.2 chalk: 2.4.2
js-tokens: 4.0.0 js-tokens: 4.0.0
/@babel/parser@7.23.0:
resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==}
engines: {node: '>=6.0.0'}
hasBin: true
dependencies:
'@babel/types': 7.23.9
dev: true
/@babel/parser@7.23.6: /@babel/parser@7.23.6:
resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==}
engines: {node: '>=6.0.0'} engines: {node: '>=6.0.0'}
@ -10337,14 +10319,15 @@ packages:
reselect: 4.1.7 reselect: 4.1.7
dev: true dev: true
/@remix-run/dev@2.3.0(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(ts-node@10.9.1)(typescript@5.3.3)(vite@5.0.8): /@remix-run/dev@2.6.0(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)(ts-node@10.9.1)(typescript@5.3.3)(vite@5.0.8):
resolution: {integrity: sha512-Eno0XHyIKo5GyzN4OAwNkgkyl4H1mLWbqeVUA8T5HmVDj+8qJLIcYeayS2BmA1KYAHJBiy5ufAGi2MpaXMjKww==} resolution: {integrity: sha512-wf5DoKxBwz3/84FNyFM6NKvQIOEv+Ukwj9DjXrDs6YLI6oSqw2XsJCxWN4lAbOxXuK37pBt1WAE8LzEMuyowsw==}
engines: {node: '>=18.0.0'} engines: {node: '>=18.0.0'}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
'@remix-run/serve': ^2.3.0 '@remix-run/serve': ^2.6.0
typescript: ^5.1.0 typescript: ^5.1.0
vite: ^4.4.9 || ^5.0.0 vite: ^5.0.0
wrangler: ^3.24.0
peerDependenciesMeta: peerDependenciesMeta:
'@remix-run/serve': '@remix-run/serve':
optional: true optional: true
@ -10352,20 +10335,22 @@ packages:
optional: true optional: true
vite: vite:
optional: true optional: true
wrangler:
optional: true
dependencies: dependencies:
'@babel/core': 7.23.7 '@babel/core': 7.23.9
'@babel/generator': 7.23.0 '@babel/generator': 7.23.6
'@babel/parser': 7.23.0 '@babel/parser': 7.23.9
'@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.7) '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.9)
'@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.7) '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.9)
'@babel/preset-typescript': 7.22.5(@babel/core@7.23.7) '@babel/preset-typescript': 7.22.5(@babel/core@7.23.9)
'@babel/traverse': 7.23.2 '@babel/traverse': 7.23.9
'@babel/types': 7.23.0 '@babel/types': 7.23.9
'@mdx-js/mdx': 2.3.0 '@mdx-js/mdx': 2.3.0
'@npmcli/package-json': 4.0.1 '@npmcli/package-json': 4.0.1
'@remix-run/node': 2.3.0(typescript@5.3.3) '@remix-run/node': 2.6.0(typescript@5.3.3)
'@remix-run/router': 1.12.0-pre.0 '@remix-run/router': 1.15.0
'@remix-run/server-runtime': 2.3.0(typescript@5.3.3) '@remix-run/server-runtime': 2.6.0(typescript@5.3.3)
'@types/mdx': 2.0.10 '@types/mdx': 2.0.10
'@vanilla-extract/integration': 6.2.4(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0) '@vanilla-extract/integration': 6.2.4(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)
arg: 5.0.2 arg: 5.0.2
@ -10388,9 +10373,7 @@ packages:
lodash: 4.17.21 lodash: 4.17.21
lodash.debounce: 4.0.8 lodash.debounce: 4.0.8
minimatch: 9.0.3 minimatch: 9.0.3
node-fetch: 2.6.12
ora: 5.4.1 ora: 5.4.1
parse-multipart-data: 1.5.0
picocolors: 1.0.0 picocolors: 1.0.0
picomatch: 2.3.1 picomatch: 2.3.1
pidtree: 0.6.0 pidtree: 0.6.0
@ -10403,19 +10386,17 @@ packages:
react-refresh: 0.14.0 react-refresh: 0.14.0
remark-frontmatter: 4.0.1 remark-frontmatter: 4.0.1
remark-mdx-frontmatter: 1.1.1 remark-mdx-frontmatter: 1.1.1
semver: 7.5.3 semver: 7.6.0
set-cookie-parser: 2.6.0 set-cookie-parser: 2.6.0
tar-fs: 2.1.1 tar-fs: 2.1.1
tsconfig-paths: 4.1.2 tsconfig-paths: 4.1.2
typescript: 5.3.3 typescript: 5.3.3
undici: 5.27.2
vite: 5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0) vite: 5.0.8(@types/node@18.19.8)(less@4.1.3)(sass@1.55.0)(stylus@0.59.0)
ws: 7.5.9 ws: 7.5.9
transitivePeerDependencies: transitivePeerDependencies:
- '@types/node' - '@types/node'
- bluebird - bluebird
- bufferutil - bufferutil
- encoding
- less - less
- lightningcss - lightningcss
- sass - sass
@ -10427,8 +10408,8 @@ packages:
- utf-8-validate - utf-8-validate
dev: true dev: true
/@remix-run/node@2.3.0(typescript@5.3.3): /@remix-run/node@2.6.0(typescript@5.3.3):
resolution: {integrity: sha512-WQybWc1EWPLMD/btDtchVrhoLvz/ek6MB0gr2cV2N3Sxgn1VaJmpsN3+sUA5lK8vR2S/kOmGun2Ut3tKi8TKHg==} resolution: {integrity: sha512-bWemy3g258Kdqi+4OxIEZ7QS64T96jNK6a7NdlPXGJZqeLpxM5NmlCl/slSdx52oTi9r5Xoz1Tm4uR37nD1/Xw==}
engines: {node: '>=18.0.0'} engines: {node: '>=18.0.0'}
peerDependencies: peerDependencies:
typescript: ^5.1.0 typescript: ^5.1.0
@ -10436,7 +10417,7 @@ packages:
typescript: typescript:
optional: true optional: true
dependencies: dependencies:
'@remix-run/server-runtime': 2.3.0(typescript@5.3.3) '@remix-run/server-runtime': 2.6.0(typescript@5.3.3)
'@remix-run/web-fetch': 4.4.2 '@remix-run/web-fetch': 4.4.2
'@remix-run/web-file': 3.1.0 '@remix-run/web-file': 3.1.0
'@remix-run/web-stream': 1.1.0 '@remix-run/web-stream': 1.1.0
@ -10447,23 +10428,18 @@ packages:
typescript: 5.3.3 typescript: 5.3.3
dev: true dev: true
/@remix-run/router@1.12.0:
resolution: {integrity: sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==}
engines: {node: '>=14.0.0'}
dev: true
/@remix-run/router@1.12.0-pre.0:
resolution: {integrity: sha512-+bBn9KqD2AC0pttSGydVFOZSsT0NqQ1+rGFwMTx9dRANk6oGxrPbKTDxLLikocscGzSL5przvcK4Uxfq8yU7BQ==}
engines: {node: '>=14.0.0'}
dev: true
/@remix-run/router@1.14.2: /@remix-run/router@1.14.2:
resolution: {integrity: sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==} resolution: {integrity: sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
dev: true dev: true
/@remix-run/server-runtime@2.3.0(typescript@5.3.3): /@remix-run/router@1.15.0:
resolution: {integrity: sha512-9BiRK7VPm5nt/aOlRmeROXWA8HKgqjvQy+f9NNpqvf3jj62EUl0h4eUdyqRj6nNh44I+0XUBG7ZQ2xXTrGJATw==} resolution: {integrity: sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==}
engines: {node: '>=14.0.0'}
dev: true
/@remix-run/server-runtime@2.6.0(typescript@5.3.3):
resolution: {integrity: sha512-qFXDl4pK55njBLuvyRn5AkI/hu8fEU3t1XFKv0Syivx0nmUVpWMW25Uzi1pkX/chF1VIxCVrZ8KuQ1rcrKj+DQ==}
engines: {node: '>=18.0.0'} engines: {node: '>=18.0.0'}
peerDependencies: peerDependencies:
typescript: ^5.1.0 typescript: ^5.1.0
@ -10471,10 +10447,10 @@ packages:
typescript: typescript:
optional: true optional: true
dependencies: dependencies:
'@remix-run/router': 1.12.0 '@remix-run/router': 1.15.0
'@types/cookie': 0.5.4 '@types/cookie': 0.6.0
'@web3-storage/multipart-parser': 1.0.0 '@web3-storage/multipart-parser': 1.0.0
cookie: 0.5.0 cookie: 0.6.0
set-cookie-parser: 2.6.0 set-cookie-parser: 2.6.0
source-map: 0.7.3 source-map: 0.7.3
typescript: 5.3.3 typescript: 5.3.3
@ -12880,8 +12856,8 @@ packages:
'@types/node': 18.19.8 '@types/node': 18.19.8
dev: true dev: true
/@types/cookie@0.5.4: /@types/cookie@0.6.0:
resolution: {integrity: sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==} resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
dev: true dev: true
/@types/cytoscape@3.19.9: /@types/cytoscape@3.19.9:
@ -16944,6 +16920,11 @@ packages:
engines: {node: '>= 0.6'} engines: {node: '>= 0.6'}
dev: true dev: true
/cookie@0.6.0:
resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
engines: {node: '>= 0.6'}
dev: true
/cookies@0.8.0: /cookies@0.8.0:
resolution: {integrity: sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==} resolution: {integrity: sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==}
engines: {node: '>= 0.8'} engines: {node: '>= 0.8'}
@ -23440,8 +23421,6 @@ packages:
peerDependenciesMeta: peerDependenciesMeta:
webpack: webpack:
optional: true optional: true
webpack-sources:
optional: true
dependencies: dependencies:
webpack: 5.88.0(@swc/core@1.3.86)(esbuild@0.19.5) webpack: 5.88.0(@swc/core@1.3.86)(esbuild@0.19.5)
webpack-sources: 3.2.3 webpack-sources: 3.2.3
@ -23454,8 +23433,6 @@ packages:
peerDependenciesMeta: peerDependenciesMeta:
webpack: webpack:
optional: true optional: true
webpack-sources:
optional: true
dependencies: dependencies:
webpack: 5.90.1(@swc/core@1.3.86)(esbuild@0.20.0) webpack: 5.90.1(@swc/core@1.3.86)(esbuild@0.20.0)
webpack-sources: 3.2.3 webpack-sources: 3.2.3
@ -26520,10 +26497,6 @@ packages:
engines: {node: '>=6'} engines: {node: '>=6'}
dev: true dev: true
/parse-multipart-data@1.5.0:
resolution: {integrity: sha512-ck5zaMF0ydjGfejNMnlo5YU2oJ+pT+80Jb1y4ybanT27j+zbVP/jkYmCrUGsEln0Ox/hZmuvgy8Ra7AxbXP2Mw==}
dev: true
/parse-node-version@1.0.1: /parse-node-version@1.0.1:
resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==} resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
engines: {node: '>= 0.10'} engines: {node: '>= 0.10'}
@ -32193,13 +32166,6 @@ packages:
/undici-types@5.26.5: /undici-types@5.26.5:
resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
/undici@5.27.2:
resolution: {integrity: sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==}
engines: {node: '>=14.0'}
dependencies:
'@fastify/busboy': 2.0.0
dev: true
/undici@5.28.2: /undici@5.28.2:
resolution: {integrity: sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==} resolution: {integrity: sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==}
engines: {node: '>=14.0'} engines: {node: '>=14.0'}