switch back to inline

DigitecGalaxus · Jul 17, 2024 · fa46cda · fa46cda
1 parent e9afb2e
commit fa46cda
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -42,6 +42,11 @@ jobs:
     - name: Build with SWC
       run: pnpm run build:swc
 
+    - name: Enable caching
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: packages/yak-swc
+
     - name: Link Vercel project
       run: vercel link --yes --token ${{ secrets.VERCEL_TOKEN }}
 

diff --git a/.github/workflows/swc.yml b/.github/workflows/swc.yml
@@ -27,6 +27,4 @@ jobs:
       - name: Run cargo test
         run: cargo test --manifest-path packages/yak-swc/Cargo.toml
       - name: Run cargo fmt
-        run: cargo fmt --manifest-path packages/yak-swc/Cargo.toml --all -- --check
-      - name: Run cargo clippy
-        run: cargo clippy --manifest-path packages/yak-swc/Cargo.toml -- -D warnings
+        run: cargo fmt --manifest-path packages/yak-swc/Cargo.toml --all -- --check
diff --git a/packages/yak-swc/yak_swc/src/lib.rs b/packages/yak-swc/yak_swc/src/lib.rs
@@ -447,7 +447,7 @@ where
             let next_css_code = pair.next_quasi.map(|next_quasi| next_quasi.raw.to_string());
             if is_mixin_expression(
               css_state.clone(),
-              encode_module_import(module_path.as_str(), "selector", vec![id.sym.to_string()]),
+              encode_module_import(module_path.as_str(), "inline", vec![id.sym.to_string()]),
               next_css_code,
             ) {
               if current_css_state.current_scopes.len() == 1 {
@@ -466,7 +466,7 @@ where
             // An imported constant
             else {
               let css_code =
-                encode_module_import(module_path.as_str(), "selector", vec![id.sym.to_string()]);
+                encode_module_import(module_path.as_str(), "inline", vec![id.sym.to_string()]);
               let (new_state, _) = parse_css(&css_code, css_state);
               css_state = Some(new_state);
             }

diff --git a/packages/yak-swc/yak_swc/tests/fixture/cross-file-member/output.tsx b/packages/yak-swc/yak_swc/tests/fixture/cross-file-member/output.tsx
@@ -6,8 +6,8 @@ import { colors } from "./colors";
 import { fonts } from "./fonts";
 export const Button = /*YAK Extracted CSS:
 .Button {
-  font-size: --yak-css-import: url("./fonts:selector:fonts");
-  color: --yak-css-import: url("./colors:selector:colors");
-  background-color: --yak-css-import: url("./colors:selector:colors");
+  font-size: --yak-css-import: url("./fonts:inline:fonts");
+  color: --yak-css-import: url("./colors:inline:colors");
+  background-color: --yak-css-import: url("./colors:inline:colors");
 }
 */ /*#__PURE__*/ styled.button(__styleYak.Button);
diff --git a/packages/yak-swc/yak_swc/tests/fixture/cross-file-mixin/output.tsx b/packages/yak-swc/yak_swc/tests/fixture/cross-file-mixin/output.tsx
@@ -6,7 +6,7 @@ import { fonts } from "./fonts";
 import { fancy } from "./fancy";
 export const Button = /*YAK Extracted CSS:
 .Button {
-  --yak-css-import: url("./fonts:selector:fonts");
+  --yak-css-import: url("./fonts:inline:fonts");
 }
 */ /*#__PURE__*/ styled.button(__styleYak.Button);
 export const Button2 = /*#__PURE__*/ styled.button(fonts.h1);
@@ -17,7 +17,7 @@ export const Button3 = /*YAK Extracted CSS:
 */ /*#__PURE__*/ styled.button(__styleYak.Button3, fonts.h1);
 export const Button4 = /*YAK Extracted CSS:
 .Button4 {
-  --yak-css-import: url("./fonts:selector:fonts")
+  --yak-css-import: url("./fonts:inline:fonts")
 ;
   color: green;
 }

diff --git a/packages/yak-swc/yak_swc/tests/fixture/cross-file/output.tsx b/packages/yak-swc/yak_swc/tests/fixture/cross-file/output.tsx
@@ -7,10 +7,10 @@ export const Button = /*YAK Extracted CSS:
 .Button {
   font-size: 1rem;
   color: green;
-  --yak-css-import: url("./Icon:selector:Icon") {
+  --yak-css-import: url("./Icon:inline:Icon") {
     color: red;
   }
-  --yak-css-import: url("./Icon:selector:Icon") --yak-css-import: url("./Icon:selector:Icon") {
+  --yak-css-import: url("./Icon:inline:Icon") --yak-css-import: url("./Icon:inline:Icon") {
     color: blue;
   }
 }