Skip to content

Commit 0e3cf3b

Browse files
authored
Merge branch 'main' into rename-FreshContext-req-to-request
2 parents e8f53bd + 9975d16 commit 0e3cf3b

25 files changed

Lines changed: 746 additions & 482 deletions

deno.lock

Lines changed: 193 additions & 377 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/build-id/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fresh/build-id",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"license": "MIT",
55
"exports": {
66
".": "./mod.ts"

packages/build-id/mod.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export const DENO_DEPLOYMENT_ID: string | undefined = Deno.env.get(
66
const deploymentId = DENO_DEPLOYMENT_ID ||
77
// For CI
88
Deno.env.get("GITHUB_SHA") ||
9+
Deno.env.get("CI_COMMIT_SHA") ||
910
crypto.randomUUID();
1011
const buildIdHash = await crypto.subtle.digest(
1112
"SHA-1",

packages/fresh/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fresh/core",
3-
"version": "2.0.0-alpha.58",
3+
"version": "2.0.0-alpha.60",
44
"license": "MIT",
55
"exports": {
66
".": "./src/mod.ts",

packages/fresh/src/dev/update_check_test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,11 @@ Deno.test("migrates to last_shown property", async () => {
274274
stdout: "piped",
275275
}).output();
276276

277-
const { stdout } = getStdOutput(out);
277+
const { stdout, stderr } = getStdOutput(out);
278+
if (stdout === "") {
279+
// deno-lint-ignore no-console
280+
console.log(stderr);
281+
}
278282
expect(stdout).toMatch(/Fresh .* is available/);
279283

280284
const checkFileAfter = JSON.parse(

packages/fresh/tests/test_utils.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,15 @@ export async function withBrowser(fn: (page: Page) => void | Promise<void>) {
9595
}
9696
}
9797

98+
export interface TestChildServerOptions {
99+
cwd: string;
100+
args: string[];
101+
bin?: string;
102+
env?: Record<string, string>;
103+
}
104+
98105
export async function withChildProcessServer(
99-
options: {
100-
cwd: string;
101-
args: string[];
102-
bin?: string;
103-
env?: Record<string, string>;
104-
},
106+
options: TestChildServerOptions,
105107
fn: (address: string) => void | Promise<void>,
106108
) {
107109
const aborter = new AbortController();

packages/init/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fresh/init",
3-
"version": "2.0.0-alpha.58",
3+
"version": "2.0.0-alpha.60",
44
"license": "MIT",
55
"exports": "./src/mod.ts",
66
"exclude": ["**/tmp/*"],

packages/init/src/init.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import * as colors from "@std/fmt/colors";
33
import * as path from "@std/path";
44

55
// Keep these as is, as we replace these version in our release script
6-
const FRESH_VERSION = "2.0.0-alpha.58";
6+
const FRESH_VERSION = "2.0.0-alpha.60";
77
const FRESH_TAILWIND_VERSION = "0.0.1-alpha.9";
8-
const PREACT_VERSION = "10.27.0";
9-
const PREACT_SIGNALS_VERSION = "2.2.1";
8+
const PREACT_VERSION = "10.27.1";
9+
const PREACT_SIGNALS_VERSION = "2.3.1";
1010
const TAILWINDCSS_VERSION = "4.1.10";
1111
const TAILWINDCSS_POSTCSS_VERSION = "4.1.10";
1212
const POSTCSS_VERSION = "8.5.6";
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { BUILD_ID } from "@fresh/build-id";
2+
3+
export const handler = () => new Response(BUILD_ID);
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { value } from "@marvinh-test/import-json";
2+
3+
export const handler = () => Response.json(value);

0 commit comments

Comments
 (0)