Skip to content

Commit 5f64982

Browse files
authored
Merge branch 'main' into cleanup-jsonify
2 parents 53ca11d + 76c77e5 commit 5f64982

58 files changed

Lines changed: 1512 additions & 974 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- name: Setup Deno
3232
uses: denoland/setup-deno@v2
3333
with:
34+
cache: true
3435
deno-version: ${{ matrix.deno }}
3536

3637
- name: Verify formatting

.github/workflows/deploy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches: [main]
55
pull_request:
6-
branches: main
6+
branches: [main]
77

88
jobs:
99
deploy:
@@ -21,15 +21,16 @@ jobs:
2121
- name: Install Deno
2222
uses: denoland/setup-deno@v2
2323
with:
24+
cache: true
2425
deno-version: rc
2526

2627
- name: Build step
2728
working-directory: ./www
28-
run: "deno task build" # 📝 Update the build command(s) if necessary
29+
run: "deno task build"
2930

3031
- name: Upload to Deno Deploy
3132
uses: denoland/deployctl@v1
3233
with:
33-
project: "fresh" # 📝 Update the deploy project name if necessary
34-
entrypoint: "./www/main.ts" # 📝 Update the entrypoint if necessary
34+
project: "fresh"
35+
entrypoint: "./www/main.ts"
3536
root: "."

.github/workflows/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717

1818
- name: Install Deno
1919
uses: denoland/setup-deno@v2
20+
with:
21+
cache: true
2022

2123
- name: Publish Fresh
2224
run: deno publish

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ vendor/
33
node_modules/
44
.docs/
55
.DS_Store
6-
tmp_*
6+
tmp_*
7+
coverage/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The [documentation](https://fresh.deno.dev/docs/introduction) is available on
2424

2525
## 🚀 Getting started
2626

27-
Install the latest [Deno CLI](https://deno.land/) version.
27+
Install the latest [Deno CLI](https://deno.com/) version.
2828

2929
You can scaffold a new project by running the Fresh init script. To scaffold a
3030
project run the following:

deno.json

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"./www"
88
],
99
"name": "@fresh/core",
10-
"version": "2.0.0-alpha.29",
10+
"version": "2.0.0-alpha.34",
1111
"license": "MIT",
1212
"exports": {
1313
".": "./src/mod.ts",
1414
"./runtime": "./src/runtime/shared.ts",
1515
"./dev": "./src/dev/mod.ts",
16-
"./compat": "./src/compat/mod.ts"
16+
"./compat": "./src/compat.ts"
1717
},
1818
"tasks": {
19-
"test": "deno test -A --parallel src/ init/ update/ && deno test -A tests/ www/main_test.ts",
19+
"test": "deno test -A --parallel",
2020
"fixture": "deno run -A --watch=static/,routes/ tests/fixture/dev.ts",
2121
"www": "deno task --cwd=www start",
2222
"build-www": "deno task --cwd=www build",
2323
"screenshot": "deno run -A www/utils/screenshot.ts",
24-
"check:types": "deno check src/**/*.ts src/**/*.tsx tests/**/*.ts tests/**/*.tsx update/**/*.ts plugin-tailwindcss/**/*.ts init/**/*.ts",
24+
"check:types": "deno check --allow-import",
2525
"check:docs": "deno run -A tools/check_docs.ts",
2626
"ok": "deno fmt --check && deno lint && deno task check:types && deno task test",
2727
"test:www": "deno test -A www/main_test.*",
@@ -42,21 +42,23 @@
4242
},
4343
"imports": {
4444
"@deno/doc": "jsr:@deno/doc@^0.172.0",
45+
"@std/cli": "jsr:@std/cli@^1.0.17",
4546
"@std/collections": "jsr:@std/collections@^1.0.11",
4647
"@std/http": "jsr:@std/http@^1.0.15",
47-
"fresh": "jsr:@fresh/core@^2.0.0-alpha.26",
48-
"preact": "npm:preact@^10.25.1",
48+
"@std/uuid": "jsr:@std/uuid@^1.0.7",
49+
"fresh": "jsr:@fresh/core@^2.0.0-alpha.29",
50+
"preact": "npm:preact@^10.26.6",
4951
"preact-render-to-string": "npm:preact-render-to-string@^6.5.11",
5052
"$ga4": "https://raw.githubusercontent.com/denoland/ga4/main/mod.ts",
5153
"@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@^0.11.0",
5254
"@opentelemetry/api": "npm:@opentelemetry/api@^1.9.0",
53-
"@preact/signals": "npm:@preact/signals@^1.2.3",
54-
"esbuild": "npm:esbuild@0.23.1",
55-
"esbuild-wasm": "npm:esbuild-wasm@0.23.1",
55+
"@preact/signals": "npm:@preact/signals@^2.0.4",
56+
"esbuild": "npm:esbuild@0.25.4",
57+
"esbuild-wasm": "npm:esbuild-wasm@0.25.4",
5658
"@std/crypto": "jsr:@std/crypto@1",
5759
"@std/datetime": "jsr:@std/datetime@^0.225.2",
5860
"@std/encoding": "jsr:@std/encoding@1",
59-
"@std/fmt": "jsr:@std/fmt@1",
61+
"@std/fmt": "jsr:@std/fmt@^1.0.7",
6062
"@std/fs": "jsr:@std/fs@1",
6163
"@std/html": "jsr:@std/html@1",
6264
"@std/jsonc": "jsr:@std/jsonc@1",
@@ -65,12 +67,29 @@
6567
"@std/semver": "jsr:@std/semver@1",
6668
"@std/streams": "jsr:@std/streams@1",
6769

68-
"@astral/astral": "jsr:@astral/astral@^0.5.2",
70+
"@astral/astral": "jsr:@astral/astral@^0.5.3",
6971
"@marvinh-test/fresh-island": "jsr:@marvinh-test/fresh-island@^0.0.1",
70-
"linkedom": "npm:linkedom@^0.16.11",
71-
"@std/async": "jsr:@std/async@1",
72-
"@std/expect": "jsr:@std/expect@1",
73-
"@std/testing": "jsr:@std/testing@1"
72+
"linkedom": "npm:linkedom@^0.18.10",
73+
"@std/async": "jsr:@std/async@^1.0.13",
74+
"@std/expect": "jsr:@std/expect@^1.0.16",
75+
"@std/testing": "jsr:@std/testing@^1.0.12",
76+
77+
"autoprefixer": "npm:autoprefixer@10.4.17",
78+
"cssnano": "npm:cssnano@6.0.3",
79+
"postcss": "npm:postcss@8.4.35",
80+
"tailwindcss": "npm:tailwindcss@^3.4.1",
81+
82+
"ts-morph": "npm:ts-morph@^25.0.1",
83+
84+
"@fresh/plugin-tailwind": "jsr:@fresh/plugin-tailwind@^0.0.1-alpha.7",
85+
"@std/front-matter": "jsr:@std/front-matter@^1.0.5",
86+
"fresh/compat": "./src/compat/mod.ts",
87+
"fresh/dev": "./src/dev/mod.ts",
88+
"fresh/runtime": "./src/runtime/shared.ts",
89+
"github-slugger": "npm:github-slugger@^2.0.0",
90+
"marked": "npm:marked@^15.0.11",
91+
"marked-mangle": "npm:marked-mangle@^1.1.9",
92+
"prismjs": "npm:prismjs@^1.29.0"
7493
},
7594
"compilerOptions": {
7695
"lib": ["dom", "dom.asynciterable", "deno.ns", "deno.unstable"],
@@ -80,6 +99,7 @@
8099
},
81100
"lint": {
82101
"rules": {
102+
"tags": ["recommended", "fresh", "jsr", "jsx", "react"],
83103
"exclude": ["no-window"],
84104
"include": ["no-console"]
85105
}

0 commit comments

Comments
 (0)