Skip to content

Commit

Permalink
feat(remix): upgrade to latest remix 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Coly010 committed Feb 16, 2024
1 parent 73d041b commit 4dbfa52
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 91 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -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.3.0",
"@remix-run/node": "^2.3.0",
"@remix-run/dev": "^2.6.0",
"@remix-run/node": "^2.6.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^20.0.0",
"@rollup/plugin-image": "^2.1.0",
Expand Down
53 changes: 53 additions & 0 deletions packages/remix/migrations.json
Expand Up @@ -49,6 +49,59 @@
"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
}
}
}
}
}
14 changes: 7 additions & 7 deletions packages/remix/src/generators/init/init.spec.ts
Expand Up @@ -15,14 +15,14 @@ describe('Remix Init Generator', () => {
// ASSERT
const pkgJson = readJson(tree, 'package.json');
expect(pkgJson.dependencies).toMatchInlineSnapshot(`
{
"@remix-run/serve": "^2.3.0",
}
`);
{
"@remix-run/serve": "^2.6.0",
}
`);
expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
{
"@nx/web": "0.0.1",
"@remix-run/dev": "^2.3.0",
"@remix-run/dev": "^2.6.0",
}
`);

Expand Down Expand Up @@ -67,13 +67,13 @@ describe('Remix Init Generator', () => {
const pkgJson = readJson(tree, 'package.json');
expect(pkgJson.dependencies).toMatchInlineSnapshot(`
{
"@remix-run/serve": "^2.3.0",
"@remix-run/serve": "^2.6.0",
}
`);
expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
{
"@nx/web": "0.0.1",
"@remix-run/dev": "^2.3.0",
"@remix-run/dev": "^2.6.0",
}
`);
});
Expand Down
12 changes: 6 additions & 6 deletions packages/remix/src/utils/versions.ts
Expand Up @@ -2,18 +2,18 @@ import { readJson, Tree } from '@nx/devkit';

export const nxVersion = require('../../package.json').version;

export const remixVersion = '^2.3.0';
export const isbotVersion = '^3.6.8';
export const remixVersion = '^2.6.0';
export const isbotVersion = '^4.4.0';
export const reactVersion = '^18.2.0';
export const reactDomVersion = '^18.2.0';
export const typesReactVersion = '^18.2.0';
export const typesReactDomVersion = '^18.2.0';
export const eslintVersion = '^8.38.0';
export const typescriptVersion = '^5.1.6';
export const eslintVersion = '^8.56.0';
export const typescriptVersion = '^5.3.3';
export const tailwindVersion = '^3.3.0';
export const testingLibraryReactVersion = '^14.1.2';
export const testingLibraryJestDomVersion = '^6.1.4';
export const testingLibraryUserEventsVersion = '^14.5.1';
export const testingLibraryJestDomVersion = '^6.2.0';
export const testingLibraryUserEventsVersion = '^14.5.2';

export function getRemixVersion(tree: Tree): string {
return getPackageVersion(tree, '@remix-run/dev') ?? remixVersion;
Expand Down
118 changes: 42 additions & 76 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4dbfa52

Please sign in to comment.