Merge branch 'release/1.0.2'

yzane · Apr 25, 2018 · a0f3e6d · a0f3e6d
2 parents 52c5bab + 59ac3fd
commit a0f3e6d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.0.2 (2018/04/24)
+* Improve: puppeteer install [#76](https://github.com/yzane/vscode-markdown-pdf/issues/76), [#77](https://github.com/yzane/vscode-markdown-pdf/issues/77)
+
 ## 1.0.1 (2018/04/21)
 * Add: Allow online (https) CSS in `markdown-pdf.styles` [#67](https://github.com/yzane/vscode-markdown-pdf/issues/67)
 

diff --git a/README.ja.md b/README.ja.md
@@ -344,6 +344,9 @@
 
 ## [Release Notes](CHANGELOG.md)
 
+### 1.0.2 (2018/04/24)
+* Improve: puppeteer install [#76](https://github.com/yzane/vscode-markdown-pdf/issues/76), [#77](https://github.com/yzane/vscode-markdown-pdf/issues/77)
+
 ### 1.0.1 (2018/04/21)
 * Add: Allow online (https) CSS in `markdown-pdf.styles` [#67](https://github.com/yzane/vscode-markdown-pdf/issues/67)
 

diff --git a/README.md b/README.md
@@ -347,6 +347,9 @@ Sample files
 
 ## [Release Notes](CHANGELOG.md)
 
+### 1.0.2 (2018/04/24)
+* Improve: puppeteer install [#76](https://github.com/yzane/vscode-markdown-pdf/issues/76), [#77](https://github.com/yzane/vscode-markdown-pdf/issues/77)
+
 ### 1.0.1 (2018/04/21)
 * Add: Allow online (https) CSS in `markdown-pdf.styles` [#67](https://github.com/yzane/vscode-markdown-pdf/issues/67)
 

diff --git a/extension.js b/extension.js
@@ -651,71 +651,17 @@ function installPuppeteerBinary() {
   browserFetcher.canDownload(revision)
     .then(function (r) {
       if (r) {
-          downloadPuppeteerBinary(statusbarmessage);
+        puppeteer_installer(statusbarmessage);
           return;
     } else {
         statusbarmessage.dispose();
         vscode.window.setStatusBarMessage('$(markdown) ERROR: Failed to download Chromium!', StatusbarMessageTimeout);
-        vscode.window.showErrorMessage('ERROR: installpuppeteerBinary() Are you offline or behind a proxy? If you are behind a proxy, set the http.proxy option to settings.json.');
+        vscode.window.showErrorMessage('ERROR: Failed to download Chromium! If you are behind a proxy, set the http.proxy option to settings.json and restart Visual Studio Code.');
         return;
       }
     });
 }
 
-function downloadPuppeteerBinary(statusbarmessage) {
-  var StatusbarMessageTimeout = vscode.workspace.getConfiguration('markdown-pdf')['StatusbarMessageTimeout'];
-  // which npm
-  var which = require('which');
-  var npm = '';
-  try {
-    npm = which.sync('npm');
-  } catch (e) {
-    console.warn(e.message);
-  }
-
-  // npm rebuild puppeteer
-  if (isExistsPath(npm)) {
-    try {
-        console.log('###### npm rebuild puppeteer');
-        var execSync = require('child_process').execSync;
-        var std = execSync('npm rebuild puppeteer', {cwd: __dirname});
-        console.log(std.toString());
-        if (checkPuppeteerBinary()) {
-          statusbarmessage.dispose();
-          vscode.window.setStatusBarMessage('$(markdown) Puppeteer installation succeeded.', StatusbarMessageTimeout);
-          vscode.window.showInformationMessage('[Markdown PDF:1] Puppeteer installation succeeded.');
-          return;
-        } else {
-          statusbarmessage.dispose();
-          return;
-        }
-    } catch (e) {
-      statusbarmessage.dispose();
-      vscode.window.setStatusBarMessage('ERROR: "npm rebuild puppeteer"', StatusbarMessageTimeout);
-      vscode.window.showErrorMessage('ERROR: "npm rebuild puppeteer"');
-      vscode.window.showErrorMessage(e.message);
-    }
-  } else {
-  // node_modules/puppeteer/install.js
-    var install = path.join(__dirname, 'node_modules', 'puppeteer', 'install.js');
-    try {
-      if (isExistsPath(install)) {
-        console.log('###### node_modules/puppeteer/install.js');
-        puppeteer_installer(statusbarmessage);        
-        return;
-      } else {
-        statusbarmessage.dispose();
-      }
-    } catch (e) {
-      statusbarmessage.dispose();
-      vscode.window.setStatusBarMessage('ERROR: "node_modules/puppeteer/install.js"', StatusbarMessageTimeout);
-      vscode.window.showErrorMessage('ERROR: "node_modules/puppeteer/install.js"');
-      vscode.window.showErrorMessage(e.message);
-      console.error(e.message);
-    }
-  }
-}
-
 /*
  * puppeteer install.js
  * https://github.com/GoogleChrome/puppeteer/blob/master/install.js

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "markdown-pdf",
   "displayName": "Markdown PDF",
   "description": "Convert Markdown to PDF",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "publisher": "yzane",
   "icon": "images/icon.png",
   "engines": {
@@ -458,7 +458,6 @@
     "markdown-it-named-headers": "0.0.4",
     "mustache": "^2.3.0",
     "puppeteer": "^1.3.0",
-    "rimraf": "^2.6.2",
-    "which": "^1.3.0"
+    "rimraf": "^2.6.2"
   }
 }