Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: remove auto globals install #7009

Merged
merged 7 commits into from
Aug 2, 2023
Merged

feat!: remove auto globals install #7009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
860f42d
feat!: remove auto globals install
jacob-ebey Jul 31, 2023
8ba9106
install globals in remix-serve
jacob-ebey Aug 1, 2023
12565a1
install globals in integration fixture env
jacob-ebey Aug 1, 2023
9e91120
Merge branch 'dev' into v2-remove-auto-globals-install
jacob-ebey Aug 1, 2023
26e60af
ignore
jacob-ebey Aug 2, 2023
b1861cf
Merge branch 'dev' of https://github.com/remix-run/remix into v2-remo…
jacob-ebey Aug 2, 2023
e214b51
install globals in HMR tests
jacob-ebey Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'dev' of https://github.com/remix-run/remix into v2-remo… 
…ve-auto-globals-install
  • Loading branch information
@jacob-ebey
jacob-ebey committed Aug 2, 2023
commit b1861cf5be5bc8fbf9782675ee284955165737d9
2 changes: 1 addition & 1 deletion docs/guides/typescript.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The Remix compiler will not do any type checking (it simply removes the types).
"@types/react": "^17.0.38",
"@types/react-dom": "^17.0.11",
"eslint": "^8.23.1",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"tailwindcss": "^3.3.0",
"to-vfile": "7.2.3",
"type-fest": "^2.16.0",
"typescript": "^5.0.4",
"typescript": "^5.1.0",
"unified": "^10.1.2",
"unist-util-remove": "^3.1.0",
"unist-util-visit": "^4.1.1"
Expand Down
11 changes: 10 additions & 1 deletion packages/remix-architect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@
},
"devDependencies": {
"@types/lambda-tester": "^3.6.1",
"lambda-tester": "^4.0.1"
"lambda-tester": "^4.0.1",
"typescript": "^5.1.0"
},
"peerDependencies": {
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-cloudflare-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
"@types/mime": "^2.0.3"
"@types/mime": "^2.0.3",
"typescript": "^5.1.0"
},
"peerDependencies": {
"@cloudflare/workers-types": "^4.0.0"
"@cloudflare/workers-types": "^4.0.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-cloudflare-workers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@
"@remix-run/cloudflare": "1.19.1"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0"
"@cloudflare/workers-types": "^4.20230518.0",
"typescript": "^5.1.0"
},
"peerDependencies": {
"@cloudflare/workers-types": "^4.0.0"
"@cloudflare/workers-types": "^4.0.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@
"@remix-run/server-runtime": "1.19.1"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0"
"@cloudflare/workers-types": "^4.20230518.0",
"typescript": "^5.1.0"
},
"peerDependencies": {
"@cloudflare/workers-types": "^4.0.0"
"@cloudflare/workers-types": "^4.0.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
8 changes: 8 additions & 0 deletions packages/remix-deno/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"@remix-run/server-runtime": "1.19.1",
"mime": "^3.0.0"
},
"peerDependencies": {
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/__tests__/fixtures/cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/react-dom": "^18.0.8",
"eslint": "^8.27.0",
"npm-run-all": "^4.1.5",
"typescript": "^5.0.4",
"typescript": "^5.1.0",
"wrangler": "^2.2.1"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/__tests__/fixtures/indie-stack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@types/node": "^17.0.35",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/__tests__/fixtures/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.8",
"eslint": "^8.27.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ export type { AppConfig, RemixConfig as ResolvedRemixConfig } from "./config";

export * as cli from "./cli/index";

export { type Manifest as AssetsManifest } from "./manifest";
export type { Manifest as AssetsManifest } from "./manifest";
export { getDependenciesToBundle } from "./dependencies";
6 changes: 5 additions & 1 deletion packages/remix-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,15 @@
"type-fest": "^2.16.0"
},
"peerDependencies": {
"@remix-run/serve": "^1.19.1"
"@remix-run/serve": "^1.19.1",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"@remix-run/serve": {
"optional": true
},
"typescript": {
"optional": true
}
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"eslint": "^8.37.0",
"jest": "^27.5.1",
"react": "^18.2.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"peerDependencies": {
"eslint": "^8.0.0",
"react": "^17.0.0 || ^18.0.0",
"typescript": "^4.0.0 || ^5.0.0"
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,17 @@
"@types/supertest": "^2.0.10",
"express": "^4.17.1",
"node-mocks-http": "^1.10.1",
"supertest": "^6.1.5"
"supertest": "^6.1.5",
"typescript": "^5.1.0"
},
"peerDependencies": {
"express": "^4.17.1"
"express": "^4.17.1",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-netlify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@
"@remix-run/node": "1.19.1"
},
"devDependencies": {
"@netlify/functions": "^1.0.0"
"@netlify/functions": "^1.0.0",
"typescript": "^5.1.0"
},
"peerDependencies": {
"@netlify/functions": "^1.0.0"
"@netlify/functions": "^1.0.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
13 changes: 12 additions & 1 deletion packages/remix-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,21 @@
"@web3-storage/multipart-parser": "^1.0.0",
"abort-controller": "^3.0.0",
"cookie-signature": "^1.1.0",
"source-map-support": "^0.5.21",
"stream-slice": "^0.1.2"
},
"devDependencies": {
"@types/cookie-signature": "^1.0.3"
"@types/cookie-signature": "^1.0.3",
"@types/source-map-support": "^0.5.4",
"typescript": "^5.1.0"
},
"peerDependencies": {
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,18 @@
"@types/react": "^18.0.15",
"abort-controller": "^3.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"typescript": "^5.1.0"
},
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0"
"react-dom": ">=16.8.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 10 additions & 1 deletion packages/remix-server-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,16 @@
},
"devDependencies": {
"@remix-run/web-file": "^3.0.2",
"@types/set-cookie-parser": "^2.4.1"
"@types/set-cookie-parser": "^2.4.1",
"typescript": "^5.1.0"
},
"peerDependencies": {
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
10 changes: 8 additions & 2 deletions packages/remix-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,16 @@
"@types/react-dom": "^18.0.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"peerDependencies": {
"react": "^17.0.0 || ^18.0.0"
"react": "^17.0.0 || ^18.0.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
11 changes: 9 additions & 2 deletions packages/remix-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,17 @@
"@types/supertest": "^2.0.10",
"@vercel/node": "^2.12.0",
"node-mocks-http": "^1.10.1",
"supertest": "^6.1.5"
"supertest": "^6.1.5",
"typescript": "^5.1.0"
},
"peerDependencies": {
"@vercel/node": "^2.4.0"
"@vercel/node": "^2.4.0",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion scripts/playground/template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"tailwindcss": "^3.1.8",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/arc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/react-dom": "^18.0.11",
"@types/source-map-support": "^0.5.6",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/cloudflare-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
"typescript": "^5.0.4",
"typescript": "^5.1.0",
"wrangler": "^3.1.1"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion templates/cloudflare-workers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
"typescript": "^5.0.4",
"typescript": "^5.1.0",
"wrangler": "^3.1.1"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion templates/express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@types/source-map-support": "^0.5.6",
"chokidar": "^3.5.3",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/fly/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/netlify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/react-dom": "^18.0.11",
"@types/source-map-support": "^0.5.6",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/remix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
4 changes: 0 additions & 4 deletions templates/vercel/.eslintrc.js
View file
Open in desktop

This file was deleted.

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.