diff --git a/.github/workflows/post_publish.yml b/.github/workflows/post_publish.yml index dc247b2771c..660c072a1bf 100644 --- a/.github/workflows/post_publish.yml +++ b/.github/workflows/post_publish.yml @@ -28,5 +28,5 @@ jobs: - name: Upload version file to dl.deno.land run: | - cat versions.json | jq -r ".[0]" > release-latest.txt + cat packages/fresh/deno.json | jq -r ".version" > release-latest.txt gsutil -h "Cache-Control: no-cache" cp release-latest.txt gs://dl.deno.land/fresh/release-latest.txt diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 058e5285a89..2eba118577b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,33 +23,5 @@ jobs: with: cache: true - - name: Publish Fresh - run: deno publish - - - name: Publish @fresh/build-id - working-directory: ./build-id - run: deno publish - - - name: Publish @fresh/init - working-directory: ./init - run: deno publish - - - name: Publish @fresh/plugin-tailwindcss - working-directory: ./plugin-tailwindcss - run: deno publish - - - name: Publish @fresh/plugin-tailwindcss-v3 - working-directory: ./plugin-tailwindcss-v3 - run: deno publish - - - name: Publish @fresh/update - working-directory: ./update - run: deno publish - - - name: Publish @fresh/plugin-vite - working-directory: ./plugin-vite - run: deno publish - - - name: Publish @fresh/examples - working-directory: ./examples + - name: Publish run: deno publish diff --git a/_typos.toml b/_typos.toml index f1be79c5c25..7875c88f113 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,9 +1,9 @@ [files] extend-exclude = [ - "tests/fixture_partials/routes/scroll_restoration/index.tsx", + "packages/fresh/tests/fixture_partials/routes/scroll_restoration/index.tsx", "www/static/fonts/FixelVariable.woff2", "www/static/fonts/FixelVariableItalic.woff2", - "tests/lorem_ipsum.txt", + "packages/fresh/tests/lorem_ipsum.txt", ] [default] diff --git a/deno.json b/deno.json index e4d238560fc..00a80effe09 100644 --- a/deno.json +++ b/deno.json @@ -1,30 +1,11 @@ { "nodeModulesDir": "auto", "workspace": [ - "./build-id", - "./examples", - "./init", - "./plugin-tailwindcss", - "./plugin-tailwindcss-v3", - "./plugin-vite", - "./update", + "./packages/*", "./www" ], - "name": "@fresh/core", - "version": "2.0.0-alpha.56", - "license": "MIT", - "exports": { - ".": "./src/mod.ts", - "./runtime": "./src/runtime/shared.ts", - "./runtime-client": "./src/runtime/client/mod.tsx", - "./dev": "./src/dev/mod.ts", - "./compat": "./src/compat.ts", - "./internal": "./src/internals.ts", - "./internal-dev": "./src/internals_dev.ts" - }, "tasks": { "test": "deno test -A --parallel", - "fixture": "deno run -A --watch=static/,routes/ tests/fixture/dev.ts", "www": "deno task --cwd=www start", "build-www": "deno task --cwd=www build", "screenshot": "deno run -A www/utils/screenshot.ts", diff --git a/deno.lock b/deno.lock index 0548613fcf2..b13c350042b 100644 --- a/deno.lock +++ b/deno.lock @@ -10,6 +10,7 @@ "jsr:@deno/graph@~0.82.3": "0.82.3", "jsr:@deno/loader@~0.3.2": "0.3.3", "jsr:@deno/loader@~0.3.3": "0.3.3", + "jsr:@fresh/build-id@1": "1.0.0", "jsr:@fresh/core@^2.0.0-alpha.37": "2.0.0-alpha.54", "jsr:@marvinh-test/fresh-island@^0.0.1": "0.0.1", "jsr:@std/assert@^1.0.13": "1.0.13", @@ -89,6 +90,7 @@ "npm:tailwindcss@^4.1.10": "4.1.11", "npm:ts-morph@26": "26.0.0", "npm:vite-plugin-inspect@^11.3.2": "11.3.2_vite@7.0.6__@types+node@24.1.0__picomatch@4.0.3_@types+node@24.1.0_@types+node@22.15.15", + "npm:vite@*": "7.0.6_@types+node@24.1.0_picomatch@4.0.3_@types+node@22.15.15", "npm:vite@^7.0.6": "7.0.6_@types+node@24.1.0_picomatch@4.0.3_@types+node@22.15.15" }, "jsr": { @@ -143,6 +145,12 @@ "@deno/loader@0.3.3": { "integrity": "983a2b3694e0acecadd6825531ec9dd8b2f92ea0ef0db45c221dda4c81aa5925" }, + "@fresh/build-id@1.0.0": { + "integrity": "c42a1dab0b0b8bcddf93657edf03f404d537ba8e1d44144b3c749727c5671d5a", + "dependencies": [ + "jsr:@std/encoding@^1.0.10" + ] + }, "@fresh/core@2.0.0-alpha.54": { "integrity": "599c79bb291a473e0eebe2256ee6fbaab89ddc2edf5da4e7cf9a6c19ebc34969", "dependencies": [ @@ -2955,12 +2963,17 @@ "npm:ts-morph@26" ], "members": { - "build-id": { + "packages/build-id": { "dependencies": [ "jsr:@std/encoding@^1.0.10" ] }, - "plugin-tailwindcss-v3": { + "packages/fresh": { + "dependencies": [ + "jsr:@std/fmt@^1.0.8" + ] + }, + "packages/plugin-tailwindcss-v3": { "dependencies": [ "npm:autoprefixer@^10.4.21", "npm:cssnano@^6.1.2", @@ -2968,7 +2981,7 @@ "npm:tailwindcss@^3.4.17" ] }, - "plugin-vite": { + "packages/plugin-vite": { "dependencies": [ "jsr:@deno/loader@~0.3.2", "npm:@prefresh/vite@^2.4.8", diff --git a/build-id/README.md b/packages/build-id/README.md similarity index 100% rename from build-id/README.md rename to packages/build-id/README.md diff --git a/build-id/deno.json b/packages/build-id/deno.json similarity index 100% rename from build-id/deno.json rename to packages/build-id/deno.json diff --git a/build-id/mod.ts b/packages/build-id/mod.ts similarity index 100% rename from build-id/mod.ts rename to packages/build-id/mod.ts diff --git a/examples/LICENSE b/packages/examples/LICENSE similarity index 100% rename from examples/LICENSE rename to packages/examples/LICENSE diff --git a/examples/README.md b/packages/examples/README.md similarity index 100% rename from examples/README.md rename to packages/examples/README.md diff --git a/examples/deno.json b/packages/examples/deno.json similarity index 100% rename from examples/deno.json rename to packages/examples/deno.json diff --git a/examples/src/app1.tsx b/packages/examples/src/app1.tsx similarity index 100% rename from examples/src/app1.tsx rename to packages/examples/src/app1.tsx diff --git a/examples/src/app2.tsx b/packages/examples/src/app2.tsx similarity index 100% rename from examples/src/app2.tsx rename to packages/examples/src/app2.tsx diff --git a/examples/src/island.tsx b/packages/examples/src/island.tsx similarity index 100% rename from examples/src/island.tsx rename to packages/examples/src/island.tsx diff --git a/examples/src/shared.tsx b/packages/examples/src/shared.tsx similarity index 100% rename from examples/src/shared.tsx rename to packages/examples/src/shared.tsx diff --git a/packages/fresh/README.md b/packages/fresh/README.md new file mode 100644 index 00000000000..9930d8392f5 --- /dev/null +++ b/packages/fresh/README.md @@ -0,0 +1,7 @@ +# Fresh + +Fresh is a small, fast and extensible full stack web framework built on Web +Standards. It’s designed for building high-quality, performant, and personalized +web applications. + +[Learn more about Fresh](https://fresh.deno.dev/) diff --git a/packages/fresh/deno.json b/packages/fresh/deno.json new file mode 100644 index 00000000000..7f48276d09b --- /dev/null +++ b/packages/fresh/deno.json @@ -0,0 +1,17 @@ +{ + "name": "@fresh/core", + "version": "2.0.0-alpha.56", + "license": "MIT", + "exports": { + ".": "./src/mod.ts", + "./runtime": "./src/runtime/shared.ts", + "./runtime-client": "./src/runtime/client/mod.tsx", + "./dev": "./src/dev/mod.ts", + "./compat": "./src/compat.ts", + "./internal": "./src/internals.ts", + "./internal-dev": "./src/internals_dev.ts" + }, + "imports": { + "@std/fmt": "jsr:@std/fmt@^1.0.8" + } +} diff --git a/src/app.ts b/packages/fresh/src/app.ts similarity index 100% rename from src/app.ts rename to packages/fresh/src/app.ts diff --git a/src/app_test.tsx b/packages/fresh/src/app_test.tsx similarity index 100% rename from src/app_test.tsx rename to packages/fresh/src/app_test.tsx diff --git a/src/build_cache.ts b/packages/fresh/src/build_cache.ts similarity index 100% rename from src/build_cache.ts rename to packages/fresh/src/build_cache.ts diff --git a/src/commands.ts b/packages/fresh/src/commands.ts similarity index 100% rename from src/commands.ts rename to packages/fresh/src/commands.ts diff --git a/src/compat.ts b/packages/fresh/src/compat.ts similarity index 100% rename from src/compat.ts rename to packages/fresh/src/compat.ts diff --git a/src/compat_test.tsx b/packages/fresh/src/compat_test.tsx similarity index 100% rename from src/compat_test.tsx rename to packages/fresh/src/compat_test.tsx diff --git a/src/config.ts b/packages/fresh/src/config.ts similarity index 100% rename from src/config.ts rename to packages/fresh/src/config.ts diff --git a/src/config_test.ts b/packages/fresh/src/config_test.ts similarity index 100% rename from src/config_test.ts rename to packages/fresh/src/config_test.ts diff --git a/src/constants.ts b/packages/fresh/src/constants.ts similarity index 100% rename from src/constants.ts rename to packages/fresh/src/constants.ts diff --git a/src/context.ts b/packages/fresh/src/context.ts similarity index 100% rename from src/context.ts rename to packages/fresh/src/context.ts diff --git a/src/context_test.tsx b/packages/fresh/src/context_test.tsx similarity index 100% rename from src/context_test.tsx rename to packages/fresh/src/context_test.tsx diff --git a/src/define.ts b/packages/fresh/src/define.ts similarity index 100% rename from src/define.ts rename to packages/fresh/src/define.ts diff --git a/src/define_test.ts b/packages/fresh/src/define_test.ts similarity index 100% rename from src/define_test.ts rename to packages/fresh/src/define_test.ts diff --git a/src/dev/builder.ts b/packages/fresh/src/dev/builder.ts similarity index 100% rename from src/dev/builder.ts rename to packages/fresh/src/dev/builder.ts diff --git a/src/dev/builder_test.ts b/packages/fresh/src/dev/builder_test.ts similarity index 100% rename from src/dev/builder_test.ts rename to packages/fresh/src/dev/builder_test.ts diff --git a/src/dev/check.ts b/packages/fresh/src/dev/check.ts similarity index 100% rename from src/dev/check.ts rename to packages/fresh/src/dev/check.ts diff --git a/src/dev/dev_build_cache.ts b/packages/fresh/src/dev/dev_build_cache.ts similarity index 100% rename from src/dev/dev_build_cache.ts rename to packages/fresh/src/dev/dev_build_cache.ts diff --git a/src/dev/dev_build_cache_test.ts b/packages/fresh/src/dev/dev_build_cache_test.ts similarity index 100% rename from src/dev/dev_build_cache_test.ts rename to packages/fresh/src/dev/dev_build_cache_test.ts diff --git a/src/dev/esbuild.ts b/packages/fresh/src/dev/esbuild.ts similarity index 100% rename from src/dev/esbuild.ts rename to packages/fresh/src/dev/esbuild.ts diff --git a/src/dev/file_transformer.ts b/packages/fresh/src/dev/file_transformer.ts similarity index 100% rename from src/dev/file_transformer.ts rename to packages/fresh/src/dev/file_transformer.ts diff --git a/src/dev/file_transformer_test.ts b/packages/fresh/src/dev/file_transformer_test.ts similarity index 100% rename from src/dev/file_transformer_test.ts rename to packages/fresh/src/dev/file_transformer_test.ts diff --git a/src/dev/fs_crawl.ts b/packages/fresh/src/dev/fs_crawl.ts similarity index 100% rename from src/dev/fs_crawl.ts rename to packages/fresh/src/dev/fs_crawl.ts diff --git a/src/dev/fs_crawl_test.ts b/packages/fresh/src/dev/fs_crawl_test.ts similarity index 100% rename from src/dev/fs_crawl_test.ts rename to packages/fresh/src/dev/fs_crawl_test.ts diff --git a/src/dev/middlewares/automatic_workspace_folders.ts b/packages/fresh/src/dev/middlewares/automatic_workspace_folders.ts similarity index 100% rename from src/dev/middlewares/automatic_workspace_folders.ts rename to packages/fresh/src/dev/middlewares/automatic_workspace_folders.ts diff --git a/src/dev/middlewares/error_overlay/code_frame.tsx b/packages/fresh/src/dev/middlewares/error_overlay/code_frame.tsx similarity index 100% rename from src/dev/middlewares/error_overlay/code_frame.tsx rename to packages/fresh/src/dev/middlewares/error_overlay/code_frame.tsx diff --git a/src/dev/middlewares/error_overlay/middleware.tsx b/packages/fresh/src/dev/middlewares/error_overlay/middleware.tsx similarity index 100% rename from src/dev/middlewares/error_overlay/middleware.tsx rename to packages/fresh/src/dev/middlewares/error_overlay/middleware.tsx diff --git a/src/dev/middlewares/error_overlay/middleware_test.tsx b/packages/fresh/src/dev/middlewares/error_overlay/middleware_test.tsx similarity index 100% rename from src/dev/middlewares/error_overlay/middleware_test.tsx rename to packages/fresh/src/dev/middlewares/error_overlay/middleware_test.tsx diff --git a/src/dev/middlewares/error_overlay/overlay.tsx b/packages/fresh/src/dev/middlewares/error_overlay/overlay.tsx similarity index 100% rename from src/dev/middlewares/error_overlay/overlay.tsx rename to packages/fresh/src/dev/middlewares/error_overlay/overlay.tsx diff --git a/src/dev/middlewares/live_reload.ts b/packages/fresh/src/dev/middlewares/live_reload.ts similarity index 100% rename from src/dev/middlewares/live_reload.ts rename to packages/fresh/src/dev/middlewares/live_reload.ts diff --git a/src/dev/mod.ts b/packages/fresh/src/dev/mod.ts similarity index 100% rename from src/dev/mod.ts rename to packages/fresh/src/dev/mod.ts diff --git a/src/dev/update_check.ts b/packages/fresh/src/dev/update_check.ts similarity index 100% rename from src/dev/update_check.ts rename to packages/fresh/src/dev/update_check.ts diff --git a/src/dev/update_check_test.ts b/packages/fresh/src/dev/update_check_test.ts similarity index 100% rename from src/dev/update_check_test.ts rename to packages/fresh/src/dev/update_check_test.ts diff --git a/src/error.ts b/packages/fresh/src/error.ts similarity index 100% rename from src/error.ts rename to packages/fresh/src/error.ts diff --git a/src/error_test.ts b/packages/fresh/src/error_test.ts similarity index 100% rename from src/error_test.ts rename to packages/fresh/src/error_test.ts diff --git a/src/file_url.ts b/packages/fresh/src/file_url.ts similarity index 100% rename from src/file_url.ts rename to packages/fresh/src/file_url.ts diff --git a/src/file_url_test.ts b/packages/fresh/src/file_url_test.ts similarity index 100% rename from src/file_url_test.ts rename to packages/fresh/src/file_url_test.ts diff --git a/src/fs.ts b/packages/fresh/src/fs.ts similarity index 100% rename from src/fs.ts rename to packages/fresh/src/fs.ts diff --git a/src/fs_routes.ts b/packages/fresh/src/fs_routes.ts similarity index 100% rename from src/fs_routes.ts rename to packages/fresh/src/fs_routes.ts diff --git a/src/fs_routes_test.tsx b/packages/fresh/src/fs_routes_test.tsx similarity index 100% rename from src/fs_routes_test.tsx rename to packages/fresh/src/fs_routes_test.tsx diff --git a/src/handlers.ts b/packages/fresh/src/handlers.ts similarity index 100% rename from src/handlers.ts rename to packages/fresh/src/handlers.ts diff --git a/src/internals.ts b/packages/fresh/src/internals.ts similarity index 100% rename from src/internals.ts rename to packages/fresh/src/internals.ts diff --git a/src/internals_dev.ts b/packages/fresh/src/internals_dev.ts similarity index 100% rename from src/internals_dev.ts rename to packages/fresh/src/internals_dev.ts diff --git a/src/jsonify/__snapshots__/round_trip_test.ts.snap b/packages/fresh/src/jsonify/__snapshots__/round_trip_test.ts.snap similarity index 100% rename from src/jsonify/__snapshots__/round_trip_test.ts.snap rename to packages/fresh/src/jsonify/__snapshots__/round_trip_test.ts.snap diff --git a/src/jsonify/constants.ts b/packages/fresh/src/jsonify/constants.ts similarity index 100% rename from src/jsonify/constants.ts rename to packages/fresh/src/jsonify/constants.ts diff --git a/src/jsonify/custom_test.ts b/packages/fresh/src/jsonify/custom_test.ts similarity index 100% rename from src/jsonify/custom_test.ts rename to packages/fresh/src/jsonify/custom_test.ts diff --git a/src/jsonify/parse.ts b/packages/fresh/src/jsonify/parse.ts similarity index 100% rename from src/jsonify/parse.ts rename to packages/fresh/src/jsonify/parse.ts diff --git a/src/jsonify/round_trip_test.ts b/packages/fresh/src/jsonify/round_trip_test.ts similarity index 100% rename from src/jsonify/round_trip_test.ts rename to packages/fresh/src/jsonify/round_trip_test.ts diff --git a/src/jsonify/stringify.ts b/packages/fresh/src/jsonify/stringify.ts similarity index 100% rename from src/jsonify/stringify.ts rename to packages/fresh/src/jsonify/stringify.ts diff --git a/src/jsonify/stringify_test.ts b/packages/fresh/src/jsonify/stringify_test.ts similarity index 100% rename from src/jsonify/stringify_test.ts rename to packages/fresh/src/jsonify/stringify_test.ts diff --git a/src/middlewares/cors.ts b/packages/fresh/src/middlewares/cors.ts similarity index 100% rename from src/middlewares/cors.ts rename to packages/fresh/src/middlewares/cors.ts diff --git a/src/middlewares/cors_test.ts b/packages/fresh/src/middlewares/cors_test.ts similarity index 100% rename from src/middlewares/cors_test.ts rename to packages/fresh/src/middlewares/cors_test.ts diff --git a/src/middlewares/csrf.ts b/packages/fresh/src/middlewares/csrf.ts similarity index 100% rename from src/middlewares/csrf.ts rename to packages/fresh/src/middlewares/csrf.ts diff --git a/src/middlewares/csrf_test.ts b/packages/fresh/src/middlewares/csrf_test.ts similarity index 100% rename from src/middlewares/csrf_test.ts rename to packages/fresh/src/middlewares/csrf_test.ts diff --git a/src/middlewares/mod.ts b/packages/fresh/src/middlewares/mod.ts similarity index 100% rename from src/middlewares/mod.ts rename to packages/fresh/src/middlewares/mod.ts diff --git a/src/middlewares/mod_test.ts b/packages/fresh/src/middlewares/mod_test.ts similarity index 100% rename from src/middlewares/mod_test.ts rename to packages/fresh/src/middlewares/mod_test.ts diff --git a/src/middlewares/static_files.ts b/packages/fresh/src/middlewares/static_files.ts similarity index 100% rename from src/middlewares/static_files.ts rename to packages/fresh/src/middlewares/static_files.ts diff --git a/src/middlewares/static_files_test.ts b/packages/fresh/src/middlewares/static_files_test.ts similarity index 100% rename from src/middlewares/static_files_test.ts rename to packages/fresh/src/middlewares/static_files_test.ts diff --git a/src/middlewares/trailing_slashes.ts b/packages/fresh/src/middlewares/trailing_slashes.ts similarity index 100% rename from src/middlewares/trailing_slashes.ts rename to packages/fresh/src/middlewares/trailing_slashes.ts diff --git a/src/middlewares/trailing_slashes_test.ts b/packages/fresh/src/middlewares/trailing_slashes_test.ts similarity index 100% rename from src/middlewares/trailing_slashes_test.ts rename to packages/fresh/src/middlewares/trailing_slashes_test.ts diff --git a/src/mod.ts b/packages/fresh/src/mod.ts similarity index 100% rename from src/mod.ts rename to packages/fresh/src/mod.ts diff --git a/src/otel.ts b/packages/fresh/src/otel.ts similarity index 100% rename from src/otel.ts rename to packages/fresh/src/otel.ts diff --git a/src/render.ts b/packages/fresh/src/render.ts similarity index 100% rename from src/render.ts rename to packages/fresh/src/render.ts diff --git a/src/router.ts b/packages/fresh/src/router.ts similarity index 100% rename from src/router.ts rename to packages/fresh/src/router.ts diff --git a/src/router_test.ts b/packages/fresh/src/router_test.ts similarity index 100% rename from src/router_test.ts rename to packages/fresh/src/router_test.ts diff --git a/src/runtime/client/dev.ts b/packages/fresh/src/runtime/client/dev.ts similarity index 100% rename from src/runtime/client/dev.ts rename to packages/fresh/src/runtime/client/dev.ts diff --git a/src/runtime/client/mod.tsx b/packages/fresh/src/runtime/client/mod.tsx similarity index 100% rename from src/runtime/client/mod.tsx rename to packages/fresh/src/runtime/client/mod.tsx diff --git a/src/runtime/client/partials.ts b/packages/fresh/src/runtime/client/partials.ts similarity index 100% rename from src/runtime/client/partials.ts rename to packages/fresh/src/runtime/client/partials.ts diff --git a/src/runtime/client/polyfills.ts b/packages/fresh/src/runtime/client/polyfills.ts similarity index 100% rename from src/runtime/client/polyfills.ts rename to packages/fresh/src/runtime/client/polyfills.ts diff --git a/src/runtime/client/preact_hooks_client.ts b/packages/fresh/src/runtime/client/preact_hooks_client.ts similarity index 100% rename from src/runtime/client/preact_hooks_client.ts rename to packages/fresh/src/runtime/client/preact_hooks_client.ts diff --git a/src/runtime/client/reviver.ts b/packages/fresh/src/runtime/client/reviver.ts similarity index 100% rename from src/runtime/client/reviver.ts rename to packages/fresh/src/runtime/client/reviver.ts diff --git a/src/runtime/server/preact_hooks.tsx b/packages/fresh/src/runtime/server/preact_hooks.tsx similarity index 100% rename from src/runtime/server/preact_hooks.tsx rename to packages/fresh/src/runtime/server/preact_hooks.tsx diff --git a/src/runtime/shared.ts b/packages/fresh/src/runtime/shared.ts similarity index 100% rename from src/runtime/shared.ts rename to packages/fresh/src/runtime/shared.ts diff --git a/src/runtime/shared_internal.tsx b/packages/fresh/src/runtime/shared_internal.tsx similarity index 100% rename from src/runtime/shared_internal.tsx rename to packages/fresh/src/runtime/shared_internal.tsx diff --git a/src/segments.ts b/packages/fresh/src/segments.ts similarity index 100% rename from src/segments.ts rename to packages/fresh/src/segments.ts diff --git a/src/segments_test.ts b/packages/fresh/src/segments_test.ts similarity index 100% rename from src/segments_test.ts rename to packages/fresh/src/segments_test.ts diff --git a/src/server/tailwind_aot_error_page.tsx b/packages/fresh/src/server/tailwind_aot_error_page.tsx similarity index 100% rename from src/server/tailwind_aot_error_page.tsx rename to packages/fresh/src/server/tailwind_aot_error_page.tsx diff --git a/src/test_utils.ts b/packages/fresh/src/test_utils.ts similarity index 100% rename from src/test_utils.ts rename to packages/fresh/src/test_utils.ts diff --git a/src/types.ts b/packages/fresh/src/types.ts similarity index 100% rename from src/types.ts rename to packages/fresh/src/types.ts diff --git a/src/utils.ts b/packages/fresh/src/utils.ts similarity index 100% rename from src/utils.ts rename to packages/fresh/src/utils.ts diff --git a/src/utils_test.ts b/packages/fresh/src/utils_test.ts similarity index 100% rename from src/utils_test.ts rename to packages/fresh/src/utils_test.ts diff --git a/tests/active_links_test.tsx b/packages/fresh/tests/active_links_test.tsx similarity index 100% rename from tests/active_links_test.tsx rename to packages/fresh/tests/active_links_test.tsx diff --git a/tests/doc_examples_test.tsx b/packages/fresh/tests/doc_examples_test.tsx similarity index 92% rename from tests/doc_examples_test.tsx rename to packages/fresh/tests/doc_examples_test.tsx index 3a9633238ca..ca6d57fc831 100644 --- a/tests/doc_examples_test.tsx +++ b/packages/fresh/tests/doc_examples_test.tsx @@ -1,10 +1,12 @@ -import twDenoJson from "../plugin-tailwindcss/deno.json" with { type: "json" }; +import twDenoJson from "../../plugin-tailwindcss/deno.json" with { + type: "json", +}; import * as Marked from "marked"; import { ensureDir, walk } from "@std/fs"; import { dirname, join, relative } from "@std/path"; // import { expect } from "@std/expect/expect"; import { withTmpDir } from "../src/test_utils.ts"; -import { FRESH_VERSION, PREACT_VERSION } from "../update/src/update.ts"; +import { FRESH_VERSION, PREACT_VERSION } from "../../update/src/update.ts"; Deno.test("Docs Code example checks", async () => { await using tmp = await withTmpDir(); @@ -63,7 +65,14 @@ Deno.test("Docs Code example checks", async () => { async function* docsMarkdownFiles() { // Limit to checking Fresh v2 (canary) docs for now - const docsDir = join(import.meta.dirname!, "..", "docs", "canary"); + const docsDir = join( + import.meta.dirname!, + "..", + "..", + "..", + "docs", + "canary", + ); const docsIter = walk(docsDir, { exts: [".md"], includeDirs: false }); for await (const entry of docsIter) { diff --git a/tests/fixture_island_groups/routes/both/(_islands)/Foo.tsx b/packages/fresh/tests/fixture_island_groups/routes/both/(_islands)/Foo.tsx similarity index 100% rename from tests/fixture_island_groups/routes/both/(_islands)/Foo.tsx rename to packages/fresh/tests/fixture_island_groups/routes/both/(_islands)/Foo.tsx diff --git a/tests/fixture_island_groups/routes/both/index.tsx b/packages/fresh/tests/fixture_island_groups/routes/both/index.tsx similarity index 100% rename from tests/fixture_island_groups/routes/both/index.tsx rename to packages/fresh/tests/fixture_island_groups/routes/both/index.tsx diff --git a/tests/fixture_island_groups/routes/foo/(_islands)/Foo.tsx b/packages/fresh/tests/fixture_island_groups/routes/foo/(_islands)/Foo.tsx similarity index 100% rename from tests/fixture_island_groups/routes/foo/(_islands)/Foo.tsx rename to packages/fresh/tests/fixture_island_groups/routes/foo/(_islands)/Foo.tsx diff --git a/tests/fixture_island_groups/routes/foo/index.tsx b/packages/fresh/tests/fixture_island_groups/routes/foo/index.tsx similarity index 100% rename from tests/fixture_island_groups/routes/foo/index.tsx rename to packages/fresh/tests/fixture_island_groups/routes/foo/index.tsx diff --git a/tests/fixture_island_groups/routes/index.tsx b/packages/fresh/tests/fixture_island_groups/routes/index.tsx similarity index 100% rename from tests/fixture_island_groups/routes/index.tsx rename to packages/fresh/tests/fixture_island_groups/routes/index.tsx diff --git a/tests/fixture_precompile/invalid/deno.json b/packages/fresh/tests/fixture_precompile/invalid/deno.json similarity index 100% rename from tests/fixture_precompile/invalid/deno.json rename to packages/fresh/tests/fixture_precompile/invalid/deno.json diff --git a/tests/fixture_precompile/invalid/dev.ts b/packages/fresh/tests/fixture_precompile/invalid/dev.ts similarity index 100% rename from tests/fixture_precompile/invalid/dev.ts rename to packages/fresh/tests/fixture_precompile/invalid/dev.ts diff --git a/tests/fixture_precompile/invalid/main.tsx b/packages/fresh/tests/fixture_precompile/invalid/main.tsx similarity index 100% rename from tests/fixture_precompile/invalid/main.tsx rename to packages/fresh/tests/fixture_precompile/invalid/main.tsx diff --git a/tests/fixture_precompile/valid/deno.json b/packages/fresh/tests/fixture_precompile/valid/deno.json similarity index 100% rename from tests/fixture_precompile/valid/deno.json rename to packages/fresh/tests/fixture_precompile/valid/deno.json diff --git a/tests/fixture_precompile/valid/main.tsx b/packages/fresh/tests/fixture_precompile/valid/main.tsx similarity index 100% rename from tests/fixture_precompile/valid/main.tsx rename to packages/fresh/tests/fixture_precompile/valid/main.tsx diff --git a/tests/fixture_update_check/mod.ts b/packages/fresh/tests/fixture_update_check/mod.ts similarity index 100% rename from tests/fixture_update_check/mod.ts rename to packages/fresh/tests/fixture_update_check/mod.ts diff --git a/tests/fixtures_islands/Computed.tsx b/packages/fresh/tests/fixtures_islands/Computed.tsx similarity index 100% rename from tests/fixtures_islands/Computed.tsx rename to packages/fresh/tests/fixtures_islands/Computed.tsx diff --git a/tests/fixtures_islands/Counter.tsx b/packages/fresh/tests/fixtures_islands/Counter.tsx similarity index 100% rename from tests/fixtures_islands/Counter.tsx rename to packages/fresh/tests/fixtures_islands/Counter.tsx diff --git a/tests/fixtures_islands/CounterWithSlots.tsx b/packages/fresh/tests/fixtures_islands/CounterWithSlots.tsx similarity index 100% rename from tests/fixtures_islands/CounterWithSlots.tsx rename to packages/fresh/tests/fixtures_islands/CounterWithSlots.tsx diff --git a/tests/fixtures_islands/EscapeIsland.tsx b/packages/fresh/tests/fixtures_islands/EscapeIsland.tsx similarity index 100% rename from tests/fixtures_islands/EscapeIsland.tsx rename to packages/fresh/tests/fixtures_islands/EscapeIsland.tsx diff --git a/tests/fixtures_islands/FnIsland.tsx b/packages/fresh/tests/fixtures_islands/FnIsland.tsx similarity index 100% rename from tests/fixtures_islands/FnIsland.tsx rename to packages/fresh/tests/fixtures_islands/FnIsland.tsx diff --git a/tests/fixtures_islands/FragmentIsland.tsx b/packages/fresh/tests/fixtures_islands/FragmentIsland.tsx similarity index 100% rename from tests/fixtures_islands/FragmentIsland.tsx rename to packages/fresh/tests/fixtures_islands/FragmentIsland.tsx diff --git a/tests/fixtures_islands/FreshAttrs.tsx b/packages/fresh/tests/fixtures_islands/FreshAttrs.tsx similarity index 100% rename from tests/fixtures_islands/FreshAttrs.tsx rename to packages/fresh/tests/fixtures_islands/FreshAttrs.tsx diff --git a/tests/fixtures_islands/IslandInIsland.tsx b/packages/fresh/tests/fixtures_islands/IslandInIsland.tsx similarity index 100% rename from tests/fixtures_islands/IslandInIsland.tsx rename to packages/fresh/tests/fixtures_islands/IslandInIsland.tsx diff --git a/tests/fixtures_islands/JsonIsland.tsx b/packages/fresh/tests/fixtures_islands/JsonIsland.tsx similarity index 100% rename from tests/fixtures_islands/JsonIsland.tsx rename to packages/fresh/tests/fixtures_islands/JsonIsland.tsx diff --git a/tests/fixtures_islands/JsxChildrenIsland.tsx b/packages/fresh/tests/fixtures_islands/JsxChildrenIsland.tsx similarity index 100% rename from tests/fixtures_islands/JsxChildrenIsland.tsx rename to packages/fresh/tests/fixtures_islands/JsxChildrenIsland.tsx diff --git a/tests/fixtures_islands/JsxConditional.tsx b/packages/fresh/tests/fixtures_islands/JsxConditional.tsx similarity index 100% rename from tests/fixtures_islands/JsxConditional.tsx rename to packages/fresh/tests/fixtures_islands/JsxConditional.tsx diff --git a/tests/fixtures_islands/JsxIsland.tsx b/packages/fresh/tests/fixtures_islands/JsxIsland.tsx similarity index 100% rename from tests/fixtures_islands/JsxIsland.tsx rename to packages/fresh/tests/fixtures_islands/JsxIsland.tsx diff --git a/tests/fixtures_islands/Multiple.tsx b/packages/fresh/tests/fixtures_islands/Multiple.tsx similarity index 100% rename from tests/fixtures_islands/Multiple.tsx rename to packages/fresh/tests/fixtures_islands/Multiple.tsx diff --git a/tests/fixtures_islands/NodeProcess.tsx b/packages/fresh/tests/fixtures_islands/NodeProcess.tsx similarity index 100% rename from tests/fixtures_islands/NodeProcess.tsx rename to packages/fresh/tests/fixtures_islands/NodeProcess.tsx diff --git a/tests/fixtures_islands/NullIsland.tsx b/packages/fresh/tests/fixtures_islands/NullIsland.tsx similarity index 100% rename from tests/fixtures_islands/NullIsland.tsx rename to packages/fresh/tests/fixtures_islands/NullIsland.tsx diff --git a/tests/fixtures_islands/OptOutPartialLink.tsx b/packages/fresh/tests/fixtures_islands/OptOutPartialLink.tsx similarity index 100% rename from tests/fixtures_islands/OptOutPartialLink.tsx rename to packages/fresh/tests/fixtures_islands/OptOutPartialLink.tsx diff --git a/tests/fixtures_islands/PartialInIsland.tsx b/packages/fresh/tests/fixtures_islands/PartialInIsland.tsx similarity index 100% rename from tests/fixtures_islands/PartialInIsland.tsx rename to packages/fresh/tests/fixtures_islands/PartialInIsland.tsx diff --git a/tests/fixtures_islands/PassThrough.tsx b/packages/fresh/tests/fixtures_islands/PassThrough.tsx similarity index 100% rename from tests/fixtures_islands/PassThrough.tsx rename to packages/fresh/tests/fixtures_islands/PassThrough.tsx diff --git a/tests/fixtures_islands/SelfCounter.tsx b/packages/fresh/tests/fixtures_islands/SelfCounter.tsx similarity index 100% rename from tests/fixtures_islands/SelfCounter.tsx rename to packages/fresh/tests/fixtures_islands/SelfCounter.tsx diff --git a/tests/fixtures_islands/data.json b/packages/fresh/tests/fixtures_islands/data.json similarity index 100% rename from tests/fixtures_islands/data.json rename to packages/fresh/tests/fixtures_islands/data.json diff --git a/tests/islands_test.tsx b/packages/fresh/tests/islands_test.tsx similarity index 100% rename from tests/islands_test.tsx rename to packages/fresh/tests/islands_test.tsx diff --git a/tests/lorem_ipsum.txt b/packages/fresh/tests/lorem_ipsum.txt similarity index 100% rename from tests/lorem_ipsum.txt rename to packages/fresh/tests/lorem_ipsum.txt diff --git a/tests/partials_test.tsx b/packages/fresh/tests/partials_test.tsx similarity index 100% rename from tests/partials_test.tsx rename to packages/fresh/tests/partials_test.tsx diff --git a/tests/precompile_test.ts b/packages/fresh/tests/precompile_test.ts similarity index 100% rename from tests/precompile_test.ts rename to packages/fresh/tests/precompile_test.ts diff --git a/tests/test_utils.tsx b/packages/fresh/tests/test_utils.tsx similarity index 100% rename from tests/test_utils.tsx rename to packages/fresh/tests/test_utils.tsx diff --git a/init/README.md b/packages/init/README.md similarity index 100% rename from init/README.md rename to packages/init/README.md diff --git a/init/deno.json b/packages/init/deno.json similarity index 100% rename from init/deno.json rename to packages/init/deno.json diff --git a/init/src/assets/favicon.ico b/packages/init/src/assets/favicon.ico similarity index 100% rename from init/src/assets/favicon.ico rename to packages/init/src/assets/favicon.ico diff --git a/init/src/init.ts b/packages/init/src/init.ts similarity index 100% rename from init/src/init.ts rename to packages/init/src/init.ts diff --git a/init/src/init_test.ts b/packages/init/src/init_test.ts similarity index 93% rename from init/src/init_test.ts rename to packages/init/src/init_test.ts index 075ea875954..b324fb4acf3 100644 --- a/init/src/init_test.ts +++ b/packages/init/src/init_test.ts @@ -5,10 +5,10 @@ import { initProject, } from "./init.ts"; import * as path from "@std/path"; -import { getStdOutput, withBrowser } from "../../tests/test_utils.tsx"; -import { waitForText } from "../../tests/test_utils.tsx"; -import { withChildProcessServer } from "../../tests/test_utils.tsx"; -import { withTmpDir as withTmpDirBase } from "../../src/test_utils.ts"; +import { getStdOutput, withBrowser } from "../../fresh/tests/test_utils.tsx"; +import { waitForText } from "../../fresh/tests/test_utils.tsx"; +import { withChildProcessServer } from "../../fresh/tests/test_utils.tsx"; +import { withTmpDir as withTmpDirBase } from "../../fresh/src/test_utils.ts"; import { stub } from "@std/testing/mock"; function stubPrompt(result: string) { @@ -24,10 +24,8 @@ function stubConfirm(steps: Record = {}) { } function withTmpDir(): Promise<{ dir: string } & AsyncDisposable> { - return withTmpDirBase({ - dir: path.join(import.meta.dirname!, "..", ".."), - prefix: "tmp_", - }); + const dir = path.join(import.meta.dirname!, "..", "..", "..", ".."); + return withTmpDirBase({ dir, prefix: "tmp_" }); } async function patchProject(dir: string): Promise { @@ -37,7 +35,7 @@ async function patchProject(dir: string): Promise { json.workspace = []; // See https://github.com/denoland/deno/issues/27313 // json.links = [path.fromFileURL(new URL("../..", import.meta.url))]; - json.links = [new URL("../..", import.meta.url).href]; + json.links = [new URL("../../fresh", import.meta.url).href]; // assert with this stricter rule, before adding it to initialized projects json.lint.rules.include = ["verbatim-module-syntax"]; diff --git a/init/src/mod.ts b/packages/init/src/mod.ts similarity index 100% rename from init/src/mod.ts rename to packages/init/src/mod.ts diff --git a/plugin-tailwindcss-v3/README.md b/packages/plugin-tailwindcss-v3/README.md similarity index 100% rename from plugin-tailwindcss-v3/README.md rename to packages/plugin-tailwindcss-v3/README.md diff --git a/plugin-tailwindcss-v3/deno.json b/packages/plugin-tailwindcss-v3/deno.json similarity index 100% rename from plugin-tailwindcss-v3/deno.json rename to packages/plugin-tailwindcss-v3/deno.json diff --git a/plugin-tailwindcss-v3/src/mod.ts b/packages/plugin-tailwindcss-v3/src/mod.ts similarity index 100% rename from plugin-tailwindcss-v3/src/mod.ts rename to packages/plugin-tailwindcss-v3/src/mod.ts diff --git a/plugin-tailwindcss/README.md b/packages/plugin-tailwindcss/README.md similarity index 100% rename from plugin-tailwindcss/README.md rename to packages/plugin-tailwindcss/README.md diff --git a/plugin-tailwindcss/deno.json b/packages/plugin-tailwindcss/deno.json similarity index 100% rename from plugin-tailwindcss/deno.json rename to packages/plugin-tailwindcss/deno.json diff --git a/plugin-tailwindcss/src/mod.ts b/packages/plugin-tailwindcss/src/mod.ts similarity index 100% rename from plugin-tailwindcss/src/mod.ts rename to packages/plugin-tailwindcss/src/mod.ts diff --git a/plugin-tailwindcss/src/types.ts b/packages/plugin-tailwindcss/src/types.ts similarity index 100% rename from plugin-tailwindcss/src/types.ts rename to packages/plugin-tailwindcss/src/types.ts diff --git a/plugin-vite/README.md b/packages/plugin-vite/README.md similarity index 100% rename from plugin-vite/README.md rename to packages/plugin-vite/README.md diff --git a/plugin-vite/demo/islands/Bar.tsx b/packages/plugin-vite/demo/islands/Bar.tsx similarity index 100% rename from plugin-vite/demo/islands/Bar.tsx rename to packages/plugin-vite/demo/islands/Bar.tsx diff --git a/plugin-vite/demo/islands/Foo.tsx b/packages/plugin-vite/demo/islands/Foo.tsx similarity index 100% rename from plugin-vite/demo/islands/Foo.tsx rename to packages/plugin-vite/demo/islands/Foo.tsx diff --git a/plugin-vite/demo/islands/tests/CounterHooks.tsx b/packages/plugin-vite/demo/islands/tests/CounterHooks.tsx similarity index 100% rename from plugin-vite/demo/islands/tests/CounterHooks.tsx rename to packages/plugin-vite/demo/islands/tests/CounterHooks.tsx diff --git a/plugin-vite/demo/main.ts b/packages/plugin-vite/demo/main.ts similarity index 100% rename from plugin-vite/demo/main.ts rename to packages/plugin-vite/demo/main.ts diff --git a/plugin-vite/demo/routes/about.tsx b/packages/plugin-vite/demo/routes/about.tsx similarity index 100% rename from plugin-vite/demo/routes/about.tsx rename to packages/plugin-vite/demo/routes/about.tsx diff --git a/plugin-vite/demo/routes/index.tsx b/packages/plugin-vite/demo/routes/index.tsx similarity index 100% rename from plugin-vite/demo/routes/index.tsx rename to packages/plugin-vite/demo/routes/index.tsx diff --git a/plugin-vite/demo/routes/tests/island_hooks.tsx b/packages/plugin-vite/demo/routes/tests/island_hooks.tsx similarity index 100% rename from plugin-vite/demo/routes/tests/island_hooks.tsx rename to packages/plugin-vite/demo/routes/tests/island_hooks.tsx diff --git a/plugin-vite/demo/routes/tests/it_works.tsx b/packages/plugin-vite/demo/routes/tests/it_works.tsx similarity index 100% rename from plugin-vite/demo/routes/tests/it_works.tsx rename to packages/plugin-vite/demo/routes/tests/it_works.tsx diff --git a/plugin-vite/demo/static/foo.txt b/packages/plugin-vite/demo/static/foo.txt similarity index 100% rename from plugin-vite/demo/static/foo.txt rename to packages/plugin-vite/demo/static/foo.txt diff --git a/plugin-vite/demo/static/test_static/foo.txt b/packages/plugin-vite/demo/static/test_static/foo.txt similarity index 100% rename from plugin-vite/demo/static/test_static/foo.txt rename to packages/plugin-vite/demo/static/test_static/foo.txt diff --git a/plugin-vite/demo/vite.config.ts b/packages/plugin-vite/demo/vite.config.ts similarity index 100% rename from plugin-vite/demo/vite.config.ts rename to packages/plugin-vite/demo/vite.config.ts diff --git a/plugin-vite/deno.json b/packages/plugin-vite/deno.json similarity index 100% rename from plugin-vite/deno.json rename to packages/plugin-vite/deno.json diff --git a/plugin-vite/src/mod.ts b/packages/plugin-vite/src/mod.ts similarity index 100% rename from plugin-vite/src/mod.ts rename to packages/plugin-vite/src/mod.ts diff --git a/plugin-vite/src/plugins/build_id.ts b/packages/plugin-vite/src/plugins/build_id.ts similarity index 100% rename from plugin-vite/src/plugins/build_id.ts rename to packages/plugin-vite/src/plugins/build_id.ts diff --git a/plugin-vite/src/plugins/client_entry.ts b/packages/plugin-vite/src/plugins/client_entry.ts similarity index 100% rename from plugin-vite/src/plugins/client_entry.ts rename to packages/plugin-vite/src/plugins/client_entry.ts diff --git a/plugin-vite/src/plugins/client_snapshot.ts b/packages/plugin-vite/src/plugins/client_snapshot.ts similarity index 100% rename from plugin-vite/src/plugins/client_snapshot.ts rename to packages/plugin-vite/src/plugins/client_snapshot.ts diff --git a/plugin-vite/src/plugins/deno.ts b/packages/plugin-vite/src/plugins/deno.ts similarity index 100% rename from plugin-vite/src/plugins/deno.ts rename to packages/plugin-vite/src/plugins/deno.ts diff --git a/plugin-vite/src/plugins/dev_server.ts b/packages/plugin-vite/src/plugins/dev_server.ts similarity index 100% rename from plugin-vite/src/plugins/dev_server.ts rename to packages/plugin-vite/src/plugins/dev_server.ts diff --git a/plugin-vite/src/plugins/server_entry.ts b/packages/plugin-vite/src/plugins/server_entry.ts similarity index 100% rename from plugin-vite/src/plugins/server_entry.ts rename to packages/plugin-vite/src/plugins/server_entry.ts diff --git a/plugin-vite/src/plugins/server_snapshot.ts b/packages/plugin-vite/src/plugins/server_snapshot.ts similarity index 100% rename from plugin-vite/src/plugins/server_snapshot.ts rename to packages/plugin-vite/src/plugins/server_snapshot.ts diff --git a/plugin-vite/src/request.ts b/packages/plugin-vite/src/request.ts similarity index 100% rename from plugin-vite/src/request.ts rename to packages/plugin-vite/src/request.ts diff --git a/plugin-vite/src/utils.ts b/packages/plugin-vite/src/utils.ts similarity index 100% rename from plugin-vite/src/utils.ts rename to packages/plugin-vite/src/utils.ts diff --git a/plugin-vite/tests/build_test.ts b/packages/plugin-vite/tests/build_test.ts similarity index 97% rename from plugin-vite/tests/build_test.ts rename to packages/plugin-vite/tests/build_test.ts index 73e7d441ad5..39864c2fd3b 100644 --- a/plugin-vite/tests/build_test.ts +++ b/packages/plugin-vite/tests/build_test.ts @@ -3,7 +3,7 @@ import { waitForText, withBrowser, withChildProcessServer, -} from "../../tests/test_utils.tsx"; +} from "../../fresh/tests/test_utils.tsx"; import { buildVite } from "./test_utils.ts"; Deno.test({ diff --git a/plugin-vite/tests/dev_server_test.ts b/packages/plugin-vite/tests/dev_server_test.ts similarity index 96% rename from plugin-vite/tests/dev_server_test.ts rename to packages/plugin-vite/tests/dev_server_test.ts index c5bf1b117d5..f20c58f6015 100644 --- a/plugin-vite/tests/dev_server_test.ts +++ b/packages/plugin-vite/tests/dev_server_test.ts @@ -1,6 +1,6 @@ import * as path from "@std/path"; import { expect } from "@std/expect"; -import { waitForText, withBrowser } from "../../tests/test_utils.tsx"; +import { waitForText, withBrowser } from "../../fresh/tests/test_utils.tsx"; import { updateFile, withDevServer } from "./test_utils.ts"; Deno.test({ diff --git a/plugin-vite/tests/test_utils.ts b/packages/plugin-vite/tests/test_utils.ts similarity index 94% rename from plugin-vite/tests/test_utils.ts rename to packages/plugin-vite/tests/test_utils.ts index 3fa6dc454a2..de3f1ee891e 100644 --- a/plugin-vite/tests/test_utils.ts +++ b/packages/plugin-vite/tests/test_utils.ts @@ -1,8 +1,8 @@ import { createBuilder } from "vite"; import * as path from "@std/path"; import { walk } from "@std/fs/walk"; -import { withTmpDir } from "../../src/test_utils.ts"; -import { withChildProcessServer } from "../../tests/test_utils.tsx"; +import { withTmpDir } from "../../fresh/src/test_utils.ts"; +import { withChildProcessServer } from "../../fresh/tests/test_utils.tsx"; export const DEMO_DIR = path.join(import.meta.dirname!, "..", "demo"); diff --git a/update/README.md b/packages/update/README.md similarity index 100% rename from update/README.md rename to packages/update/README.md diff --git a/update/deno.json b/packages/update/deno.json similarity index 100% rename from update/deno.json rename to packages/update/deno.json diff --git a/update/src/mod.ts b/packages/update/src/mod.ts similarity index 100% rename from update/src/mod.ts rename to packages/update/src/mod.ts diff --git a/update/src/update.ts b/packages/update/src/update.ts similarity index 100% rename from update/src/update.ts rename to packages/update/src/update.ts diff --git a/update/src/update_test.ts b/packages/update/src/update_test.ts similarity index 99% rename from update/src/update_test.ts rename to packages/update/src/update_test.ts index 43c242c30ec..e2abdac761e 100644 --- a/update/src/update_test.ts +++ b/packages/update/src/update_test.ts @@ -8,7 +8,7 @@ import { import { expect } from "@std/expect"; import { spy, type SpyCall } from "@std/testing/mock"; import { walk } from "@std/fs/walk"; -import { withTmpDir, writeFiles } from "../../src/test_utils.ts"; +import { withTmpDir, writeFiles } from "../../fresh/src/test_utils.ts"; async function readFiles(dir: string): Promise> { const files: Record = {}; diff --git a/update/src/utils.ts b/packages/update/src/utils.ts similarity index 100% rename from update/src/utils.ts rename to packages/update/src/utils.ts diff --git a/tools/check_docs.ts b/tools/check_docs.ts index 0b0363d9c9f..70440843312 100644 --- a/tools/check_docs.ts +++ b/tools/check_docs.ts @@ -1,5 +1,5 @@ import { checkDocs } from "https://github.com/denoland/std/raw/refs/heads/main/_tools/check_docs.ts"; await checkDocs([ - import.meta.resolve("../src/error.ts"), + import.meta.resolve("../packages/fresh/src/error.ts"), ]); diff --git a/tools/release.ts b/tools/release.ts index 2c01b7464d5..e0cd3e26ade 100644 --- a/tools/release.ts +++ b/tools/release.ts @@ -1,6 +1,6 @@ import * as cl from "@std/fmt/colors"; import * as path from "@std/path"; -import type { DenoJson } from "../update/src/update.ts"; +import type { DenoJson } from "../packages/update/src/update.ts"; import * as semver from "@std/semver"; function showHelp() { @@ -24,7 +24,7 @@ if (Deno.args.length === 0) { } const ROOT_DIR = path.join(import.meta.dirname!, ".."); -const denoJsonPath = path.join(ROOT_DIR, "deno.json"); +const denoJsonPath = path.join(ROOT_DIR, "packages", "fresh", "deno.json"); const wwwDenoJsonPath = path.join(ROOT_DIR, "www", "deno.json"); const denoJson = JSON.parse(await Deno.readTextFile(denoJsonPath)) as DenoJson; @@ -54,11 +54,11 @@ if (version === "major") { } } -const initJsonPath = path.join(ROOT_DIR, "init", "deno.json"); +const initJsonPath = path.join(ROOT_DIR, "packages", "init", "deno.json"); const initJson = JSON.parse(await Deno.readTextFile(initJsonPath)); const currentInit = semver.parse(initJson.version); -const updateJsonPath = path.join(ROOT_DIR, "update", "deno.json"); +const updateJsonPath = path.join(ROOT_DIR, "packages", "update", "deno.json"); const updateJson = JSON.parse(await Deno.readTextFile(updateJsonPath)); const currentUpdate = semver.parse(updateJson.version); @@ -87,7 +87,7 @@ if (!confirm("Proceed with update?")) { const denoTailwindJson = JSON.parse( await Deno.readTextFile( - path.join(ROOT_DIR, "plugin-tailwindcss", "deno.json"), + path.join(ROOT_DIR, "packages", "plugin-tailwindcss", "deno.json"), ), ) as DenoJson; @@ -183,8 +183,20 @@ await replaceInFile( replaceDepVersion("npm", "@preact/signals", preactSignalsVersion), ); -const updateScriptPath = path.join(ROOT_DIR, "update", "src", "update.ts"); +const updateScriptPath = path.join( + ROOT_DIR, + "packages", + "update", + "src", + "update.ts", +); await replaceInFile(updateScriptPath, updateVersions); -const initScriptPath = path.join(ROOT_DIR, "init", "src", "init.ts"); +const initScriptPath = path.join( + ROOT_DIR, + "packages", + "init", + "src", + "init.ts", +); await replaceInFile(initScriptPath, updateVersions); diff --git a/www/main_test.ts b/www/main_test.ts index 21651194e65..d15cc9a7b4c 100644 --- a/www/main_test.ts +++ b/www/main_test.ts @@ -1,6 +1,9 @@ import VERSIONS from "../versions.json" with { type: "json" }; import { app } from "./main.ts"; -import { buildProd, withBrowserApp } from "../tests/test_utils.tsx"; +import { + buildProd, + withBrowserApp, +} from "../packages/fresh/tests/test_utils.tsx"; import { expect } from "@std/expect"; import { retry } from "@std/async/retry"; diff --git a/www/utils/markdown.ts b/www/utils/markdown.ts index d5553a34a82..66f677de810 100644 --- a/www/utils/markdown.ts +++ b/www/utils/markdown.ts @@ -1,4 +1,4 @@ -import denoJson from "../../deno.json" with { type: "json" }; +import denoJson from "../../packages/fresh/deno.json" with { type: "json" }; export { extractYaml as frontMatter } from "@std/front-matter";