Merge branch 'master' into feat/makeAxios

pikax · Apr 20, 2020 · 4ff5edc · 4ff5edc
2 parents 04fcb83 + 89197d5
commit 4ff5edc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/vue-composable/package.json b/packages/vue-composable/package.json
@@ -37,7 +37,8 @@
   "homepage": "https://pikax.me/vue-composable/composable",
   "sideEffects": false,
   "peerDependencies": {
-    "@vue/runtime-core": "^3.0.0-beta.1"
+    "@vue/composition-api": "^0.5.0",
+    "vue": "^2.6.10"
   },
   "peerDependencies3": {
     "@vue/runtime-core": "^3.0.0-beta.1"

diff --git a/scripts/build.js b/scripts/build.js
@@ -43,8 +43,6 @@ async function build(target, targetVersion) {
 
   const pkgDir = path.resolve(`packages/${target}`);
   const pkg = require(`${pkgDir}/package.json`);
-  const restorePkg = () =>
-    fs.writeFile(`${pkgDir}/package.json`, JSON.stringify(pkg, null, 2));
   const renameRestore = await apiRename(target, targetVersion);
   try {
     // only build published packages for release
@@ -156,7 +154,7 @@ async function build(target, targetVersion) {
       await fs.remove(`${pkgDir}/dist/packages`);
     }
   } finally {
-    await restorePkg();
+    // await restorePkg();
     await renameRestore();
   }
 }

diff --git a/scripts/publish.js b/scripts/publish.js
@@ -19,7 +19,7 @@ async function publish(package, targetVersion) {
 
   const pkgDir = resolvePkgDir(package);
   await build(package, targetVersion);
-  const pkg = require(`${pkgDir}/package.json`);
+  const pkg = JSON.parse(fs.readFileSync(`${pkgDir}/package.json`)); // require(`${pkgDir}/package.json`);
 
   const currentMinor = +mainPkg.version.split(".").slice(-1);
   const majorVersion = mainPkg.version.split("-")[0];