diff --git a/Cargo.toml b/Cargo.toml index f92a0a02909..a49f424ff69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [workspace] members = [ - "packages/qwik/src/napi", - "packages/qwik/src/wasm", - "packages/qwik/src/optimizer/cli", - "packages/qwik/src/optimizer/core", + "packages/qwik-optimizer/rust/napi", + "packages/qwik-optimizer/rust/wasm", + "packages/qwik-optimizer/rust/cli", + "packages/qwik-optimizer/rust/core", ] -exclude = ["packages/qwik/src/wasm"] +exclude = ["packages/qwik-optimizer/rust/wasm"] resolver = "2" [profile.release] diff --git a/Makefile b/Makefile index 8597758b38b..fd871d88c64 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ add-target: install-all: install-rust install-rust-deps install-cli: - cd src/optimizer/cli && cargo install --path . + cd rust/cli && cargo install --path . fix: cargo fmt @@ -26,21 +26,21 @@ lint: # We only test core because there are no other tests and qwik-napi breaks the build test: - cargo test --manifest-path packages/qwik/src/optimizer/core/Cargo.toml + cargo test --manifest-path packages/qwik-optimizer/rust/core/Cargo.toml test-update: - if ! cargo test --manifest-path packages/qwik/src/optimizer/core/Cargo.toml; then \ - cd packages/qwik/src/optimizer/core/src/snapshots/; \ + if ! cargo test --manifest-path packages/qwik-optimizer/rust/core/Cargo.toml; then \ + cd packages/qwik-optimizer/rust/core/src/snapshots/; \ for i in *.new; do f=$$(basename $$i .new); mv $$i $$f; done; \ cd -; \ - cargo test --manifest-path packages/qwik/src/optimizer/core/Cargo.toml; \ + cargo test --manifest-path packages/qwik-optimizer/rust/core/Cargo.toml; \ fi publish-core: - cd src/optimizer/core && cargo publish --all-features + cd rust/core && cargo publish --all-features publish-cli: - cd src/optimizer/cli && cargo publish + cd rust/cli && cargo publish publish: publish-core publish-cli diff --git a/package.json b/package.json index 4bc3ebdfdea..9a2fd0f1fa6 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,16 @@ ], "pinVersion": "^5" }, + { + "label": "The optimizer version must be fixed", + "dependencies": [ + "@builder.io/qwik-optimizer" + ], + "dependencyTypes": [ + "!local" + ], + "pinVersion": "workspace:*" + }, { "label": "use workspace protocol for local packages and allow patch versions (used in e.g. qwik-react)", "dependencies": [ @@ -167,10 +177,11 @@ "packageManager": "pnpm@9.1.2", "pnpm": { "overrides": { - "typescript": "5.4.5", - "vfile": "6.0.1", + "@microsoft/api-extractor": "$@microsoft/api-extractor", + "@supabase/realtime-js": "2.8.4", "sharp": ">=0.33", - "@supabase/realtime-js": "2.8.4" + "typescript": "$typescript", + "vfile": "$vfile" }, "patchedDependencies": { "density-clustering@1.3.0": "patches/density-clustering@1.3.0.patch" diff --git a/packages/qwik-optimizer/.gitignore b/packages/qwik-optimizer/.gitignore new file mode 100644 index 00000000000..bb863cf9a0b --- /dev/null +++ b/packages/qwik-optimizer/.gitignore @@ -0,0 +1 @@ +bindings diff --git a/packages/qwik-optimizer/api-extractor.json b/packages/qwik-optimizer/api-extractor.json new file mode 100644 index 00000000000..6110bc12770 --- /dev/null +++ b/packages/qwik-optimizer/api-extractor.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", + "mainEntryPointFilePath": "/lib/index.d.ts", + "apiReport": { + "enabled": true, + "reportFileName": "api.md", + "reportFolder": "/src/", + "reportTempFolder": "/dist-dev/api-extractor/optimizer/" + }, + "dtsRollup": { + "enabled": false + }, + "docModel": { + "enabled": true, + "apiJsonFilePath": "/../../dist-dev/api/qwik/optimizer/docs.api.json" + } +} diff --git a/packages/qwik-optimizer/package.json b/packages/qwik-optimizer/package.json new file mode 100644 index 00000000000..8db64e16852 --- /dev/null +++ b/packages/qwik-optimizer/package.json @@ -0,0 +1,28 @@ +{ + "annotation": "This package is for internal use in the monorepo, the build gets copied into qwik", + "name": "@builder.io/qwik-optimizer", + "version": "1.5.1", + "files": [ + "bindings", + "lib" + ], + "license": "MIT", + "exports": { + ".": { + "import": "./lib/index.mjs", + "require": "./lib/index.cjs", + "types": "./lib/index.d.ts" + } + }, + "repository": { + "type": "git", + "url": "https://github.com/BuilderIO/qwik.git", + "directory": "packages/qwik-optimizer" + }, + "sideEffects": false, + "type": "module", + "devDependencies": { + "image-size": "1.1.1", + "kleur": "4.1.5" + } +} diff --git a/packages/qwik/src/optimizer/cli/Cargo.toml b/packages/qwik-optimizer/rust/cli/Cargo.toml similarity index 100% rename from packages/qwik/src/optimizer/cli/Cargo.toml rename to packages/qwik-optimizer/rust/cli/Cargo.toml diff --git a/packages/qwik/src/optimizer/cli/src/main.rs b/packages/qwik-optimizer/rust/cli/src/main.rs similarity index 100% rename from packages/qwik/src/optimizer/cli/src/main.rs rename to packages/qwik-optimizer/rust/cli/src/main.rs diff --git a/packages/qwik/src/optimizer/core/Cargo.toml b/packages/qwik-optimizer/rust/core/Cargo.toml similarity index 100% rename from packages/qwik/src/optimizer/core/Cargo.toml rename to packages/qwik-optimizer/rust/core/Cargo.toml diff --git a/packages/qwik/src/optimizer/core/Makefile b/packages/qwik-optimizer/rust/core/Makefile similarity index 100% rename from packages/qwik/src/optimizer/core/Makefile rename to packages/qwik-optimizer/rust/core/Makefile diff --git a/packages/qwik/src/optimizer/core/README.md b/packages/qwik-optimizer/rust/core/README.md similarity index 100% rename from packages/qwik/src/optimizer/core/README.md rename to packages/qwik-optimizer/rust/core/README.md diff --git a/packages/qwik/src/optimizer/core/benches/transform.rs b/packages/qwik-optimizer/rust/core/benches/transform.rs similarity index 100% rename from packages/qwik/src/optimizer/core/benches/transform.rs rename to packages/qwik-optimizer/rust/core/benches/transform.rs diff --git a/packages/qwik/src/optimizer/core/src/add_side_effect.rs b/packages/qwik-optimizer/rust/core/src/add_side_effect.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/add_side_effect.rs rename to packages/qwik-optimizer/rust/core/src/add_side_effect.rs diff --git a/packages/qwik/src/optimizer/core/src/clean_side_effects.rs b/packages/qwik-optimizer/rust/core/src/clean_side_effects.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/clean_side_effects.rs rename to packages/qwik-optimizer/rust/core/src/clean_side_effects.rs diff --git a/packages/qwik/src/optimizer/core/src/code_move.rs b/packages/qwik-optimizer/rust/core/src/code_move.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/code_move.rs rename to packages/qwik-optimizer/rust/core/src/code_move.rs diff --git a/packages/qwik/src/optimizer/core/src/collector.rs b/packages/qwik-optimizer/rust/core/src/collector.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/collector.rs rename to packages/qwik-optimizer/rust/core/src/collector.rs diff --git a/packages/qwik/src/optimizer/core/src/const_replace.rs b/packages/qwik-optimizer/rust/core/src/const_replace.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/const_replace.rs rename to packages/qwik-optimizer/rust/core/src/const_replace.rs diff --git a/packages/qwik/src/optimizer/core/src/entry_strategy.rs b/packages/qwik-optimizer/rust/core/src/entry_strategy.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/entry_strategy.rs rename to packages/qwik-optimizer/rust/core/src/entry_strategy.rs diff --git a/packages/qwik/src/optimizer/core/src/errors.rs b/packages/qwik-optimizer/rust/core/src/errors.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/errors.rs rename to packages/qwik-optimizer/rust/core/src/errors.rs diff --git a/packages/qwik/src/optimizer/core/src/filter_exports.rs b/packages/qwik-optimizer/rust/core/src/filter_exports.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/filter_exports.rs rename to packages/qwik-optimizer/rust/core/src/filter_exports.rs diff --git a/packages/qwik/src/optimizer/core/src/fixtures/index.qwik.mjs b/packages/qwik-optimizer/rust/core/src/fixtures/index.qwik.mjs similarity index 100% rename from packages/qwik/src/optimizer/core/src/fixtures/index.qwik.mjs rename to packages/qwik-optimizer/rust/core/src/fixtures/index.qwik.mjs diff --git a/packages/qwik/src/optimizer/core/src/has_branches.rs b/packages/qwik-optimizer/rust/core/src/has_branches.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/has_branches.rs rename to packages/qwik-optimizer/rust/core/src/has_branches.rs diff --git a/packages/qwik/src/optimizer/core/src/inlined_fn.rs b/packages/qwik-optimizer/rust/core/src/inlined_fn.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/inlined_fn.rs rename to packages/qwik-optimizer/rust/core/src/inlined_fn.rs diff --git a/packages/qwik/src/optimizer/core/src/is_const.rs b/packages/qwik-optimizer/rust/core/src/is_const.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/is_const.rs rename to packages/qwik-optimizer/rust/core/src/is_const.rs diff --git a/packages/qwik/src/optimizer/core/src/lib.rs b/packages/qwik-optimizer/rust/core/src/lib.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/lib.rs rename to packages/qwik-optimizer/rust/core/src/lib.rs diff --git a/packages/qwik/src/optimizer/core/src/package_json.rs b/packages/qwik-optimizer/rust/core/src/package_json.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/package_json.rs rename to packages/qwik-optimizer/rust/core/src/package_json.rs diff --git a/packages/qwik/src/optimizer/core/src/parse.rs b/packages/qwik-optimizer/rust/core/src/parse.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/parse.rs rename to packages/qwik-optimizer/rust/core/src/parse.rs diff --git a/packages/qwik/src/optimizer/core/src/props_destructuring.rs b/packages/qwik-optimizer/rust/core/src/props_destructuring.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/props_destructuring.rs rename to packages/qwik-optimizer/rust/core/src/props_destructuring.rs diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_1.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_1.snap index 116d1709ae1..febaec09074 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_1.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 90 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 91 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_10.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_10.snap index b6bd880dde9..ec799dc4437 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_10.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 267 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 268 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_11.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_11.snap index affc410f77a..e372c1d7930 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_11.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 297 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 298 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_2.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_2.snap index a0d544392c9..5e750d68c11 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_2.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 111 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 112 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_3.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_3.snap index 9cf8e5370b5..6db34018f64 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_3.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 128 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 129 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_4.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_4.snap index b750ec606c4..20214d86b11 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_4.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 148 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 149 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_5.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_5.snap index 875b8400f1b..7a0fe358ba5 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_5.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 168 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 169 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_6.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_6.snap similarity index 93% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_6.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_6.snap index 3e409cd98af..03aac2aecfc 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_6.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_6.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 187 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 188 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_7.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_7.snap index 6a42caa0d56..91c0d066a62 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_7.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 199 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 200 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_8.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_8.snap index 2cb68bfe98b..115e4e8da74 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_8.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 223 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 224 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_9.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_9.snap index 71665f91050..6fa34c670ab 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_9.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 245 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 246 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_build_server.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_build_server.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_build_server.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_build_server.snap index 94d2bf74c28..eeac4c61dcf 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_build_server.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_build_server.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2730 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2731 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capture_imports.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capture_imports.snap index f4fe32baf65..ebd01d31b13 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capture_imports.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1023 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1024 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap index c56fad9a73d..1068773dda2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1044 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1045 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_class_name.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_class_name.snap index a69dd919f61..9dbfd606fca 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_class_name.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2647 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2648 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap index 696027951db..384e378df1e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1306 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1307 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dead_code.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dead_code.snap similarity index 94% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dead_code.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dead_code.snap index 455679e1643..20e53a43a0b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dead_code.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dead_code.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 448 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 449 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export.snap index e3e5d12e589..62596a0cfea 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1547 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1548 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_index.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_index.snap similarity index 91% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_index.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_index.snap index 3dab467ffc7..563bd0fd53f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_index.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_index.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1572 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1573 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap index cc48d33f26b..1e35686e67e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_default_export_invalid_ident.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1593 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1594 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap index c4842e0ba17..8e95e1744ad 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2861 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2862 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap index 2c61c504d86..8b1d99680f9 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2994 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2995 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap index 903094812ef..bb6f3169ebc 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2962 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2963 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap index 13df1620000..7d508ffe593 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_div.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2773 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2774 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap index 91572212ffb..aaa93a83fed 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2916 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2917 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode.snap index 39b1cb0604b..aac37f6497b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2298 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2299 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap index 3693928ce5a..231d2a10aac 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2320 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2321 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap index 8fb4332da74..86927f35afe 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_drop_side_effects.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 820 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 821 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap index 3e763d0b8e0..0bf21577e8d 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1412 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1413 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap index aeab8e477e4..a6146ff8b26 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_explicit_ext_transpile.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1391 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1392 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_export_issue.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_export_issue.snap index d42e09d88e7..b7b90f20c68 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_export_issue.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2408 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2409 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_exports.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_exports.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_exports.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_exports.snap index dc147cadbe1..4b644645d62 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_exports.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_exports.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1094 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1095 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap index 7292e5b3f05..770cd21757f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_fix_dynamic_import.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1279 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1280 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component.snap index 9627b01bfe9..5de94d74a74 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 327 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 328 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_2.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_2.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_2.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_2.snap index 938998c1b26..6826fda893f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_2.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_2.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 347 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 348 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap index 63ec2f8a4b2..4aaa4543b6d 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_functional_component_capture_props.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 387 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 388 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_getter_generation.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_getter_generation.snap index 18de739f53a..f464f1d940b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_getter_generation.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3074 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3075 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap index 039a5161a9b..7938638f00b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2136 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2137 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap similarity index 92% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap index a4f77cb6a25..a785efb0838 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2602 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2603 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_import_assertion.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_import_assertion.snap similarity index 94% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_import_assertion.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_import_assertion.snap index 638f5619ebc..95b922ddb8a 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_import_assertion.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_import_assertion.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2042 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2043 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap index 01ccbe6d10f..85f96b1a41c 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_inlined_entry_strategy.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1514 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1515 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_input_bind.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_input_bind.snap index 0effcb79d14..f2ba526653b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_input_bind.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2011 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2012 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_references.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_references.snap index 279ff8542f9..7829e0d3b7c 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_references.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 969 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 970 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap index b30c1d5bdca..c0789a23679 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_invalid_segment_expr1.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 997 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 998 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_33443.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_33443.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_33443.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_33443.snap index f1210b15051..9b66a04a70e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_33443.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_33443.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3047 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3048 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_4438.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_4438.snap index 9608a3a7e89..30943c77120 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_issue_4438.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2837 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2838 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx.snap index cbbd80178b2..7bceabd5343 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1142 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1143 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap index 5c32cbbb2e5..d7a19ac92cf 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_import_source.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1432 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1433 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap index 5908b14f0a0..f296be4b6b2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2439 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2440 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap index dac5a872e2b..9f695e9fd6e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2465 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2466 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap index 7ce95ff835d..6bf7a7cd293 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_jsx_listeners.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1193 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1194 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap index 052c11a3a24..ae21e0bedcf 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_lightweight_functional.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 935 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 936 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_manual_chunks.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_manual_chunks.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_manual_chunks.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_manual_chunks.snap index a3e32124283..72e9e32d918 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_manual_chunks.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_manual_chunks.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1711 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1712 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap index b4a212b0480..5c1b24a74c4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_missing_custom_inlined_functions.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1341 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1342 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_multi_capture.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_multi_capture.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_multi_capture.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_multi_capture.snap index 5b1ceafadc9..84b15323634 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_multi_capture.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_multi_capture.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 414 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 415 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_mutable_children.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_mutable_children.snap index 7d246b65261..5d4e7761540 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_mutable_children.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2494 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2495 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap index 0e2b6280402..8efa308d6dd 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_noop_dev_mode.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3678 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3682 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap index 9a89aa00697..66c251fe6e2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3586 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3590 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap index 4d274ef80c3..3189b238723 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3542.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 767 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 768 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap index f0c79b85d1d..5fcab93ed36 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3561.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 705 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 706 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap similarity index 94% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap index fb21bf0407d..6b4dd432d77 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_3795.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 795 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 796 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap similarity index 91% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap index 5e065060b4a..d401819a558 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_optimization_issue_4386.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 739 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 740 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap index 127eb528465..0deafeab46f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_parsed_inlined_qrls.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1613 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1614 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap similarity index 93% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap index e7d4af067a5..37cd1c3a0db 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2679 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2680 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap index bf9ed966747..8759fb76fb2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_preserve_filenames_segments.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2703 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2704 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_prod_node.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_prod_node.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_prod_node.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_prod_node.snap index 5660c9afb07..db57ddbca68 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_prod_node.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_prod_node.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1456 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1457 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_optimization.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_optimization.snap index b222b8f55b2..b2f1483b661 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_optimization.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 514 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 515 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping.snap index 6ade390dc2d..851611e8cde 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 567 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 568 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap index 6f3b601ef53..f78cdf843e4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping2.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 594 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 595 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap index e9c714cc6bd..f63c051ea07 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 621 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 622 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap index 43b77553ffb..d34dbb621a4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_props_wrapping_children2.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 648 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 649 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap index 771481fce51..883bd0efa9e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_city_inline.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3324 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3325 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap index 312dfcb8b4d..6f38e5a167d 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_conflict.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1236 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1237 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react.snap index 7bdfe14d2a3..53a34f48ebf 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3118 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3119 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap index 519a609f285..b3bf597c3c9 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3221 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3222 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap index 2ad8540ccf2..e2d8f16bc27 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 864 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 865 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap index 6c0f963ef73..370ee74c5f1 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_hoisted.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 911 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 912 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap similarity index 93% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap index e315df46d30..86ca8cbbfef 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_reg_ctx_name_segments_inlined.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 890 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 891 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_renamed_exports.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_renamed_exports.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_renamed_exports.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_renamed_exports.snap index 937bcacc82e..a75f52ebab3 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_renamed_exports.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_renamed_exports.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1073 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1074 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_server_auth.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_server_auth.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_server_auth.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_server_auth.snap index e647fedc275..d621cb65b2a 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_server_auth.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_server_auth.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1877 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1878 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_skip_transform.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_skip_transform.snap similarity index 91% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_skip_transform.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_skip_transform.snap index e2ef8d8ece5..1607ddbefb1 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_skip_transform.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_skip_transform.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1369 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1370 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_spread_jsx.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_spread_jsx.snap index 371cbcdcb81..9ca04bb5bf4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_spread_jsx.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2365 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2366 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_client_code.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_client_code.snap index 77cd4c735af..09403fdf60e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_client_code.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1928 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1929 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap index 2155c2d0527..ca4eeb8f8ae 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_unused.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1766 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1767 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap index c20cea0b572..34943ff5d5b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_exports_used.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1792 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1793 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_server_code.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_server_code.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_server_code.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_server_code.snap index d985eeefcfc..db797a38293 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_server_code.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_strip_server_code.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1821 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1822 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap index 1d44ebc1275..3739ec7d2be 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2343 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2344 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap similarity index 92% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap index a8fdceb72cd..e3d8a2f7c76 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_transpile_ts_only.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2624 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2625 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums.snap index 80ae67926a4..a9155f7f7a0 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2252 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2253 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap index 342bb321e0f..c687b9b4eae 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2197 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2198 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap index 38204783f81..c493516248d 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_ts_enums_no_transpile.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2224 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2225 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_client_effect.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_client_effect.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_client_effect.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_client_effect.snap index 65e64102c98..0d3b5e98b32 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_client_effect.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_client_effect.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1478 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1479 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_optimization.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_optimization.snap similarity index 93% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_optimization.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_optimization.snap index 2661c0405a9..51b2c94b4cd 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_optimization.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_optimization.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 677 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 678 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_server_mount.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_server_mount.snap similarity index 99% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_server_mount.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_server_mount.snap index e43f8879562..33665384fa2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_use_server_mount.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_use_server_mount.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1660 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1661 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_style.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_style.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_style.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_style.snap index 39c7955ec1e..4da24647af7 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_style.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_style.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 494 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 495 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_tagname.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_tagname.snap similarity index 96% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_tagname.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_tagname.snap index b520d2e5358..21278d69a58 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_with_tagname.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__example_with_tagname.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 472 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 473 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__impure_template_fns.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__impure_template_fns.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__impure_template_fns.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__impure_template_fns.snap index 76bee1806fd..9023de59aa4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__impure_template_fns.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__impure_template_fns.snap @@ -1,5 +1,5 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs +source: packages/qwik-optimizer/rust/core/src/test.rs assertion_line: 3787 expression: output --- diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_117.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_117.snap similarity index 85% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_117.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_117.snap index 92435af9782..fc62ebd0adb 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_117.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_117.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1129 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1130 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_150.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_150.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_150.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_150.snap index 1f78edfbc16..ff75e643e3a 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_150.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_150.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 1980 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 1981 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_476.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_476.snap similarity index 92% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_476.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_476.snap index 58fda5c7c26..da28f5a1ee4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_476.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_476.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2088 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2089 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_5008.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_5008.snap index 05a8a9ae1c3..830c5490924 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_5008.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3558 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3562 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_964.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_964.snap similarity index 95% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_964.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_964.snap index dd80e3fb8fa..4a584285209 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_964.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__issue_964.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2115 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2116 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap index 873a3ce0c38..4f82c241bea 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__lib_mode_fn_signal.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3716 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3720 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__relative_paths.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__relative_paths.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__relative_paths.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__relative_paths.snap index c9a7c6337f9..d0215c04ebc 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__relative_paths.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__relative_paths.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3413 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3415 expression: output --- ============================= ../../node_modules/dep/dist/app_component_div_p_button_onclick_8dwua0cjar4.js (ENTRY POINT)== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_destructure_args.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_destructure_args.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_destructure_args.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_destructure_args.snap index b6196076e2c..2ddc1ee9e9e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_destructure_args.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_destructure_args.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3614 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3618 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap similarity index 98% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap index c5acb2c92a5..57e32aa182d 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__should_handle_dangerously_set_inner_html.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3644 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3648 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__special_jsx.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__special_jsx.snap similarity index 90% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__special_jsx.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__special_jsx.snap index 991ea197a37..4f3b804c0ea 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__special_jsx.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__special_jsx.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2279 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2280 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__support_windows_paths.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__support_windows_paths.snap similarity index 94% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__support_windows_paths.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__support_windows_paths.snap index c4083c1e764..81ed48ac9f4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__support_windows_paths.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__support_windows_paths.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 2060 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 2061 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__ternary_prop.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__ternary_prop.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__ternary_prop.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__ternary_prop.snap index 5701e987981..b8bda8693a4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__ternary_prop.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__ternary_prop.snap @@ -1,6 +1,6 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs -assertion_line: 3748 +source: packages/qwik-optimizer/rust/core/src/test.rs +assertion_line: 3747 expression: output --- ==INPUT== diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap similarity index 97% rename from packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap rename to packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap index ebf3224ba62..d553c581da1 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap +++ b/packages/qwik-optimizer/rust/core/src/snapshots/qwik_core__test__transform_qrl_in_regular_prop.snap @@ -1,5 +1,5 @@ --- -source: packages/qwik/src/optimizer/core/src/test.rs +source: packages/qwik-optimizer/rust/core/src/test.rs assertion_line: 3772 expression: output --- diff --git a/packages/qwik/src/optimizer/core/src/test.rs b/packages/qwik-optimizer/rust/core/src/test.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/test.rs rename to packages/qwik-optimizer/rust/core/src/test.rs diff --git a/packages/qwik/src/optimizer/core/src/transform.rs b/packages/qwik-optimizer/rust/core/src/transform.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/transform.rs rename to packages/qwik-optimizer/rust/core/src/transform.rs diff --git a/packages/qwik/src/optimizer/core/src/utils.rs b/packages/qwik-optimizer/rust/core/src/utils.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/utils.rs rename to packages/qwik-optimizer/rust/core/src/utils.rs diff --git a/packages/qwik/src/optimizer/core/src/words.rs b/packages/qwik-optimizer/rust/core/src/words.rs similarity index 100% rename from packages/qwik/src/optimizer/core/src/words.rs rename to packages/qwik-optimizer/rust/core/src/words.rs diff --git a/packages/qwik/src/napi/Cargo.toml b/packages/qwik-optimizer/rust/napi/Cargo.toml similarity index 84% rename from packages/qwik/src/napi/Cargo.toml rename to packages/qwik-optimizer/rust/napi/Cargo.toml index 6620462c175..ce7b360a1fc 100644 --- a/packages/qwik/src/napi/Cargo.toml +++ b/packages/qwik-optimizer/rust/napi/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] [dependencies] napi = { version = "2", features = ["serde-json"] } napi-derive = "2" -qwik-core = { path = "../optimizer/core", features = ["fs", "parallel"] } +qwik-core = { path = "../core", features = ["fs", "parallel"] } [target.'cfg(windows)'.dependencies] mimalloc = { version = "0.1.25", default-features = false } diff --git a/packages/qwik/src/napi/Cargo.toml.template b/packages/qwik-optimizer/rust/napi/Cargo.toml.template similarity index 100% rename from packages/qwik/src/napi/Cargo.toml.template rename to packages/qwik-optimizer/rust/napi/Cargo.toml.template diff --git a/packages/qwik/src/napi/build.rs b/packages/qwik-optimizer/rust/napi/build.rs similarity index 100% rename from packages/qwik/src/napi/build.rs rename to packages/qwik-optimizer/rust/napi/build.rs diff --git a/packages/qwik/src/napi/napi.config.json b/packages/qwik-optimizer/rust/napi/napi.config.json similarity index 100% rename from packages/qwik/src/napi/napi.config.json rename to packages/qwik-optimizer/rust/napi/napi.config.json diff --git a/packages/qwik/src/napi/src/lib.rs b/packages/qwik-optimizer/rust/napi/src/lib.rs similarity index 100% rename from packages/qwik/src/napi/src/lib.rs rename to packages/qwik-optimizer/rust/napi/src/lib.rs diff --git a/packages/qwik/src/napi/test.cjs b/packages/qwik-optimizer/rust/napi/test.cjs similarity index 100% rename from packages/qwik/src/napi/test.cjs rename to packages/qwik-optimizer/rust/napi/test.cjs diff --git a/packages/qwik/src/wasm/Cargo.lock b/packages/qwik-optimizer/rust/wasm/Cargo.lock similarity index 100% rename from packages/qwik/src/wasm/Cargo.lock rename to packages/qwik-optimizer/rust/wasm/Cargo.lock diff --git a/packages/qwik/src/wasm/Cargo.toml b/packages/qwik-optimizer/rust/wasm/Cargo.toml similarity index 94% rename from packages/qwik/src/wasm/Cargo.toml rename to packages/qwik-optimizer/rust/wasm/Cargo.toml index 757f6cf3f38..93e5dbf4866 100644 --- a/packages/qwik/src/wasm/Cargo.toml +++ b/packages/qwik-optimizer/rust/wasm/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["cdylib"] [dependencies] js-sys = "0.3" -qwik-core = { path = "../optimizer/core" } +qwik-core = { path = "../core" } serde = "1" serde-wasm-bindgen = "0.6" wasm-bindgen = "0.2" diff --git a/packages/qwik-optimizer/rust/wasm/LICENSE b/packages/qwik-optimizer/rust/wasm/LICENSE new file mode 100644 index 00000000000..5a8a0e25c4f --- /dev/null +++ b/packages/qwik-optimizer/rust/wasm/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2024 QwikDev +Copyright (c) 2021 BuilderIO + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/packages/qwik/src/wasm/src/lib.rs b/packages/qwik-optimizer/rust/wasm/src/lib.rs similarity index 100% rename from packages/qwik/src/wasm/src/lib.rs rename to packages/qwik-optimizer/rust/wasm/src/lib.rs diff --git a/packages/qwik/src/optimizer/src/index.ts b/packages/qwik-optimizer/src/index.ts similarity index 96% rename from packages/qwik/src/optimizer/src/index.ts rename to packages/qwik-optimizer/src/index.ts index 97dbe722982..5a2babb9677 100644 --- a/packages/qwik/src/optimizer/src/index.ts +++ b/packages/qwik-optimizer/src/index.ts @@ -1,11 +1,11 @@ export { createOptimizer } from './optimizer'; -export { versions } from './versions'; export type { ComponentEntryStrategy, Diagnostic, DiagnosticCategory, EntryStrategy, + GeneratedOutputBundle, GlobalInjections, SegmentAnalysis as HookAnalysis, SegmentAnalysis, @@ -19,6 +19,7 @@ export type { OptimizerSystem, Path, QwikBundle, + QwikBundleGraph, QwikManifest, QwikSymbol, ResolvedManifest, @@ -38,6 +39,8 @@ export type { TranspileOption, } from './types'; +export { versions } from './versions'; + export type { QwikBuildMode, QwikBuildTarget } from './plugins/plugin'; export type { QwikRollupPluginOptions } from './plugins/rollup'; export type { diff --git a/packages/qwik/src/optimizer/src/optimizer.ts b/packages/qwik-optimizer/src/optimizer.ts similarity index 100% rename from packages/qwik/src/optimizer/src/optimizer.ts rename to packages/qwik-optimizer/src/optimizer.ts diff --git a/packages/qwik/src/optimizer/src/path.ts b/packages/qwik-optimizer/src/path.ts similarity index 100% rename from packages/qwik/src/optimizer/src/path.ts rename to packages/qwik-optimizer/src/path.ts diff --git a/packages/qwik/src/optimizer/src/platform.ts b/packages/qwik-optimizer/src/platform.ts similarity index 99% rename from packages/qwik/src/optimizer/src/platform.ts rename to packages/qwik-optimizer/src/platform.ts index bf8f50bc701..192949e1363 100644 --- a/packages/qwik/src/optimizer/src/platform.ts +++ b/packages/qwik-optimizer/src/platform.ts @@ -313,6 +313,7 @@ const extensions: { [ext: string]: boolean } = { '.tsx': true, '.jsx': true, '.mjs': true, + '.mts': true, }; declare const globalThis: { IS_CJS: boolean; IS_ESM: boolean; [key: string]: any }; diff --git a/packages/qwik/src/optimizer/src/plugins/click-to-component.html b/packages/qwik-optimizer/src/plugins/click-to-component.html similarity index 100% rename from packages/qwik/src/optimizer/src/plugins/click-to-component.html rename to packages/qwik-optimizer/src/plugins/click-to-component.html diff --git a/packages/qwik/src/optimizer/src/plugins/error-host.html b/packages/qwik-optimizer/src/plugins/error-host.html similarity index 100% rename from packages/qwik/src/optimizer/src/plugins/error-host.html rename to packages/qwik-optimizer/src/plugins/error-host.html diff --git a/packages/qwik/src/optimizer/src/plugins/eslint-plugin.ts b/packages/qwik-optimizer/src/plugins/eslint-plugin.ts similarity index 97% rename from packages/qwik/src/optimizer/src/plugins/eslint-plugin.ts rename to packages/qwik-optimizer/src/plugins/eslint-plugin.ts index d9ac856fa3d..244655b2673 100644 --- a/packages/qwik/src/optimizer/src/plugins/eslint-plugin.ts +++ b/packages/qwik-optimizer/src/plugins/eslint-plugin.ts @@ -1,6 +1,6 @@ import type { Rollup } from 'vite'; import type { ESLint, Linter } from 'eslint'; -import type { OptimizerSystem } from '../types'; +import type { OptimizerSystem } from '..'; export interface QwikLinter { lint(ctx: Rollup.PluginContext, code: string, id: string): void; diff --git a/packages/qwik/src/optimizer/src/plugins/image-size-runtime.html b/packages/qwik-optimizer/src/plugins/image-size-runtime.html similarity index 100% rename from packages/qwik/src/optimizer/src/plugins/image-size-runtime.html rename to packages/qwik-optimizer/src/plugins/image-size-runtime.html diff --git a/packages/qwik/src/optimizer/src/plugins/image-size-server.ts b/packages/qwik-optimizer/src/plugins/image-size-server.ts similarity index 99% rename from packages/qwik/src/optimizer/src/plugins/image-size-server.ts rename to packages/qwik-optimizer/src/plugins/image-size-server.ts index 7fecfa8ff68..03bafc736aa 100644 --- a/packages/qwik/src/optimizer/src/plugins/image-size-server.ts +++ b/packages/qwik-optimizer/src/plugins/image-size-server.ts @@ -17,7 +17,7 @@ import webp_1 from 'image-size/dist/types/webp.js'; import heif_1 from 'image-size/dist/types/heif.js'; import type { Connect } from 'vite'; -import type { OptimizerSystem } from '../types'; +import type { OptimizerSystem } from '..'; // This map helps avoid validating for every single image type const firstBytes: Record = { diff --git a/packages/qwik/src/optimizer/src/manifest.ts b/packages/qwik-optimizer/src/plugins/manifest.ts similarity index 78% rename from packages/qwik/src/optimizer/src/manifest.ts rename to packages/qwik-optimizer/src/plugins/manifest.ts index 57050919c35..9652796f9ba 100644 --- a/packages/qwik/src/optimizer/src/manifest.ts +++ b/packages/qwik-optimizer/src/plugins/manifest.ts @@ -1,6 +1,6 @@ import type { OutputBundle } from 'rollup'; -import { type NormalizedQwikPluginOptions } from './plugins/plugin'; -import type { GlobalInjections, SegmentAnalysis, Path, QwikBundle, QwikManifest } from './types'; +import { type NormalizedQwikPluginOptions } from './plugin'; +import type { GlobalInjections, HookAnalysis, Path, QwikBundle, QwikManifest } from '..'; // This is just the initial prioritization of the symbols and entries // at build time so there's less work during each SSR. However, SSR should @@ -238,11 +238,10 @@ export function getValidManifest(manifest: QwikManifest | undefined | null) { export function generateManifestFromBundles( path: Path, - segments: SegmentAnalysis[], + hooks: HookAnalysis[], injections: GlobalInjections[], outputBundles: OutputBundle, - opts: NormalizedQwikPluginOptions, - debug: (...args: any[]) => void + opts: NormalizedQwikPluginOptions ) { const manifest: QwikManifest = { manifestHash: '', @@ -258,17 +257,13 @@ export function generateManifestFromBundles( }, }; - const buildPath = path.resolve(opts.rootDir, opts.outDir, 'build'); // We need to find our QRL exports - const qrlNames = new Set([...segments.map((h) => h.name)]); - for (const outputBundle of Object.values(outputBundles)) { + const qrlNames = new Set([...hooks.map((h) => h.name)]); + for (const [fileName, outputBundle] of Object.entries(outputBundles)) { if (outputBundle.type !== 'chunk') { continue; } - const bundleFileName = path.relative( - buildPath, - path.resolve(opts.outDir, outputBundle.fileName) - ); + const bundleFileName = path.basename(fileName); const buildDirName = path.dirname(outputBundle.fileName); const bundle: QwikBundle = { @@ -277,8 +272,8 @@ export function generateManifestFromBundles( for (const symbol of outputBundle.exports) { if (qrlNames.has(symbol)) { - // When not minifying we see both the entry and the segment file - // The segment file will only have 1 export, we want the entry + // When not minifying we see both the entry and the hook file + // The hook file will only have 1 export, we want the entry if (!manifest.mapping[symbol] || outputBundle.exports.length !== 1) { manifest.mapping[symbol] = bundleFileName; } @@ -287,23 +282,21 @@ export function generateManifestFromBundles( const bundleImports = outputBundle.imports .filter((i) => path.dirname(i) === buildDirName) - .map((i) => path.relative(buildDirName, outputBundles[i].fileName)); + .map((i) => path.relative(buildDirName, i)); if (bundleImports.length > 0) { bundle.imports = bundleImports; } const bundleDynamicImports = outputBundle.dynamicImports .filter((i) => path.dirname(i) === buildDirName) - .map((i) => path.relative(buildDirName, outputBundles[i].fileName)); + .map((i) => path.relative(buildDirName, i)); if (bundleDynamicImports.length > 0) { bundle.dynamicImports = bundleDynamicImports; } // Rollup doesn't provide the moduleIds in the outputBundle but Vite does const ids = outputBundle.moduleIds || Object.keys(outputBundle.modules); - const modulePaths = ids - .filter((m) => !m.startsWith(`\u0000`)) - .map((m) => path.relative(opts.rootDir, m)); + const modulePaths = ids.filter((m) => !m.startsWith(`\u0000`)); if (modulePaths.length > 0) { bundle.origins = modulePaths; } @@ -311,50 +304,26 @@ export function generateManifestFromBundles( manifest.bundles[bundleFileName] = bundle; } - for (const segment of segments) { - const symbol = segment.name; + for (const hook of hooks) { + const symbol = hook.name; const bundle = manifest.mapping[symbol]; if (!bundle) { - debug(`Note: qrl ${segment.name} is not in the bundle, likely tree shaken`, manifest); - continue; + console.error(`Unable to find bundle for hook: ${hook.name}`, manifest); + throw new Error(`Unable to find bundle for hook: ${hook.hash}`); } (manifest.bundles[bundle].symbols ||= []).push(symbol); manifest.symbols[symbol] = { - origin: segment.origin, - displayName: segment.displayName, - canonicalFilename: segment.canonicalFilename, - hash: segment.hash, - ctxKind: segment.ctxKind, - ctxName: segment.ctxName, - captures: segment.captures, - parent: segment.parent, - loc: segment.loc, + origin: hook.origin, + displayName: hook.displayName, + canonicalFilename: hook.canonicalFilename, + hash: hook.hash, + ctxKind: hook.ctxKind, + ctxName: hook.ctxName, + captures: hook.captures, + parent: hook.parent, + loc: hook.loc, }; } - // To inspect the bundles, uncomment the following lines - // and temporarily add the writeFileSync import from fs - // writeFileSync( - // 'output-bundles.json', - // JSON.stringify( - // Object.entries(outputBundles).map(([n, b]) => [ - // n, - // { - // ...b, - // code: '', - // map: '', - // source: '', - // modules: - // 'modules' in b - // ? Object.fromEntries( - // Object.entries(b.modules).map(([k, v]) => [k, { ...v, code: '' }]) - // ) - // : undefined, - // }, - // ]), - // null, - // '\t' - // ) - // ); return updateSortAndPriorities(manifest); } diff --git a/packages/qwik/src/optimizer/src/plugins/perf-warning.html b/packages/qwik-optimizer/src/plugins/perf-warning.html similarity index 100% rename from packages/qwik/src/optimizer/src/plugins/perf-warning.html rename to packages/qwik-optimizer/src/plugins/perf-warning.html diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik-optimizer/src/plugins/plugin.ts similarity index 99% rename from packages/qwik/src/optimizer/src/plugins/plugin.ts rename to packages/qwik-optimizer/src/plugins/plugin.ts index 33229888e5a..cdf9e51f46a 100644 --- a/packages/qwik/src/optimizer/src/plugins/plugin.ts +++ b/packages/qwik-optimizer/src/plugins/plugin.ts @@ -1,7 +1,7 @@ import type { Rollup, Plugin, ViteDevServer, HmrContext } from 'vite'; -import { hashCode } from '../../../core/util/hash_code'; -import { generateManifestFromBundles, getValidManifest } from '../manifest'; -import { createOptimizer } from '../optimizer'; +import { hashCode } from '../../../qwik/src/core/util/hash_code'; +import { generateManifestFromBundles, getValidManifest } from './manifest'; +import { createOptimizer } from '..'; import type { Diagnostic, EntryStrategy, @@ -16,7 +16,7 @@ import type { TransformModuleInput, TransformModulesOptions, TransformOutput, -} from '../types'; +} from '..'; import { createLinter, type QwikLinter } from './eslint-plugin'; import type { LoadResult, OutputBundle, TransformResult } from 'rollup'; import { isWin } from './vite-utils'; diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.unit.ts b/packages/qwik-optimizer/src/plugins/plugin.unit.ts similarity index 98% rename from packages/qwik/src/optimizer/src/plugins/plugin.unit.ts rename to packages/qwik-optimizer/src/plugins/plugin.unit.ts index d50752f33d8..6ba3eba4074 100644 --- a/packages/qwik/src/optimizer/src/plugins/plugin.unit.ts +++ b/packages/qwik-optimizer/src/plugins/plugin.unit.ts @@ -1,8 +1,8 @@ import path, { resolve } from 'node:path'; import { assert, test } from 'vitest'; -import type { QwikManifest } from '../types'; +import type { QwikManifest } from '..'; import { createPlugin } from './plugin'; -import { normalizePath } from '../../../testing/util'; +import { normalizePath } from '../../../qwik/src/testing/util'; import { qwikVite } from './vite'; const cwd = process.cwd(); diff --git a/packages/qwik/src/optimizer/src/plugins/rollup.ts b/packages/qwik-optimizer/src/plugins/rollup.ts similarity index 99% rename from packages/qwik/src/optimizer/src/plugins/rollup.ts rename to packages/qwik-optimizer/src/plugins/rollup.ts index ba52b1336f0..f5100003695 100644 --- a/packages/qwik/src/optimizer/src/plugins/rollup.ts +++ b/packages/qwik-optimizer/src/plugins/rollup.ts @@ -8,7 +8,7 @@ import type { TransformModuleInput, TransformModule, Optimizer, -} from '../types'; +} from '@builder.io/qwik-optimizer'; import { createPlugin, type NormalizedQwikPluginOptions, @@ -17,7 +17,7 @@ import { type QwikPluginOptions, Q_MANIFEST_FILENAME, } from './plugin'; -import { versions } from '../versions'; +import { versions } from '..'; type QwikRollupPluginApi = { getOptimizer: () => Optimizer; diff --git a/packages/qwik/src/optimizer/src/plugins/rollup.unit.ts b/packages/qwik-optimizer/src/plugins/rollup.unit.ts similarity index 98% rename from packages/qwik/src/optimizer/src/plugins/rollup.unit.ts rename to packages/qwik-optimizer/src/plugins/rollup.unit.ts index d0187bdae81..c69655f20ec 100644 --- a/packages/qwik/src/optimizer/src/plugins/rollup.unit.ts +++ b/packages/qwik-optimizer/src/plugins/rollup.unit.ts @@ -1,10 +1,10 @@ import path, { resolve } from 'node:path'; import { qwikRollup } from './rollup'; import type { Rollup } from 'vite'; -import type { OptimizerOptions } from '../types'; +import type { OptimizerOptions } from '..'; import type { NormalizedQwikPluginOptions } from './plugin'; import { assert, test } from 'vitest'; -import { normalizePath } from '../../../testing/util'; +import { normalizePath } from '../../../qwik/src/testing/util'; const cwd = process.cwd(); diff --git a/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts b/packages/qwik-optimizer/src/plugins/vite-dev-server.ts similarity index 98% rename from packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts rename to packages/qwik-optimizer/src/plugins/vite-dev-server.ts index 8210e6ec9dd..e34afa39407 100644 --- a/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts +++ b/packages/qwik-optimizer/src/plugins/vite-dev-server.ts @@ -4,12 +4,18 @@ import { magenta } from 'kleur/colors'; import type { IncomingMessage, ServerResponse } from 'http'; import type { Connect, ViteDevServer } from 'vite'; -import type { OptimizerSystem, Path, QwikManifest, SymbolMapper, SymbolMapperFn } from '../types'; +import type { + OptimizerSystem, + Path, + QwikManifest, + SymbolMapper, + SymbolMapperFn, +} from '@builder.io/qwik-optimizer'; import { type NormalizedQwikPluginOptions, parseId, - getSymbolHash, makeNormalizePath, + getSymbolHash, } from './plugin'; import type { QwikViteDevResponse } from './vite'; import { formatError, isWin } from './vite-utils'; @@ -18,7 +24,9 @@ import imageDevTools from './image-size-runtime.html?raw'; import clickToComponent from './click-to-component.html?raw'; import perfWarning from './perf-warning.html?raw'; import errorHost from './error-host.html?raw'; -import { SYNC_QRL } from '../../../core/qrl/qrl-class'; + +// Make sure this value is same as value in `platform.ts` +export const SYNC_QRL = ''; function getOrigin(req: IncomingMessage) { const { PROTOCOL_HEADER, HOST_HEADER } = process.env; diff --git a/packages/qwik/src/optimizer/src/plugins/vite-error.ts b/packages/qwik-optimizer/src/plugins/vite-error.ts similarity index 100% rename from packages/qwik/src/optimizer/src/plugins/vite-error.ts rename to packages/qwik-optimizer/src/plugins/vite-error.ts diff --git a/packages/qwik/src/optimizer/src/plugins/vite-utils.ts b/packages/qwik-optimizer/src/plugins/vite-utils.ts similarity index 98% rename from packages/qwik/src/optimizer/src/plugins/vite-utils.ts rename to packages/qwik-optimizer/src/plugins/vite-utils.ts index 36f4f6b49e7..3a92205d7c4 100644 --- a/packages/qwik/src/optimizer/src/plugins/vite-utils.ts +++ b/packages/qwik-optimizer/src/plugins/vite-utils.ts @@ -1,4 +1,4 @@ -import type { OptimizerSystem } from '../types'; +import type { OptimizerSystem } from '@builder.io/qwik-optimizer'; export async function formatError(sys: OptimizerSystem, e: Error) { const err = e as any; diff --git a/packages/qwik/src/optimizer/src/plugins/vite.ts b/packages/qwik-optimizer/src/plugins/vite.ts similarity index 99% rename from packages/qwik/src/optimizer/src/plugins/vite.ts rename to packages/qwik-optimizer/src/plugins/vite.ts index 37ca1b59b87..568ec414016 100644 --- a/packages/qwik/src/optimizer/src/plugins/vite.ts +++ b/packages/qwik-optimizer/src/plugins/vite.ts @@ -1,5 +1,8 @@ import type { UserConfig, ViteDevServer, Plugin as VitePlugin } from 'vite'; -import { QWIK_LOADER_DEFAULT_DEBUG, QWIK_LOADER_DEFAULT_MINIFIED } from '../scripts'; +import { + QWIK_LOADER_DEFAULT_DEBUG, + QWIK_LOADER_DEFAULT_MINIFIED, +} from '../../../qwik/src/optimizer/scripts'; import type { EntryStrategy, GlobalInjections, @@ -11,8 +14,8 @@ import type { InsightManifest, Path, QwikBundleGraph, -} from '../types'; -import { versions } from '../versions'; +} from '@builder.io/qwik-optimizer'; +import { versions } from '../../../qwik/src/optimizer/versions'; import { getImageSizeServer } from './image-size-server'; import { CLIENT_OUT_DIR, diff --git a/packages/qwik/src/optimizer/src/plugins/vite.unit.ts b/packages/qwik-optimizer/src/plugins/vite.unit.ts similarity index 99% rename from packages/qwik/src/optimizer/src/plugins/vite.unit.ts rename to packages/qwik-optimizer/src/plugins/vite.unit.ts index 1783afc745d..f28c8e83779 100644 --- a/packages/qwik/src/optimizer/src/plugins/vite.unit.ts +++ b/packages/qwik-optimizer/src/plugins/vite.unit.ts @@ -1,8 +1,8 @@ import path, { resolve } from 'node:path'; +import type { OptimizerOptions, QwikBundle, QwikManifest } from '@builder.io/qwik-optimizer'; import type { Rollup } from 'vite'; import { assert, expect, suite, test } from 'vitest'; -import { normalizePath } from '../../../testing/util'; -import type { OptimizerOptions, QwikBundle, QwikManifest } from '../types'; +import { normalizePath } from '../../../qwik/src/testing/util'; import { convertManifestToBundleGraph, qwikVite, diff --git a/packages/qwik/src/optimizer/src/qwik-binding-map.ts b/packages/qwik-optimizer/src/qwik-binding-map.ts similarity index 100% rename from packages/qwik/src/optimizer/src/qwik-binding-map.ts rename to packages/qwik-optimizer/src/qwik-binding-map.ts diff --git a/packages/qwik/src/optimizer/src/types.ts b/packages/qwik-optimizer/src/types.ts similarity index 100% rename from packages/qwik/src/optimizer/src/types.ts rename to packages/qwik-optimizer/src/types.ts diff --git a/packages/qwik/src/optimizer/src/versions.ts b/packages/qwik-optimizer/src/versions.ts similarity index 100% rename from packages/qwik/src/optimizer/src/versions.ts rename to packages/qwik-optimizer/src/versions.ts diff --git a/packages/qwik-optimizer/tsconfig.json b/packages/qwik-optimizer/tsconfig.json new file mode 100644 index 00000000000..0edc0d8a5fc --- /dev/null +++ b/packages/qwik-optimizer/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "incremental": true, + "target": "ES2020", + "module": "ES2020", + "lib": ["es2021"], + "resolveJsonModule": true, + "allowArbitraryExtensions": true, + "declaration": true, + "strict": true, + "verbatimModuleSyntax": true, + "moduleResolution": "Bundler", + "baseUrl": ".", + "assumeChangesOnlyAffectDirectDependencies": true, + "noUnusedLocals": true, + "types": ["node", "vite/client"], + "esModuleInterop": true, + "sourceRoot": ".", + "inlineSourceMap": true, + "inlineSources": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + }, + "include": ["src"] +} diff --git a/packages/qwik-optimizer/vite.config.ts b/packages/qwik-optimizer/vite.config.ts new file mode 100644 index 00000000000..1bb43f52aa1 --- /dev/null +++ b/packages/qwik-optimizer/vite.config.ts @@ -0,0 +1,42 @@ +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import rootPkg from '../../package.json'; +import { getBanner } from '../../scripts/util'; + +export default defineConfig(({ mode }) => { + const version = JSON.stringify(rootPkg.version); + const banner = getBanner('@builder.io/qwik/optimizer', version); + return { + plugins: [ + dts({ + entryRoot: 'src', + rollupTypes: true, + include: ['src'], + }), + ], + + define: { + // this is overriden in the build script + 'globalThis.QWIK_VERSION': version, + }, + + ssr: { noExternal: true }, + + build: { + ssr: true, + lib: { + entry: 'src/index.ts', + formats: ['es'], //['umd', 'es'], + name: 'qwikOptimizer', + }, + target: 'node18', + outDir: 'lib', + sourcemap: true, + minify: mode === 'production' && 'terser', + rollupOptions: { + external: [/^node:/], + output: { banner }, + }, + }, + }; +}); diff --git a/packages/qwik/assets/bindings b/packages/qwik/assets/bindings new file mode 120000 index 00000000000..696a4360c97 --- /dev/null +++ b/packages/qwik/assets/bindings @@ -0,0 +1 @@ +../../qwik-optimizer/bindings \ No newline at end of file diff --git a/packages/qwik/assets/optimizer.cjs b/packages/qwik/assets/optimizer.cjs new file mode 120000 index 00000000000..471fbf989b8 --- /dev/null +++ b/packages/qwik/assets/optimizer.cjs @@ -0,0 +1 @@ +../../qwik-optimizer/lib/index.cjs \ No newline at end of file diff --git a/packages/qwik/assets/optimizer.d.ts b/packages/qwik/assets/optimizer.d.ts new file mode 120000 index 00000000000..4d3643d96f7 --- /dev/null +++ b/packages/qwik/assets/optimizer.d.ts @@ -0,0 +1 @@ +../../qwik-optimizer/lib/index.d.ts \ No newline at end of file diff --git a/packages/qwik/assets/optimizer.mjs b/packages/qwik/assets/optimizer.mjs new file mode 120000 index 00000000000..4ce19c0ddba --- /dev/null +++ b/packages/qwik/assets/optimizer.mjs @@ -0,0 +1 @@ +../../qwik-optimizer/lib/index.js \ No newline at end of file diff --git a/packages/qwik/package.json b/packages/qwik/package.json index 5413e3c512a..5381585b4b7 100644 --- a/packages/qwik/package.json +++ b/packages/qwik/package.json @@ -43,6 +43,7 @@ "devDependencies": { "@builder.io/qwik": "workspace:^", "@builder.io/qwik-dom": "workspace:^", + "@builder.io/qwik-optimizer": "workspace:*", "image-size": "1.1.1", "kleur": "4.1.5", "vitest": "2.0.5", @@ -137,8 +138,7 @@ "./qwikloader.js": "./dist/qwikloader.js", "./qwikloader.debug.js": "./dist/qwikloader.debug.js", "./qwik-prefetch.js": "./dist/qwik-prefetch.js", - "./qwik-prefetch.debug.js": "./dist/qwik-prefetch.debug.js", - "./package.json": "./dist/package.json" + "./qwik-prefetch.debug.js": "./dist/qwik-prefetch.debug.js" }, "exports_annotation": "We use the build for the optimizer because esbuild doesn't like the html?raw imports in the server plugin and it's only used in the vite configs", "files": [ diff --git a/packages/qwik/src/optimizer/api-extractor.json b/packages/qwik/src/optimizer/api-extractor.json deleted file mode 100644 index 0d6579534f9..00000000000 --- a/packages/qwik/src/optimizer/api-extractor.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", - "extends": "../api-extractor.json", - "mainEntryPointFilePath": "/../../dist-dev/dts-out/packages/qwik/src/optimizer/src/index.d.ts", - "apiReport": { - "enabled": true, - "reportFileName": "api.md", - "reportFolder": "/src/optimizer/src/", - "reportTempFolder": "/../../dist-dev/api-extractor/optimizer/" - }, - "dtsRollup": { - "enabled": true, - "untrimmedFilePath": "/dist/optimizer.d.ts" - }, - "docModel": { - "enabled": true, - "apiJsonFilePath": "/../../dist-dev/api/qwik/optimizer/docs.api.json" - } -} diff --git a/packages/qwik/src/optimizer/index.ts b/packages/qwik/src/optimizer/index.ts new file mode 100644 index 00000000000..3b49e3fee25 --- /dev/null +++ b/packages/qwik/src/optimizer/index.ts @@ -0,0 +1,3 @@ +// This just exports the rust optimizer and the plugins + +export * from '@builder.io/qwik-optimizer'; diff --git a/packages/qwik/src/optimizer/optimizer b/packages/qwik/src/optimizer/optimizer new file mode 120000 index 00000000000..322d54a9093 --- /dev/null +++ b/packages/qwik/src/optimizer/optimizer @@ -0,0 +1 @@ +../../../qwik-optimizer \ No newline at end of file diff --git a/packages/qwik/src/optimizer/src/scripts.ts b/packages/qwik/src/optimizer/scripts.ts similarity index 100% rename from packages/qwik/src/optimizer/src/scripts.ts rename to packages/qwik/src/optimizer/scripts.ts diff --git a/packages/qwik/src/optimizer/src/api.md b/packages/qwik/src/optimizer/src/api.md deleted file mode 100644 index e90fda433f8..00000000000 --- a/packages/qwik/src/optimizer/src/api.md +++ /dev/null @@ -1,496 +0,0 @@ -## API Report File for "@builder.io/qwik" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts - -import type { Plugin as Plugin_2 } from 'vite'; - -// @public (undocumented) -export interface ComponentEntryStrategy { - // (undocumented) - manual?: Record; - // (undocumented) - type: 'component'; -} - -// @public (undocumented) -export const createOptimizer: (optimizerOptions?: OptimizerOptions) => Promise; - -// @public (undocumented) -export interface Diagnostic { - // (undocumented) - category: DiagnosticCategory; - // (undocumented) - code: string | null; - // (undocumented) - file: string; - // (undocumented) - highlights: SourceLocation[]; - // (undocumented) - message: string; - // (undocumented) - scope: string; - // (undocumented) - suggestions: string[] | null; -} - -// @public (undocumented) -export type DiagnosticCategory = 'error' | 'warning' | 'sourceError'; - -// Warning: (ae-forgotten-export) The symbol "HoistEntryStrategy" needs to be exported by the entry point index.d.ts -// Warning: (ae-forgotten-export) The symbol "HookEntryStrategy_2" needs to be exported by the entry point index.d.ts -// -// @public (undocumented) -export type EntryStrategy = InlineEntryStrategy | HoistEntryStrategy | SingleEntryStrategy | HookEntryStrategy_2 | SegmentEntryStrategy | ComponentEntryStrategy | SmartEntryStrategy; - -// @public (undocumented) -export interface GlobalInjections { - // (undocumented) - attributes?: { - [key: string]: string; - }; - // (undocumented) - location: 'head' | 'body'; - // (undocumented) - tag: string; -} - -// @public (undocumented) -export interface InlineEntryStrategy { - // (undocumented) - type: 'inline'; -} - -// @public (undocumented) -export interface InsightManifest { - // (undocumented) - manual: Record; - // (undocumented) - prefetch: { - route: string; - symbols: string[]; - }[]; - // (undocumented) - type: 'smart'; -} - -// @public (undocumented) -export type MinifyMode = 'simplify' | 'none'; - -// @public (undocumented) -export interface Optimizer { - sys: OptimizerSystem; - transformFs(opts: TransformFsOptions): Promise; - transformFsSync(opts: TransformFsOptions): TransformOutput; - transformModules(opts: TransformModulesOptions): Promise; - transformModulesSync(opts: TransformModulesOptions): TransformOutput; -} - -// @public (undocumented) -export interface OptimizerOptions { - // (undocumented) - binding?: any; - inlineStylesUpToBytes?: number; - sourcemap?: boolean; - // (undocumented) - sys?: OptimizerSystem; -} - -// @public (undocumented) -export interface OptimizerSystem { - // (undocumented) - cwd: () => string; - // (undocumented) - dynamicImport: (path: string) => Promise; - // (undocumented) - env: SystemEnvironment; - // (undocumented) - getInputFiles?: (rootDir: string) => Promise; - // (undocumented) - os: string; - // (undocumented) - path: Path; - // (undocumented) - strictDynamicImport: (path: string) => Promise; -} - -// @public (undocumented) -export interface Path { - // (undocumented) - basename(path: string, ext?: string): string; - // (undocumented) - readonly delimiter: string; - // (undocumented) - dirname(path: string): string; - // (undocumented) - extname(path: string): string; - // (undocumented) - format(pathObject: { - root: string; - dir: string; - base: string; - ext: string; - name: string; - }): string; - // (undocumented) - isAbsolute(path: string): boolean; - // (undocumented) - join(...paths: string[]): string; - // (undocumented) - normalize(path: string): string; - // (undocumented) - parse(path: string): { - root: string; - dir: string; - base: string; - ext: string; - name: string; - }; - // (undocumented) - readonly posix: Path; - // (undocumented) - relative(from: string, to: string): string; - // (undocumented) - resolve(...paths: string[]): string; - // (undocumented) - readonly sep: string; - // (undocumented) - readonly win32: null; -} - -// @public (undocumented) -export type QwikBuildMode = 'production' | 'development'; - -// @public (undocumented) -export type QwikBuildTarget = 'client' | 'ssr' | 'lib' | 'test'; - -// @public (undocumented) -export interface QwikBundle { - // (undocumented) - dynamicImports?: string[]; - // (undocumented) - imports?: string[]; - // (undocumented) - origins?: string[]; - // (undocumented) - size: number; - // (undocumented) - symbols?: string[]; -} - -// @public -export interface QwikManifest { - bundles: { - [fileName: string]: QwikBundle; - }; - injections?: GlobalInjections[]; - manifestHash: string; - mapping: { - [symbolName: string]: string; - }; - // (undocumented) - options?: { - target?: string; - buildMode?: string; - entryStrategy?: { - [key: string]: any; - }; - }; - // (undocumented) - platform?: { - [name: string]: string; - }; - symbols: { - [symbolName: string]: QwikSymbol; - }; - // (undocumented) - version: string; -} - -// @public (undocumented) -export function qwikRollup(qwikRollupOpts?: QwikRollupPluginOptions): any; - -// @public (undocumented) -export interface QwikRollupPluginOptions { - buildMode?: QwikBuildMode; - // (undocumented) - csr?: boolean; - debug?: boolean; - entryStrategy?: EntryStrategy; - lint?: boolean; - manifestInput?: QwikManifest; - manifestOutput?: (manifest: QwikManifest) => Promise | void; - // (undocumented) - optimizerOptions?: OptimizerOptions; - rootDir?: string; - srcDir?: string; - srcInputs?: TransformModuleInput[] | null; - target?: QwikBuildTarget; - transformedModuleOutput?: ((transformedModules: TransformModule[]) => Promise | void) | null; -} - -// @public (undocumented) -export interface QwikSymbol { - // (undocumented) - canonicalFilename: string; - // (undocumented) - captures: boolean; - // (undocumented) - ctxKind: 'function' | 'event'; - // (undocumented) - ctxName: string; - // (undocumented) - displayName: string; - // (undocumented) - hash: string; - // (undocumented) - loc: [number, number]; - // (undocumented) - origin: string; - // (undocumented) - parent: string | null; -} - -// @public -export function qwikVite(qwikViteOpts?: QwikVitePluginOptions): any; - -// @public (undocumented) -export interface QwikViteDevResponse { - // (undocumented) - _qwikEnvData?: Record; - // (undocumented) - _qwikRenderResolve?: () => void; -} - -// Warning: (ae-forgotten-export) The symbol "P" needs to be exported by the entry point index.d.ts -// -// @public -export type QwikVitePlugin = P & { - name: 'vite-plugin-qwik'; -}; - -// @public (undocumented) -export interface QwikVitePluginApi { - // (undocumented) - getAssetsDir: () => string | undefined; - // (undocumented) - getClientOutDir: () => string | null; - // (undocumented) - getClientPublicOutDir: () => string | null; - // (undocumented) - getInsightsManifest: (clientOutDir?: string | null) => Promise; - // (undocumented) - getManifest: () => QwikManifest | null; - // (undocumented) - getOptimizer: () => Optimizer | null; - // Warning: (ae-forgotten-export) The symbol "NormalizedQwikPluginOptions" needs to be exported by the entry point index.d.ts - // - // (undocumented) - getOptions: () => NormalizedQwikPluginOptions; - // (undocumented) - getRootDir: () => string | null; -} - -// Warning: (ae-forgotten-export) The symbol "QwikVitePluginCSROptions" needs to be exported by the entry point index.d.ts -// Warning: (ae-forgotten-export) The symbol "QwikVitePluginSSROptions" needs to be exported by the entry point index.d.ts -// -// @public (undocumented) -export type QwikVitePluginOptions = QwikVitePluginCSROptions | QwikVitePluginSSROptions; - -// @public (undocumented) -export interface ResolvedManifest { - // (undocumented) - manifest: QwikManifest; - // (undocumented) - mapper: SymbolMapper; -} - -// @public (undocumented) -interface SegmentAnalysis { - // (undocumented) - canonicalFilename: string; - // (undocumented) - captures: boolean; - // (undocumented) - ctxKind: 'event' | 'function'; - // (undocumented) - ctxName: string; - // (undocumented) - displayName: string; - // (undocumented) - entry: string | null; - // (undocumented) - extension: string; - // (undocumented) - hash: string; - // (undocumented) - loc: [number, number]; - // (undocumented) - name: string; - // (undocumented) - origin: string; - // (undocumented) - parent: string | null; -} -export { SegmentAnalysis as HookAnalysis } -export { SegmentAnalysis } - -// @public (undocumented) -interface SegmentEntryStrategy { - // (undocumented) - manual?: Record; - // (undocumented) - type: 'segment'; -} -export { SegmentEntryStrategy as HookEntryStrategy } -export { SegmentEntryStrategy } - -// @public (undocumented) -export interface SingleEntryStrategy { - // (undocumented) - manual?: Record; - // (undocumented) - type: 'single'; -} - -// @public (undocumented) -export interface SmartEntryStrategy { - // (undocumented) - manual?: Record; - // (undocumented) - type: 'smart'; -} - -// @public (undocumented) -export interface SourceLocation { - // (undocumented) - endCol: number; - // (undocumented) - endLine: number; - // (undocumented) - hi: number; - // (undocumented) - lo: number; - // (undocumented) - startCol: number; - // (undocumented) - startLine: number; -} - -// @public (undocumented) -export type SourceMapsOption = 'external' | 'inline' | undefined | null; - -// @public (undocumented) -export type SymbolMapper = Record; - -// Warning: (ae-forgotten-export) The symbol "createSymbolMapper" needs to be exported by the entry point index.d.ts -// -// @alpha -export let symbolMapper: ReturnType; - -// @public (undocumented) -export type SymbolMapperFn = (symbolName: string, mapper: SymbolMapper | undefined, parent?: string) => readonly [symbol: string, chunk: string] | undefined; - -// @public (undocumented) -export type SystemEnvironment = 'node' | 'deno' | 'bun' | 'webworker' | 'browsermain' | 'unknown'; - -// @public (undocumented) -export interface TransformFsOptions extends TransformOptions { - // (undocumented) - vendorRoots: string[]; -} - -// @public (undocumented) -export interface TransformModule { - // (undocumented) - code: string; - // (undocumented) - isEntry: boolean; - // (undocumented) - map: string | null; - // (undocumented) - origPath: string | null; - // (undocumented) - path: string; - // (undocumented) - segment: SegmentAnalysis | null; -} - -// @public (undocumented) -export interface TransformModuleInput { - // (undocumented) - code: string; - // (undocumented) - path: string; -} - -// @public (undocumented) -export interface TransformModulesOptions extends TransformOptions { - // (undocumented) - input: TransformModuleInput[]; -} - -// @public (undocumented) -export interface TransformOptions { - // (undocumented) - entryStrategy?: EntryStrategy; - // (undocumented) - explicitExtensions?: boolean; - // (undocumented) - isDev?: boolean; - // (undocumented) - isServer?: boolean; - // (undocumented) - minify?: MinifyMode; - // Warning: (ae-forgotten-export) The symbol "EmitMode" needs to be exported by the entry point index.d.ts - // - // (undocumented) - mode?: EmitMode; - // (undocumented) - preserveFilenames?: boolean; - // (undocumented) - regCtxName?: string[]; - // (undocumented) - rootDir?: string; - // (undocumented) - scope?: string; - // (undocumented) - sourceMaps?: boolean; - // (undocumented) - srcDir: string; - // (undocumented) - stripCtxName?: string[]; - // (undocumented) - stripEventHandlers?: boolean; - // (undocumented) - stripExports?: string[]; - // (undocumented) - transpileJsx?: boolean; - // (undocumented) - transpileTs?: boolean; -} - -// @public (undocumented) -export interface TransformOutput { - // (undocumented) - diagnostics: Diagnostic[]; - // (undocumented) - isJsx: boolean; - // (undocumented) - isTypeScript: boolean; - // (undocumented) - modules: TransformModule[]; -} - -// @public (undocumented) -export type TranspileOption = boolean | undefined | null; - -// @public (undocumented) -export const versions: { - qwik: string; -}; - -// (No @packageDocumentation comment for this package) - -``` diff --git a/packages/qwik/src/optimizer/versions.ts b/packages/qwik/src/optimizer/versions.ts new file mode 100644 index 00000000000..91f765e3b39 --- /dev/null +++ b/packages/qwik/src/optimizer/versions.ts @@ -0,0 +1,4 @@ +/** @public */ +export const versions = { + qwik: (globalThis as any).QWIK_VERSION as string, +}; diff --git a/packages/qwik/src/server/api.md b/packages/qwik/src/server/api.md index 58d57826f27..85361f435c6 100644 --- a/packages/qwik/src/server/api.md +++ b/packages/qwik/src/server/api.md @@ -4,11 +4,11 @@ ```ts -import type { QwikManifest } from '@builder.io/qwik/optimizer'; -import type { ResolvedManifest } from '@builder.io/qwik/optimizer'; +import type { QwikManifest } from '@builder.io/qwik-optimizer'; +import type { ResolvedManifest } from '@builder.io/qwik-optimizer'; import type { SnapshotResult } from '@builder.io/qwik'; import type { StreamWriter } from '@builder.io/qwik'; -import type { SymbolMapperFn } from '@builder.io/qwik/optimizer'; +import type { SymbolMapperFn } from '@builder.io/qwik-optimizer'; // @public export function getQwikLoaderScript(opts?: { diff --git a/packages/qwik/src/server/index.ts b/packages/qwik/src/server/index.ts index c9f06f6c820..f4632c333c8 100644 --- a/packages/qwik/src/server/index.ts +++ b/packages/qwik/src/server/index.ts @@ -1,6 +1,6 @@ import { setPlatform } from '@builder.io/qwik'; import { createPlatform } from './platform'; -import type { ResolvedManifest } from '@builder.io/qwik/optimizer'; +import type { ResolvedManifest } from '@builder.io/qwik-optimizer'; import { resolveManifest } from './render'; import type { QwikManifest } from './types'; diff --git a/packages/qwik/src/server/platform.ts b/packages/qwik/src/server/platform.ts index e8192317381..97e7d0d6993 100644 --- a/packages/qwik/src/server/platform.ts +++ b/packages/qwik/src/server/platform.ts @@ -1,6 +1,6 @@ import type { SerializeDocumentOptions } from './types'; import { setPlatform } from '@builder.io/qwik'; -import type { ResolvedManifest } from '@builder.io/qwik/optimizer'; +import type { ResolvedManifest } from '@builder.io/qwik-optimizer'; import type { CorePlatformServer } from './qwik-types'; declare const require: (module: string) => Record; diff --git a/packages/qwik/src/server/prefetch-strategy.ts b/packages/qwik/src/server/prefetch-strategy.ts index be7b61a24a8..574b7bcc4af 100644 --- a/packages/qwik/src/server/prefetch-strategy.ts +++ b/packages/qwik/src/server/prefetch-strategy.ts @@ -2,7 +2,7 @@ import { getBuildBase } from './utils'; import type { PrefetchResource, QwikManifest, RenderToStringOptions } from './types'; import type { QRLInternal } from './qwik-types'; -import type { ResolvedManifest } from '@builder.io/qwik/optimizer'; +import type { ResolvedManifest } from '@builder.io/qwik-optimizer'; import type { QRL } from '@builder.io/qwik'; export function getPrefetchResources( diff --git a/packages/qwik/src/server/render.ts b/packages/qwik/src/server/render.ts index dd26ebd93c1..380d6e046dd 100644 --- a/packages/qwik/src/server/render.ts +++ b/packages/qwik/src/server/render.ts @@ -8,7 +8,7 @@ import { } from '@builder.io/qwik'; import { isDev } from '@builder.io/qwik/build'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports -import { getValidManifest } from '../optimizer/src/manifest'; +import { getValidManifest } from '@builder.io/qwik-optimizer'; import { getSymbolHash, setServerPlatform } from './platform'; import { applyPrefetchImplementation } from './prefetch-implementation'; import { getPrefetchResources } from './prefetch-strategy'; diff --git a/packages/qwik/src/server/types.ts b/packages/qwik/src/server/types.ts index ea55229fb4d..1611c922a71 100644 --- a/packages/qwik/src/server/types.ts +++ b/packages/qwik/src/server/types.ts @@ -4,7 +4,7 @@ import type { SymbolMapperFn, SymbolMapper, ResolvedManifest, -} from '@builder.io/qwik/optimizer'; +} from '@builder.io/qwik-optimizer'; /** @public */ export interface SerializeDocumentOptions { diff --git a/packages/qwik/src/testing/README.md b/packages/qwik/src/testing/README.md index b7933c9f22a..b2668169e91 100644 --- a/packages/qwik/src/testing/README.md +++ b/packages/qwik/src/testing/README.md @@ -3,7 +3,7 @@ ```ts //vite.config.ts import { defineConfig } from 'vite'; -import { qwikVite } from '@builder.io/qwik/optimizer'; +import { qwikVite } from '@builder.io/qwik-optimizer'; import { qwikCity } from '@builder.io/qwik-city/vite'; import tsconfigPaths from 'vite-tsconfig-paths'; diff --git a/packages/qwik/vite.config.ts b/packages/qwik/vite.config.ts new file mode 100644 index 00000000000..4ba842f682b --- /dev/null +++ b/packages/qwik/vite.config.ts @@ -0,0 +1,69 @@ +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import rootPkg from '../../package.json'; +import { getBanner } from '../../scripts/util'; + +export default defineConfig(({ mode }) => { + const version = global.QWIK_VERSION || rootPkg.version; + const banner = getBanner('@builder.io/qwik', version); + return { + plugins: [ + dts({ + entryRoot: 'src', + rollupTypes: true, + include: ['src'], + }), + ], + + define: { + // this is overriden in the build script + 'globalThis.QWIK_VERSION': JSON.stringify(version), + ...(mode === 'production' + ? { + 'globalThis.qDev': 'false', + 'globalThis.qInspector': 'false', + 'globalThis.qSerialize': 'false', + 'globalThis.qDynamicPlatform': 'false', + 'globalThis.qTest': 'false', + 'globalThis.qRuntimeQrl': 'false', + } + : {}), + }, + + ssr: { noExternal: true }, + + build: { + ssr: true, + lib: { + entry: 'src/core/index.ts', + formats: ['umd', 'es'], + name: 'qwikCore', + }, + target: 'node18', + outDir: 'dist', + sourcemap: true, + minify: mode === 'production' && 'terser', + rollupOptions: { + external: [/^node:/], + output: { banner }, + }, + terserOptions: { + mangle: { + toplevel: true, + module: true, + properties: { + regex: '^\\$.+\\$$', + }, + }, + compress: { + module: true, + toplevel: true, + passes: 3, + pure_getters: true, + unsafe_symbols: true, + keep_fargs: false, + }, + }, + }, + }; +}); diff --git a/scripts/binding-platform.ts b/scripts/binding-platform.ts index b5a9b7b1934..bd5c536231e 100644 --- a/scripts/binding-platform.ts +++ b/scripts/binding-platform.ts @@ -17,7 +17,7 @@ export async function buildPlatformBinding(config: BuildConfig) { `--cargo-name`, 'qwik_napi', `--platform`, - `--config=packages/qwik/src/napi/napi.config.json`, + `--config=packages/qwik-optimizer/rust/napi/napi.config.json`, config.distBindingsDir, ]; diff --git a/scripts/binding-wasm.ts b/scripts/binding-wasm.ts index bd1f98255aa..8f704ba93ab 100644 --- a/scripts/binding-wasm.ts +++ b/scripts/binding-wasm.ts @@ -4,7 +4,7 @@ import { join } from 'node:path'; import { rollup } from 'rollup'; export async function buildWasmBinding(config: BuildConfig) { - const srcWasmDir = join(config.srcQwikDir, `wasm`); + const srcWasmDir = join(config.packagesDir, 'qwik-optimizer', 'rust', 'wasm'); const tmpBuildDir = join(config.tmpDir, `wasm-out`); ensureDir(config.distQwikPkgDir); diff --git a/scripts/build.ts b/scripts/build.ts index af9e2fb1c07..491e276ca75 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -57,6 +57,11 @@ export async function build(config: BuildConfig) { `[node ${process.version}, ${process.platform}/${process.arch}]` ); + // we need the optimizer and its types before building the rest + if (config.qwik) { + await submoduleOptimizer(config); + } + if (config.tsc || (!config.dev && config.qwik)) { rmSync(config.tscDir, { recursive: true, force: true }); rmSync(config.dtsDir, { recursive: true, force: true }); @@ -81,7 +86,7 @@ export async function build(config: BuildConfig) { // server bundling must happen after the results from the others // because it inlines the qwik loader and prefetch scripts - await Promise.all([submoduleServer(config), submoduleOptimizer(config)]); + await submoduleServer(config); } if (config.api || (!config.dev && config.qwik)) { @@ -188,7 +193,7 @@ export async function build(config: BuildConfig) { }); } } catch (e: any) { - panic(String(e ? e.stack || e : 'Error')); + panic(e); } } diff --git a/scripts/submodule-optimizer.ts b/scripts/submodule-optimizer.ts index ab87134f5b3..015b7824ca3 100644 --- a/scripts/submodule-optimizer.ts +++ b/scripts/submodule-optimizer.ts @@ -1,122 +1,30 @@ -import { build, type BuildOptions } from 'esbuild'; -import { - access, - type BuildConfig, - getBanner, - nodeTarget, - readFile, - target, - writeFile, -} from './util'; +import { access, type BuildConfig, writeFile } from './util'; import { join } from 'node:path'; -import { minify } from 'terser'; import { platformArchTriples } from '@napi-rs/triples'; import { constants, existsSync } from 'node:fs'; import { inlineQwikScriptsEsBuild } from './submodule-qwikloader'; -import RawPlugin from 'esbuild-plugin-raw'; +import { build, loadConfigFromFile } from 'vite'; -/** Builds @builder.io/optimizer */ +/** Builds @builder.io/qwik/optimizer */ export async function submoduleOptimizer(config: BuildConfig) { + const { optimizerDir } = config; const submodule = 'optimizer'; await generatePlatformBindingsData(config); - async function buildOptimizer() { - const opts: BuildOptions = { - entryPoints: [join(config.srcQwikDir, submodule, 'src', 'index.ts')], - entryNames: 'optimizer', - outdir: config.distQwikPkgDir, - bundle: true, - sourcemap: false, - platform: 'node', - target, - external: [ - /* no Node.js built-in externals allowed! */ - 'espree', - ], - }; + const optimizerConfig = (await loadConfigFromFile( + { command: 'build', mode: 'ssr', isSsrBuild: true }, + join(optimizerDir, 'vite.config.ts') + ))!; + optimizerConfig.config.root = optimizerDir; + optimizerConfig.config.build!.write = true; + optimizerConfig.config.define!['globalThis.QWIK_VERSION'] = JSON.stringify(config.distVersion); + optimizerConfig.config.clearScreen = false; + await build(optimizerConfig.config); - const qwikloaderScripts = await inlineQwikScriptsEsBuild(config); + // const qwikloaderScripts = await inlineQwikScriptsEsBuild(config); - const esmBuild = build({ - ...opts, - format: 'esm', - banner: { js: getBanner('@builder.io/qwik/optimizer', config.distVersion) }, - outExtension: { '.js': '.mjs' }, - define: { - 'globalThis.IS_CJS': 'false', - 'globalThis.IS_ESM': 'true', - 'globalThis.QWIK_VERSION': JSON.stringify(config.distVersion), - ...qwikloaderScripts, - }, - plugins: [RawPlugin()], - }); - - const cjsBanner = [`globalThis.qwikOptimizer = (function (module) {`].join('\n'); - - const cjsBuild = build({ - ...opts, - format: 'cjs', - banner: { js: cjsBanner }, - footer: { - js: `return module.exports; })(typeof module === 'object' && module.exports ? module : { exports: {} });`, - }, - outExtension: { '.js': '.cjs' }, - define: { - 'globalThis.IS_CJS': 'true', - 'globalThis.IS_ESM': 'false', - 'globalThis.QWIK_VERSION': JSON.stringify(config.distVersion), - ...qwikloaderScripts, - }, - target: nodeTarget, - plugins: [RawPlugin()], - }); - - await Promise.all([esmBuild, cjsBuild]); - - if (!config.dev) { - const esmDist = join(config.distQwikPkgDir, 'optimizer.mjs'); - const cjsDist = join(config.distQwikPkgDir, 'optimizer.cjs'); - - await Promise.all( - [esmDist, cjsDist].map(async (p) => { - const src = await readFile(p, 'utf-8'); - const result = await minify(src, { - compress: { - booleans: false, - collapse_vars: false, - comparisons: false, - drop_debugger: false, - expression: false, - keep_classnames: true, - inline: false, - if_return: false, - join_vars: false, - loops: false, - passes: 1, - reduce_funcs: false, - reduce_vars: false, - sequences: false, - switches: false, - }, - format: { - comments: false, - braces: true, - beautify: true, - indent_level: 2, - preamble: getBanner('@builder.io/qwik/optimizer', config.distVersion), - }, - mangle: false, - }); - await writeFile(p, result.code!); - }) - ); - } - - console.log('šŸ¹', submodule); - } - - await Promise.all([buildOptimizer()]); + console.log('šŸ¹', submodule); } async function generatePlatformBindingsData(config: BuildConfig) { @@ -158,14 +66,12 @@ async function generatePlatformBindingsData(config: BuildConfig) { const code = c.join('\n') + '\n'; - const platformBindingPath = join(config.srcQwikDir, 'optimizer', 'src', 'qwik-binding-map.ts'); - let isWritable; + const platformBindingPath = join(config.optimizerDir, 'src', 'qwik-binding-map.ts'); + let isWritable = false; try { await access(platformBindingPath, constants.W_OK); isWritable = true; - } catch (e) { - isWritable = false; - } + } catch {} if (isWritable) { await writeFile(platformBindingPath, code); } diff --git a/scripts/util.ts b/scripts/util.ts index a06732c1718..958c80e6c78 100644 --- a/scripts/util.ts +++ b/scripts/util.ts @@ -20,25 +20,7 @@ import { minify, type MinifyOptions } from 'terser'; import { promisify } from 'util'; import { readPackageJson } from './package-json'; -const stringOptions = [ - 'distBindingsDir', - 'distQwikCityPkgDir', - 'distQwikPkgDir', - 'distVersion', - 'dtsDir', - 'packagesDir', - 'platformTarget', - 'rootDir', - 'scriptsDir', - 'setDistTag', - 'srcNapiDir', - 'srcQwikCityDir', - 'srcQwikDir', - 'srcQwikLabsDir', - 'startersDir', - 'tmpDir', - 'tscDir', -] as const; +const stringOptions = ['distVersion', 'platformTarget', 'setDistTag'] as const; const booleanOptions = [ 'api', 'cli', @@ -72,6 +54,22 @@ const booleanOptions = [ */ export type BuildConfig = { [key in (typeof stringOptions)[number]]: string } & { [key in (typeof booleanOptions)[number]]?: boolean; +} & { + distBindingsDir: string; + distQwikCityPkgDir: string; + distQwikPkgDir: string; + dtsDir: string; + packagesDir: string; + rootDir: string; + scriptsDir: string; + srcNapiDir: string; + optimizerDir: string; + srcQwikCityDir: string; + srcQwikDir: string; + srcQwikLabsDir: string; + startersDir: string; + tmpDir: string; + tscDir: string; }; const kebab = (str: string) => str.replace(/[A-Z]/g, (l) => `-${l.toLowerCase()}`); @@ -85,6 +83,7 @@ export function loadConfig(args: string[] = []) { const rootDir = join(__dirname, '..'); const packagesDir = join(rootDir, 'packages'); const srcQwikDir = join(packagesDir, 'qwik', 'src'); + const optimizerDir = join(packagesDir, 'qwik-optimizer'); const distQwikPkgDir = join(packagesDir, 'qwik', 'dist'); const tmpDir = join(rootDir, 'dist-dev'); const knownOptions = [...stringOptions, ...booleanOptions] as const; @@ -99,23 +98,6 @@ export function loadConfig(args: string[] = []) { boolean: [...booleanOptions], string: [...stringOptions], alias, - default: { - rootDir, - packagesDir, - srcQwikDir, - tmpDir, - srcQwikCityDir: join(packagesDir, 'qwik-city', 'src'), - srcQwikLabsDir: join(packagesDir, 'qwik-labs'), - srcNapiDir: join(srcQwikDir, 'napi'), - scriptsDir: join(rootDir, 'scripts'), - startersDir: join(rootDir, 'starters'), - distQwikPkgDir, - distQwikCityPkgDir: join(packagesDir, 'qwik-city', 'lib'), - distBindingsDir: join(packagesDir, 'qwik', 'bindings'), - tscDir: join(tmpDir, 'tsc-out'), - dtsDir: join(tmpDir, 'dts-out'), - esmNode: parseInt(process.version.slice(1).split('.')[0], 10) >= 14, - } as BuildConfig, }); const parseError = config._.length > 0 @@ -138,7 +120,25 @@ export function loadConfig(args: string[] = []) { process.exit(1); } - return config; + return { + ...config, + rootDir, + packagesDir, + optimizerDir, + srcQwikDir, + tmpDir, + srcQwikCityDir: join(packagesDir, 'qwik-city', 'src'), + srcQwikLabsDir: join(packagesDir, 'qwik-labs'), + srcNapiDir: join(srcQwikDir, 'napi'), + scriptsDir: join(rootDir, 'scripts'), + startersDir: join(rootDir, 'starters'), + distQwikPkgDir, + distQwikCityPkgDir: join(packagesDir, 'qwik-city', 'lib'), + distBindingsDir: join(optimizerDir, 'bindings'), + tscDir: join(tmpDir, 'tsc-out'), + dtsDir: join(tmpDir, 'dts-out'), + esmNode: parseInt(process.version.slice(1).split('.')[0], 10) >= 14, + }; } export function terser(opts: MinifyOptions): RollupPlugin { @@ -283,8 +283,9 @@ export async function run( } } -export function panic(msg: string) { - console.error(`\nāŒ ${msg}\n`, new Error(msg).stack); +export function panic(msg: string | Error) { + const err = typeof msg === 'string' ? new Error(msg) : msg; + console.error(`\nāŒ `, err); process.exit(1); } diff --git a/tsconfig.json b/tsconfig.json index 94cb069f230..a290810b3c2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -55,7 +55,9 @@ "packages/qwik-react/vite", "@types/deno.d.ts", "@types/bun.d.ts", - "types.d.ts" + "types.d.ts", + "packages/qwik-optimizer/src/hash_code.ts", + "packages/qwik-optimizer/src/plugins" ], "exclude": [ "packages/create-qwik/dist",