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

Remove Cloudflare Vite dev proxy #11617

Merged
merged 4 commits into from
Jun 6, 2024
+16 −815
Merged

Remove Cloudflare Vite dev proxy #11617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86c7400
Remove Cloudflare Vite dev proxy
markdalgleish Jun 6, 2024
7989260
Remove re-export
markdalgleish Jun 6, 2024
f5573ca
Merge branch 'v7' into markdalgleish/remove-cloudflare-dev-proxy
markdalgleish Jun 6, 2024
9ea6e1e
Remove Cloudflare deps
markdalgleish Jun 6, 2024
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
3 changes: 1 addition & 2 deletions integration/helpers/vite-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"typescript": "^5.1.6",
"vite": "^5.1.0",
"vite-env-only": "^2.0.0",
"vite-tsconfig-paths": "^4.2.1",
"wrangler": "^3.24.0"
"vite-tsconfig-paths": "^4.2.1"
},
"engines": {
"node": ">=18.0.0"
Expand Down
5 changes: 1 addition & 4 deletions integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"typecheck": "tsc"
},
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.3.0",
"@cloudflare/workers-types": "^4.20230518.0",
"@playwright/test": "^1.33.0",
"@react-router/dev": "workspace:*",
"@react-router/express": "workspace:*",
Expand Down Expand Up @@ -42,7 +40,6 @@
"tailwindcss": "^3.3.0",
"type-fest": "^4.0.0",
"typescript": "^5.1.0",
"vite-tsconfig-paths": "^4.2.2",
"wrangler": "^3.28.2"
"vite-tsconfig-paths": "^4.2.2"
}
}
2 changes: 0 additions & 2 deletions integration/playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { devices } from "@playwright/test";
const config: PlaywrightTestConfig = {
testDir: ".",
testMatch: ["**/*-test.ts"],
// TODO: Temporary! Remove from this list as we get each suite passing
testIgnore: ["**/vite-cloudflare-test.ts"],
// Playwright treats our workspace packages as internal by default. If we
// don't mark them as external, tests hang in Node 20.5.2+
build: {
Expand Down
156 changes: 0 additions & 156 deletions integration/vite-cloudflare-test.ts
View file
Open in desktop

This file was deleted.

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 @@ -7,4 +7,4 @@ export type {
ServerBundlesFunction,
VitePluginConfig,
} from "./config";
export { vitePlugin, cloudflareDevProxyVitePlugin } from "./vite";
export { vitePlugin } from "./vite";
9 changes: 2 additions & 7 deletions packages/remix-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@
"fast-glob": "3.2.11",
"strip-ansi": "^6.0.1",
"tiny-invariant": "^1.2.0",
"vite": "^5.1.0",
"wrangler": "^3.28.2"
"vite": "^5.1.0"
},
"peerDependencies": {
"react-router": "workspace:^",
"@react-router/serve": "workspace:^",
"typescript": "^5.1.0",
"vite": "^5.1.0",
"wrangler": "^3.28.2"
"vite": "^5.1.0"
},
"peerDependenciesMeta": {
"@react-router/serve": {
Expand All @@ -90,9 +88,6 @@
},
"vite": {
"optional": true
},
"wrangler": {
"optional": true
}
},
"engines": {
Expand Down
87 changes: 0 additions & 87 deletions packages/remix-dev/vite/cloudflare-proxy-plugin.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/remix-dev/vite/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ export const vitePlugin: ReactRouterVitePlugin = (...args) => {
require("./plugin") as typeof import("./plugin");
return reactRouterVitePlugin(...args);
};

export { cloudflareDevProxyVitePlugin } from "./cloudflare-proxy-plugin";
Loading
Loading