feat: add current when tailwindcss config contains only number bp (#…

…475)
pikax · Jul 24, 2020 · 202f53a · 202f53a
1 parent 2bdd42e
commit 202f53a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/docs/api/axios.api.md b/docs/api/axios.api.md
@@ -6,9 +6,9 @@
 import { AxiosInstance } from "axios";
 import { AxiosRequestConfig } from "axios";
 import { AxiosResponse } from "axios";
-import { ComputedRef } from "@vue/composition-api";
+import { ComputedRef } from "@vue/runtime-core";
 import { PromiseResultFactory } from "vue-composable";
-import { Ref } from "@vue/composition-api";
+import { Ref } from "@vue/runtime-core";
 
 // Warning: (ae-forgotten-export) The symbol "MakeAxiosReturn" needs to be exported by the entry point index.d.ts
 //

diff --git a/docs/api/vue-composable.api.md b/docs/api/vue-composable.api.md
@@ -3,12 +3,12 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ComputedRef } from "@vue/composition-api";
-import { InjectionKey } from "@vue/composition-api";
-import { PluginFunction } from "vue";
-import { provide } from "@vue/composition-api";
-import { Ref } from "@vue/composition-api";
-import { UnwrapRef } from "@vue/composition-api";
+import { ComputedRef } from "@vue/runtime-core";
+import { InjectionKey } from "@vue/runtime-core";
+import { Plugin as Plugin_2 } from "@vue/runtime-core";
+import { provide } from "@vue/runtime-core";
+import { Ref } from "@vue/runtime-core";
+import { UnwrapRef } from "@vue/runtime-core";
 
 // @public (undocumented)
 export interface ArrayPaginationResult<T extends Array<any>>
@@ -378,8 +378,6 @@ export function getCssVariableFor(
   name: string
 ): CssVariable;
 
-// Warning: (ae-forgotten-export) The symbol "Plugin" needs to be exported by the entry point index.d.ts
-//
 // @public (undocumented)
 export const hydrationPlugin: Plugin_2;
 

diff --git a/packages/axios/package.json b/packages/axios/package.json
@@ -61,7 +61,7 @@
     "typescript": "^3.9.7"
   },
   "peerDependencies": {
-    "@vue/composition-api": "^1.0.0-beta.2",
+    "@vue/runtime-core": "^3.0.0-rc.2",
     "axios": "^0.19.2"
   }
 }
diff --git a/packages/vue-composable/__tests__/breakpoint/breakpointTailwindcss.spec.ts b/packages/vue-composable/__tests__/breakpoint/breakpointTailwindcss.spec.ts
@@ -40,7 +40,7 @@ describe("breakpointTailwindcss", () => {
         })
       ).toBe(bk);
 
-      expect(useBreakpoint).toHaveBeenCalledWith({ sm: "(min-width: 123px)" });
+      expect(useBreakpoint).toHaveBeenCalledWith({ sm: 123 });
       expect(provide).toHaveBeenCalled();
     });
 
@@ -91,7 +91,7 @@ describe("breakpointTailwindcss", () => {
         })
       ).toBe(bk);
 
-      expect(useBreakpoint).toHaveBeenCalledWith({ sm: "(min-width: 123px)" });
+      expect(useBreakpoint).toHaveBeenCalledWith({ sm: 123 });
       expect(provide).toHaveBeenCalled();
     });
   });

diff --git a/packages/vue-composable/package.json b/packages/vue-composable/package.json
@@ -51,7 +51,6 @@
     "vue": "^2.6.10"
   },
   "peerDependencies": {
-    "@vue/composition-api": "^1.0.0-beta.2",
-    "vue": "^2.6.10"
+    "@vue/runtime-core": "^3.0.0-rc.2"
   }
 }
diff --git a/packages/vue-composable/src/breakpoint/breakpointTailwind.ts b/packages/vue-composable/src/breakpoint/breakpointTailwind.ts
@@ -147,7 +147,15 @@ export function setBreakpointTailwindCSS<T extends BreakpointObject>(
     for (const k in bk) {
       // istanbul ignore else
       if (bk.hasOwnProperty(k)) {
-        bk[k] = screenToBreakpoint(bk[k]).join(" or ");
+        const v = bk[k];
+
+        if (isObject(v)) {
+          bk[k] = screenToBreakpoint(bk[k]).join(" or ");
+        } else if (isString(v)) {
+          if (!v.endsWith("px")) {
+            bk[k] = screenToBreakpoint(bk[k]).join(" or ");
+          }
+        }
       }
     }
   }