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.

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

Update minimum wrangler to v3.91.0 and remove defunct experimental json config flags #72

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions apps/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev:remix": "remix vite:dev",
"dev:docs": "node ./scripts/serve-local-docs.mjs",
"dev": "concurrently \"npm:dev:*\"",
"start": "wrangler -j dev",
"typegen": "wrangler -j types",
"start": "wrangler dev",
"typegen": "wrangler types",
"typecheck": "tsc"
},
"browserslist": "defaults, not ie <= 11",
Expand Down Expand Up @@ -52,6 +52,6 @@
"typescript": "^5",
"vite": "^5.3.4",
"vite-tsconfig-paths": "^4.3.2",
"wrangler": "^3.80.0"
"wrangler": "^3.91.0"
}
}
3 changes: 1 addition & 2 deletions apps/site/worker-configuration.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Generated by Wrangler on Wed Jul 17 2024 14:59:51 GMT-0700 (Pacific Daylight Time)
// by running `wrangler -j types`
// Generated by Wrangler by running `wrangler types`

interface Env {
DOCSEARCH_APP_ID: string;
Expand Down
8 changes: 4 additions & 4 deletions examples/remix-cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"deploy": "wrangler -j deploy",
"deploy": "wrangler deploy",
"dev": "superflare dev",
"start": "wrangler -j dev",
"start": "wrangler dev",
"migrate": "superflare migrate",
"typegen": "wrangler -j types",
"typegen": "wrangler types",
"typecheck": "tsc"
},
"keywords": [],
Expand Down Expand Up @@ -52,7 +52,7 @@
"typescript": "^5",
"vite": "^5.3.4",
"vite-tsconfig-paths": "^4.3.2",
"wrangler": "^3.80.0"
"wrangler": "^3.91.0"
},
"engines": {
"node": ">=16.13"
Expand Down
5 changes: 2 additions & 3 deletions examples/remix-cms/worker-configuration.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Generated by Wrangler on Mon Jul 22 2024 14:04:46 GMT-0700 (Pacific Daylight Time)
// by running `wrangler -j types`
// Generated by Wrangler by running `wrangler types`

interface Env {
APP_KEY: string;
CHANNELS: DurableObjectNamespace;
CHANNELS: DurableObjectNamespace /* Channel from remix-cms */;
REMIX_CMS_MEDIA: R2Bucket;
DB: D1Database;
QUEUE: Queue;
Expand Down
2 changes: 0 additions & 2 deletions packages/superflare-remix/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ export function superflareDevProxyVitePlugin<Env extends { APP_KEY: string }>(
options: GetPlatformProxyOptions = {}
): Plugin {
const ctx = new ExecutionContext();
options = { experimentalJsonConfig: true, ...options };

const remixVitePlugin = cloudflareDevProxyVitePlugin(options);

return {
Expand Down
4 changes: 2 additions & 2 deletions packages/superflare-remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
"tsup": "^6.6.3",
"typescript": "^5",
"vite": "^5",
"wrangler": "^3.80"
"wrangler": "^3.91.0"
},
"peerDependencies": {
"@remix-run/cloudflare": "^2.12.1",
"@remix-run/dev": "^2.12.1",
"@remix-run/server-runtime": "^2.12.1",
"wrangler": "^3.80"
"wrangler": "^3.91.0"
},
"dependencies": {
"superflare": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/superflare/cli/d1-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export async function getD1Database(dbName: string, logger = console.log) {
"wrangler",
logger
);
const { env } = await getPlatformProxy({ experimentalJsonConfig: true });
const { env } = await getPlatformProxy();
return env[dbName] as D1DatabaseType | undefined;
}
2 changes: 1 addition & 1 deletion packages/superflare/cli/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export async function devHandler(
process.exit(1);
}

spawn("wrangler", ["dev", "-j", "--no-bundle"], {
spawn("wrangler", ["dev", "--no-bundle"], {
stdio: "ignore",
shell: true,
env: process.env,
Expand Down
1 change: 0 additions & 1 deletion packages/superflare/cli/wrangler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,5 @@ export async function wranglerMigrate(dbName: string) {
"apply",
dbName,
"--local",
"-j",
]);
}
1 change: 0 additions & 1 deletion packages/superflare/docs/deploying.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ To deploy your Superflare app to production, you'll need to use `npx wrangler`.

- Make sure you've run D1 migrations against your production database before deploying with `npx wrangler d1 migrations apply <DB_NAME> --remote`.
- Make sure you've set an `APP_KEY` secret with `npx wrangler secret put APP_KEY`.
- If you're using `wrangler.json` to store your config, be sure to pass the `-j` flag after each `wrangler` command. I'm sorry, but I'm also not sorry.
2 changes: 1 addition & 1 deletion packages/superflare/docs/reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ npx wrangler d1 migrations apply DB --remote

## `superflare dev`

The `dev` command starts a local development server for your Superflare app. It’s a wrapper around two commands: `remix vite:dev` (starts the main Vite dev server) and `wrangler dev -j` (enables working with [Durable Object bindings](https://developers.cloudflare.com/workers/wrangler/api/#supported-bindings)). You can use it directly or put it in your `package.json`’s scripts: `"dev": "superflare dev"`.
The `dev` command starts a local development server for your Superflare app. It’s a wrapper around two commands: `remix vite:dev` (starts the main Vite dev server) and `wrangler dev --no-bundle` (enables working with [Durable Object bindings](https://developers.cloudflare.com/workers/wrangler/api/#supported-bindings)). You can use it directly or put it in your `package.json`’s scripts: `"dev": "superflare dev"`.

## `superflare generate`

Expand Down
2 changes: 1 addition & 1 deletion packages/superflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"pluralize": "^8.0.0",
"tar-fs": "^2.1.1",
"tiny-invariant": "^1.3.1",
"wrangler": "^3.80",
"wrangler": "^3.91.0",
"yargs": "^17.6.2"
},
"devDependencies": {
Expand Down
Loading
Loading