build: improve build and bump version 1.0.0-dev.6

Author: pikax

CHANGELOG.md

@@ -3,7 +3,13 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+<!-- ## [Unreleased]
+
+--- -->
+
+## 1.0.0-dev.6
+
+_2020-01-19_
 
 ---
 

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.6",
   "name": "vue-composable-monorepo",
   "workspaces": [
     "packages/*",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-composable/axios",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.6",
   "description": "@vue-composable/axios",
   "main": "index.js",
   "module": "dist/axios.esm-bundler.js",
@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/pikax/vue-composable/tree/dev/packages/axios#readme",
   "dependencies": {
-    "@vue-composable/core": "1.0.0-dev.4",
+    "@vue-composable/core": "1.0.0-dev.6",
     "@vue/composition-api": "^0.3.4",
     "axios": "^0.19.0"
   }

packages/axios/src/index.ts

@@ -2,9 +2,6 @@ import { computed, Ref, ref } from "@vue/composition-api";
 import axios, { AxiosRequestConfig, AxiosResponse, AxiosInstance, CancelTokenSource } from "axios";
 import { usePromise, PromiseResultFactory, isString, isBoolean, isObject } from "@vue-composable/core";
 
-/* istanbul ignore next  */
-const _axios = axios || (globalThis && (globalThis as any).axios);
-
 interface AxiosReturn<TData> extends PromiseResultFactory<Promise<AxiosResponse<TData>>, [AxiosRequestConfig]> {
   readonly client: Ref<Readonly<AxiosInstance>>;
   readonly data: Ref<TData | null>;
@@ -30,13 +27,13 @@ export function useAxios<TData = any>(config?: AxiosRequestConfig, throwExceptio
 export function useAxios<TData = any>(configUrlThrowException?: AxiosRequestConfig | string | boolean, configThrowException?: AxiosRequestConfig | boolean, throwException = false): AxiosReturn<TData> {
   /* istanbul ignore next  */
   __DEV__ &&
-    !_axios &&
+    !axios &&
     console.warn(`[axios] not installed, please install it`);
 
   const config = !isString(configUrlThrowException) && !isBoolean(configUrlThrowException) ? configUrlThrowException : isObject(configThrowException) ? configThrowException as AxiosRequestConfig : undefined;
   throwException = isBoolean(configUrlThrowException) ? configUrlThrowException : isBoolean(configThrowException) ? configThrowException : throwException;
 
-  const axiosClient = _axios.create(config);
+  const axiosClient = axios.create(config);
   const client = computed(() => axiosClient);
   const isCancelled = ref(false);
   const cancelledMessage = ref<string>(null);
@@ -55,7 +52,7 @@ export function useAxios<TData = any>(configUrlThrowException?: AxiosRequestConf
   }
 
   const use = usePromise(async (request: AxiosRequestConfig) => {
-    cancelToken = _axios.CancelToken.source()
+    cancelToken = axios.CancelToken.source()
     isCancelled.value = false;
     cancelledMessage.value = null;
 

packages/core/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@vue-composable/core",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.6",
   "description": "@vue-composable/core",
   "main": "index.js",
   "module": "dist/core.esm-bundler.js",
-  "unpkg": "dist/core.global.js",
   "files": [
     "index.js",
     "dist"
@@ -15,8 +14,7 @@
     "name": "VueComposableCore",
     "formats": [
       "esm-bundler",
-      "cjs",
-      "global"
+      "cjs"
     ]
   },
   "repository": {

packages/vue-composable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-composable",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.6",
   "description": "vue-composable",
   "main": "index.js",
   "module": "dist/vue-composable.esm-bundler.js",
@@ -16,8 +16,7 @@
     "formats": [
       "esm-bundler",
       "cjs",
-      "global",
-      "esm"
+      "global"
     ]
   },
   "repository": {
@@ -37,8 +36,8 @@
   },
   "homepage": "https://github.com/pikax/vue-composable",
   "dependencies": {
-    "@vue-composable/core": "1.0.0-dev.4",
-    "@vue-composable/web": "1.0.0-dev.4",
+    "@vue-composable/core": "1.0.0-dev.6",
+    "@vue-composable/web": "1.0.0-dev.6",
     "@vue/composition-api": "^0.3.4",
     "vue": "^2.6.10"
   }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-composable/web",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.6",
   "description": "@vue-composable/web",
   "main": "index.js",
   "module": "dist/web.esm-bundler.js",
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/pikax/vue-composable/tree/dev/packages/core#readme",
   "dependencies": {
-    "@vue-composable/core": "1.0.0-dev.4",
+    "@vue-composable/core": "1.0.0-dev.6",
     "@vue/composition-api": "^0.3.4",
     "vue": "^2.6.10"
   }

packages/web/src/event/index.ts

@@ -1,5 +1,4 @@
 export * from "./event";
 export * from "./onMouseMove";
 export * from "./onResize";
-export * from "./onScroll";
-export * from '../misc/breakpoint'
+export * from "./onScroll";

rollup.config.js

@@ -35,13 +35,14 @@ const configs = {
     file: resolve(`dist/${name}.global.js`),
     format: `iife`,
     globals: {
-      "@vue/composition-api": "vueCompositionApi"
-      // "@vue-composable/core": "VueComposableCore"
+      "@vue/composition-api": "vueCompositionApi",
+      axios: "axios"
     }
   },
   esm: {
     file: resolve(`dist/${name}.esm.js`),
-    format: `es`
+    format: `es`,
+    external: ["vue", "@vue/composition-api", "axios"]
   }
 };