extra fixes

WuPan1018 · Sep 30, 2019 · 72012fe · 72012fe
1 parent b0e6b2a
commit 72012fe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/docs/DOC_INTEGRATIONS.md b/docs/DOC_INTEGRATIONS.md
@@ -4,16 +4,17 @@ title: Integrations
 sidebar_label: Integrations
 ---
 
-# Documentation for ReNative Integrations
-
----
 
 <img src="https://renative.org/img/ic_integrations.png" width=50 height=50 />
 
 ## Integrations
 
 TODO
 
+## Docker
+
+https://www.npmjs.com/package/@rnv/deploy-docker
+
 ## FTP
 
 TODO

diff --git a/package.json b/package.json
@@ -94,7 +94,8 @@
         "react-native-web-image-loader": "0.0.5",
         "react-navigation": "3.9.2",
         "react-navigation-tabs": "2.0.0-alpha.0",
-        "renative": "file:./packages/renative"
+        "renative": "file:./packages/renative",
+        "@rnv/deploy-docker": "latest"
     },
     "devDependencies": {
         "concurrently": "4.1.1",

diff --git a/packages/rnv/src/platformTools/web/index.js b/packages/rnv/src/platformTools/web/index.js
@@ -17,6 +17,7 @@ import {
     logSuccess,
     waitForWebpack,
     logError,
+    logWarning,
     getAppTitle
 } from '../../common';
 import { copyBuildsFolder, copyAssetsFolder } from '../../projectTools/projectParser';
@@ -163,7 +164,7 @@ const runWeb = (c, platform, port) => new Promise((resolve, reject) => {
                     .then(() => resolve())
                     .catch(e => reject(e));
             } else {
-                logInfo(
+                logWarning(
                     `Looks like your ${chalk.white(platform)} devServerHost at port ${chalk.white(
                         port
                     )} is already running. ReNative Will use it!`

diff --git a/packages/rnv/src/projectTools/buildHooks.js b/packages/rnv/src/projectTools/buildHooks.js
@@ -23,8 +23,12 @@ const rnvHooksRun = c => new Promise((resolve, reject) => {
 
     buildHooks(c)
         .then(() => {
-            if (c.buildHooks[c.program.exeMethod]) {
-                c.buildHooks[c.program.exeMethod](c)
+            if (!c.buildHooks) {
+                reject('Build hooks have not been compiled properly!');
+                return;
+            }
+            if (c.buildHooks[c.program?.exeMethod]) {
+                c.buildHooks[c.program?.exeMethod](c)
                     .then(() => resolve())
                     .catch(e => reject(e));
             } else {

diff --git a/packages/rnv/src/systemTools/exec.js b/packages/rnv/src/systemTools/exec.js
@@ -92,14 +92,14 @@ const _execute = (c, command, opts = {}) => {
     }
 
     return child.then((res) => {
-        spinner && child.stdout.off('data', printLastLine);
+        spinner && child.stdout.off && child.stdout.off('data', printLastLine);
         !silent && !mono && spinner.succeed(`Executing: ${logMessage}`);
         logDebug(res.all);
         interval && clearInterval(interval);
         // logDebug(res);
         return res.stdout;
     }).catch((err) => {
-        spinner && child.stdout.off('data', printLastLine);
+        spinner && child.stdout.off && child.stdout.off('data', printLastLine);
         if (!silent && !mono && !ignoreErrors) spinner.fail(`FAILED: ${logMessage}`); // parseErrorMessage will return false if nothing is found, default to previous implementation
         logDebug(err.all);
         interval && clearInterval(interval);