Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
arron21 authored Dec 10, 2024
2 parents ba98726 + 03847e9 commit a684567
Show file tree
Hide file tree
Showing 38 changed files with 736 additions and 1,174 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Deno
uses: denoland/setup-deno@v1
uses: denoland/setup-deno@v2
with:
deno-version: ${{ matrix.deno }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Deno
uses: denoland/setup-deno@v1
uses: denoland/setup-deno@v2
with:
deno-version: rc

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: rc
uses: denoland/setup-deno@v2

- name: Publish Fresh
run: deno publish
Expand Down
52 changes: 24 additions & 28 deletions deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"workspace": [
"./examples",
"./init",
"./plugin-tailwindcss",
"./update",
"./www"
],
"name": "@fresh/core",
"version": "2.0.0-alpha.25",
"version": "2.0.0-alpha.26",
"license": "MIT",
"exports": {
".": "./src/mod.ts",
Expand Down Expand Up @@ -33,54 +40,43 @@
"exclude": ["**/*_test.*", "src/__OLD/**", "*.todo"]
},
"imports": {
"fresh": "jsr:@fresh/core@^2.0.0-alpha.26",
"preact": "npm:preact@^10.25.1",
"preact-render-to-string": "npm:preact-render-to-string@^6.5.11",
"$ga4": "https://raw.githubusercontent.com/denoland/ga4/main/mod.ts",
"@astral/astral": "jsr:@astral/astral@^0.4.6",
"@fresh/plugin-tailwind": "./plugin-tailwindcss/src/mod.ts",
"@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@^0.11.0",
"@marvinh-test/fresh-island": "jsr:@marvinh-test/fresh-island@^0.0.1",
"@opentelemetry/api": "npm:@opentelemetry/api@^1.9.0",
"@preact/signals": "npm:@preact/signals@^1.2.3",
"@std/async": "jsr:@std/async@1",
"@std/cli": "jsr:@std/cli@1",
"esbuild": "npm:[email protected].1",
"esbuild-wasm": "npm:[email protected].1",
"@std/crypto": "jsr:@std/crypto@1",
"@std/datetime": "jsr:@std/datetime@^0.225.2",
"@std/encoding": "jsr:@std/encoding@1",
"@std/expect": "jsr:@std/expect@1",
"@std/fmt": "jsr:@std/fmt@1",
"@std/front-matter": "jsr:@std/front-matter@^1.0.5",
"@std/fs": "jsr:@std/fs@1",
"@std/html": "jsr:@std/html@1",
"@std/jsonc": "jsr:@std/jsonc@1",
"@std/media-types": "jsr:@std/media-types@1",
"@std/path": "jsr:@std/path@1",
"@std/semver": "jsr:@std/semver@1",
"@std/streams": "jsr:@std/streams@1",
"autoprefixer": "npm:[email protected]",
"cssnano": "npm:[email protected]",
"esbuild": "npm:[email protected]",
"esbuild-wasm": "npm:[email protected]",
"fresh": "./src/mod.ts",
"fresh/compat": "./src/compat/mod.ts",
"fresh/dev": "./src/dev/mod.ts",
"fresh/runtime": "./src/runtime/shared.ts",
"github-slugger": "npm:github-slugger@^2.0.0",

"@astral/astral": "jsr:@astral/astral@^0.4.6",
"@marvinh-test/fresh-island": "jsr:@marvinh-test/fresh-island@^0.0.1",
"linkedom": "npm:linkedom@^0.16.11",
"marked": "npm:marked@^14.1.2",
"marked-mangle": "npm:marked-mangle@^1.1.9",
"postcss": "npm:[email protected]",
"preact": "npm:preact@^10.24.1",
"preact-render-to-string": "npm:preact-render-to-string@^6.5.11",
"prismjs": "npm:prismjs@^1.29.0",
"tailwindcss": "npm:tailwindcss@^3.4.1",
"tailwindcss/plugin": "npm:/tailwindcss@^3.4.1/plugin.js",
"ts-morph": "npm:ts-morph@^22.0.0"
"@std/async": "jsr:@std/async@1",
"@std/expect": "jsr:@std/expect@1"
},
"compilerOptions": {
"lib": ["dom", "dom.asynciterable", "deno.ns"],
"lib": ["dom", "dom.asynciterable", "deno.ns", "deno.unstable"],
"jsx": "precompile",
"jsxImportSource": "preact",
"jsxPrecompileSkipElements": ["a", "img", "source", "body", "html", "head"]
},
"lint": {
"rules": { "exclude": ["no-window"], "include": ["no-console"] }
"rules": {
"exclude": ["no-window"],
"include": ["no-console"]
}
}
}
Loading

0 comments on commit a684567

Please sign in to comment.