From 2c43de3eb6683b62b3a2b117b3771bcb928c22db Mon Sep 17 00:00:00 2001 From: Colum Ferry Date: Fri, 15 Mar 2024 16:34:15 +0000 Subject: [PATCH] feat(remix): support version 2.8.0 (#22326) --- package.json | 4 +- packages/remix/migrations.json | 29 ++++++ .../remix/src/generators/init/init.spec.ts | 16 ++-- packages/remix/src/utils/versions.ts | 2 +- pnpm-lock.yaml | 93 ++++++++++++------- 5 files changed, 97 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index bb5e45a1665d27..87d0869b12d506 100644 --- a/package.json +++ b/package.json @@ -85,8 +85,8 @@ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7", "@pnpm/lockfile-types": "^5.0.0", "@reduxjs/toolkit": "1.9.0", - "@remix-run/dev": "^2.6.0", - "@remix-run/node": "^2.6.0", + "@remix-run/dev": "^2.8.1", + "@remix-run/node": "^2.8.1", "@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-image": "^2.1.0", diff --git a/packages/remix/migrations.json b/packages/remix/migrations.json index 117d9931b33ce4..093b4f237dcc91 100644 --- a/packages/remix/migrations.json +++ b/packages/remix/migrations.json @@ -102,6 +102,35 @@ "alwaysAddToPackageJson": false } } + }, + "18.1.1": { + "version": "18.1.1-beta.0", + "packages": { + "@remix-run/node": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + }, + "@remix-run/react": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + }, + "@remix-run/serve": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + }, + "@remix-run/dev": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + }, + "@remix-run/css-bundle": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + }, + "@remix-run/eslint-config": { + "version": "^2.8.0", + "alwaysAddToPackageJson": true + } + } } } } diff --git a/packages/remix/src/generators/init/init.spec.ts b/packages/remix/src/generators/init/init.spec.ts index a8e987a07f05eb..48fc5639d9bf1c 100644 --- a/packages/remix/src/generators/init/init.spec.ts +++ b/packages/remix/src/generators/init/init.spec.ts @@ -16,15 +16,15 @@ describe('Remix Init Generator', () => { const pkgJson = readJson(tree, 'package.json'); expect(pkgJson.dependencies).toMatchInlineSnapshot(` { - "@remix-run/serve": "^2.6.0", + "@remix-run/serve": "^2.8.1", } `); expect(pkgJson.devDependencies).toMatchInlineSnapshot(` - { - "@nx/web": "0.0.1", - "@remix-run/dev": "^2.6.0", - } - `); + { + "@nx/web": "0.0.1", + "@remix-run/dev": "^2.8.1", + } + `); const nxJson = readJson(tree, 'nx.json'); expect(nxJson).toMatchInlineSnapshot(` @@ -67,13 +67,13 @@ describe('Remix Init Generator', () => { const pkgJson = readJson(tree, 'package.json'); expect(pkgJson.dependencies).toMatchInlineSnapshot(` { - "@remix-run/serve": "^2.6.0", + "@remix-run/serve": "^2.8.1", } `); expect(pkgJson.devDependencies).toMatchInlineSnapshot(` { "@nx/web": "0.0.1", - "@remix-run/dev": "^2.6.0", + "@remix-run/dev": "^2.8.1", } `); }); diff --git a/packages/remix/src/utils/versions.ts b/packages/remix/src/utils/versions.ts index 18bccfef45ae90..de737edb8ea79e 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.6.0'; +export const remixVersion = '^2.8.1'; 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 5dc4386d6b0124..6f242976268b37 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -333,11 +333,11 @@ devDependencies: specifier: 1.9.0 version: 1.9.0(react-redux@8.0.5)(react@18.2.0) '@remix-run/dev': - specifier: ^2.6.0 - 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) + specifier: ^2.8.1 + version: 2.8.1(@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': - specifier: ^2.6.0 - version: 2.6.0(typescript@5.3.3) + specifier: ^2.8.1 + version: 2.8.1(typescript@5.3.3) '@rollup/plugin-babel': specifier: ^5.3.0 version: 5.3.1(@babel/core@7.23.2)(rollup@2.79.0) @@ -2813,6 +2813,26 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.2): + resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.2 + '@babel/helper-plugin-utils': 7.22.5 + dev: true + + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.7): + resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.7 + '@babel/helper-plugin-utils': 7.22.5 + dev: true + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} engines: {node: '>=6.9.0'} @@ -3902,8 +3922,8 @@ packages: '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.2) - '@babel/types': 7.23.6 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.2) + '@babel/types': 7.23.9 dev: true /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.23.7): @@ -3916,8 +3936,8 @@ packages: '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.7) - '@babel/types': 7.23.6 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) + '@babel/types': 7.23.9 dev: true /@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.23.2): @@ -9904,15 +9924,15 @@ packages: reselect: 4.1.7 dev: true - /@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-wf5DoKxBwz3/84FNyFM6NKvQIOEv+Ukwj9DjXrDs6YLI6oSqw2XsJCxWN4lAbOxXuK37pBt1WAE8LzEMuyowsw==} + /@remix-run/dev@2.8.1(@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-qFt4jAsAJeIOyg6ngeSnTG/9Z5N9QJfeThP/8wRHc1crqYgTiEtcI3DZ8WlAXjVSF5emgn/ZZKqzLAI02OgMfQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@remix-run/serve': ^2.6.0 + '@remix-run/serve': ^2.8.1 typescript: ^5.1.0 - vite: ^5.0.0 - wrangler: ^3.24.0 + vite: ^5.1.0 + wrangler: ^3.28.2 peerDependenciesMeta: '@remix-run/serve': optional: true @@ -9933,9 +9953,9 @@ packages: '@babel/types': 7.23.9 '@mdx-js/mdx': 2.3.0 '@npmcli/package-json': 4.0.1 - '@remix-run/node': 2.6.0(typescript@5.3.3) - '@remix-run/router': 1.15.0 - '@remix-run/server-runtime': 2.6.0(typescript@5.3.3) + '@remix-run/node': 2.8.1(typescript@5.3.3) + '@remix-run/router': 1.15.3-pre.0 + '@remix-run/server-runtime': 2.8.1(typescript@5.3.3) '@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) arg: 5.0.2 @@ -9993,8 +10013,8 @@ packages: - utf-8-validate dev: true - /@remix-run/node@2.6.0(typescript@5.3.3): - resolution: {integrity: sha512-bWemy3g258Kdqi+4OxIEZ7QS64T96jNK6a7NdlPXGJZqeLpxM5NmlCl/slSdx52oTi9r5Xoz1Tm4uR37nD1/Xw==} + /@remix-run/node@2.8.1(typescript@5.3.3): + resolution: {integrity: sha512-ddCwBVlfLvRxTQJHPcaM1lhfMjsFYG3EGmYpWJIWnnzDX5EbX9pUNHBWisMuH1eA0c7pbw0PbW0UtCttKYx2qg==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -10002,7 +10022,7 @@ packages: typescript: optional: true dependencies: - '@remix-run/server-runtime': 2.6.0(typescript@5.3.3) + '@remix-run/server-runtime': 2.8.1(typescript@5.3.3) '@remix-run/web-fetch': 4.4.2 '@remix-run/web-file': 3.1.0 '@remix-run/web-stream': 1.1.0 @@ -10018,13 +10038,18 @@ packages: engines: {node: '>=14.0.0'} dev: true - /@remix-run/router@1.15.0: - resolution: {integrity: sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==} + /@remix-run/router@1.15.3: + resolution: {integrity: sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==} + engines: {node: '>=14.0.0'} + dev: true + + /@remix-run/router@1.15.3-pre.0: + resolution: {integrity: sha512-JUQb6sztqJpRbsdKpx3D4+6eaGmHU4Yb/QeKrES/ZbLuijlZMOmZ+gV0ohX5vrRDnJHJmcQPq3Tpk0GGPNM9gg==} 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==} + /@remix-run/server-runtime@2.8.1(typescript@5.3.3): + resolution: {integrity: sha512-fh4SOEoONrN73Kvzc0gMDCmYpVRVbvoj9j3BUXHAcn0An8iX+HD/22gU7nTkIBzExM/F9xgEcwTewOnWqLw0Bg==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -10032,7 +10057,7 @@ packages: typescript: optional: true dependencies: - '@remix-run/router': 1.15.0 + '@remix-run/router': 1.15.3 '@types/cookie': 0.6.0 '@web3-storage/multipart-parser': 1.0.0 cookie: 0.6.0 @@ -12583,7 +12608,7 @@ packages: /@types/hast@2.3.4: resolution: {integrity: sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==} dependencies: - '@types/unist': 2.0.6 + '@types/unist': 3.0.0 /@types/hoist-non-react-statics@3.3.1: resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} @@ -12920,10 +12945,10 @@ packages: /@types/unist@2.0.6: resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==} + dev: true /@types/unist@3.0.0: resolution: {integrity: sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w==} - dev: true /@types/use-sync-external-store@0.0.3: resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==} @@ -14886,8 +14911,8 @@ packages: resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/template': 7.22.15 - '@babel/types': 7.23.6 + '@babel/template': 7.23.9 + '@babel/types': 7.23.9 '@types/babel__core': 7.20.1 '@types/babel__traverse': 7.18.2 dev: true @@ -22234,8 +22259,8 @@ packages: '@babel/generator': 7.23.6 '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.9) '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.9) - '@babel/traverse': 7.23.7 - '@babel/types': 7.23.6 + '@babel/traverse': 7.23.9 + '@babel/types': 7.23.9 '@jest/expect-utils': 29.5.0 '@jest/transform': 29.5.0 '@jest/types': 29.6.3 @@ -22920,8 +22945,6 @@ packages: peerDependenciesMeta: webpack: optional: true - webpack-sources: - optional: true dependencies: webpack: 5.88.0(@swc/core@1.3.86)(esbuild@0.19.5) webpack-sources: 3.2.3 @@ -22934,8 +22957,6 @@ packages: peerDependenciesMeta: webpack: optional: true - webpack-sources: - optional: true dependencies: webpack: 5.90.1(@swc/core@1.3.86)(esbuild@0.20.0) webpack-sources: 3.2.3 @@ -31987,9 +32008,9 @@ packages: resolution: {integrity: sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==} hasBin: true dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.23.9 '@babel/standalone': 7.23.10 - '@babel/types': 7.23.6 + '@babel/types': 7.23.9 defu: 6.1.4 jiti: 1.21.0 mri: 1.2.0