Skip to content

Commit

Permalink
chore: give integration tests a real version
Browse files Browse the repository at this point in the history
Signed-off-by: Logan McAnsh <logan@mcan.sh>
  • Loading branch information
mcansh committed Mar 6, 2023
1 parent b635550 commit 56c3868
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion integration/cf-compiler-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.describe("cloudflare compiler", () => {
"@remix-run/react": "0.0.0-local-version",
isbot: "0.0.0-local-version",
react: "0.0.0-local-version",
"react-dom": "0.0.0-local-version",
"react-dom": "^18.2.0",
"worker-pkg": "0.0.0-local-version",
"browser-pkg": "0.0.0-local-version",
"esm-only-pkg": "0.0.0-local-version",
Expand Down
2 changes: 1 addition & 1 deletion integration/deno-compiler-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test.beforeAll(async () => {
"@remix-run/react": "0.0.0-local-version",
isbot: "0.0.0-local-version",
react: "0.0.0-local-version",
"react-dom": "0.0.0-local-version",
"react-dom": "^18.2.0",
component: "0.0.0-local-version",
"deno-pkg": "0.0.0-local-version",
},
Expand Down
2 changes: 1 addition & 1 deletion integration/esm-only-warning-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.beforeAll(async () => {
"@remix-run/serve": "0.0.0-local-version",
isbot: "0.0.0-local-version",
react: "0.0.0-local-version",
"react-dom": "0.0.0-local-version",
"react-dom": "^18.2.0",
"esm-only-no-exports": "0.0.0-local-version",
"esm-only-exports": "0.0.0-local-version",
"esm-only-sub-exports": "0.0.0-local-version",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/cf-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@remix-run/cloudflare-workers": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@cloudflare/workers-types": "0.0.0-local-version",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/deno-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@remix-run/deno": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "0.0.0-local-version"
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/node-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@remix-run/react": "0.0.0-local-version",
"@remix-run/serve": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "0.0.0-local-version",
Expand Down
4 changes: 2 additions & 2 deletions integration/hmr-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ let fixture = (options: { port: number; appServerPort: number }) => ({
"express": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"nodemon": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwindcss": "0.0.0-local-version"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/remix-dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ export async function readConfig(
let pkgJson = await NPMCliPackageJson.load(remixRoot);
let deps = pkgJson.content.dependencies ?? {};

// TODO: check for experimental releases
let reactVersion = lte(deps.react, "18.0.0") ? "17" : "18";
if (!reactVersion) {
let react = ["react", "react-dom"];
Expand Down

0 comments on commit 56c3868

Please sign in to comment.