reinstalled package-lock

README.md

@@ -23,19 +23,16 @@ Paste the **scriptId** into the .clasp.json file as below:
 {"rootDir": "dist",
  "scriptId":"...paste scriptId here..."}
 ```
+If you have not enabled Google's Apps Script API, do so by visiting https://script.google.com/home/usersettings.
 Log into CLASP to push code to the server from the command line:
 ```
 npx clasp login
 ```
-Modify the server-side and client-side source code in the `src` folder using ES6/7 and React. Change the scopes in `appsscript.json` if needed. When you're ready, build the app!
+Modify the server-side and client-side source code in the `src` folder using ES6/7 and React. Change the scopes in `appsscript.json` if needed. When you're ready, build the app and deploy!
 ```
-npm run build
+npm run deploy
 ```
-Webpack will display any linting errors, and then bundle your files in `dist`. Finally, push your files to Google's servers using CLASP:
-```
-clasp push
-```
-
+Webpack will display any linting errors, bundle your files in `dist`, and push your files to Google's servers using CLASP. You can run `npm run build` to just build.
 
 ## The sample app
 Insert/activate/delete sheets through a simple HTML dialog, built with React. Access the dialog through the new menu item that appears. You may need to refresh the spreadsheet and approve the app's permissions the first time you use it.

package-lock.json

@@ -145,6 +145,7 @@
       "integrity": "sha512-rnDx6LS8KttymesRJtpPekrQWM0EsObI99PmZLpIGqcnmU+P7PP0cgXo7zfZJNBt7E4abqv81d+w8gqow8/Srw==",
       "dev": true,
       "requires": {
+<<<<<<< HEAD
         "anymatch": "^1.3.2",
         "axios": "^0.18.0",
         "chalk": "^2.4.1",
@@ -173,6 +174,36 @@
         "ts2gas": "^1.2.0",
         "url": "^0.11.0",
         "watch": "^1.0.2"
+=======
+        "anymatch": "1.3.2",
+        "axios": "0.18.0",
+        "chalk": "2.4.1",
+        "cli-spinner": "0.2.8",
+        "commander": "2.17.1",
+        "connect": "3.6.6",
+        "del": "3.0.0",
+        "dotf": "1.0.3",
+        "find-parent-dir": "0.3.0",
+        "fs": "0.0.1-security",
+        "google-auth-library": "1.6.1",
+        "googleapis": "28.1.0",
+        "http-shutdown": "1.2.0",
+        "inquirer": "5.2.0",
+        "is-online": "7.0.0",
+        "mkdirp": "0.5.1",
+        "opn": "5.3.0",
+        "path": "0.12.7",
+        "pluralize": "7.0.0",
+        "read-file": "0.2.0",
+        "read-multiple-files": "1.1.1",
+        "readline": "1.3.0",
+        "recursive-readdir": "2.2.2",
+        "split-lines": "1.1.0",
+        "string.prototype.padend": "3.0.0",
+        "ts2gas": "1.2.0",
+        "url": "0.11.0",
+        "watch": "1.0.2"
+>>>>>>> a61f0a9bfbcb11fc1f91c78a39739272e86c1ace
       },
       "dependencies": {
         "del": {
@@ -666,8 +697,13 @@
       "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
       "dev": true,
       "requires": {
+<<<<<<< HEAD
         "follow-redirects": "^1.3.0",
         "is-buffer": "^1.1.5"
+=======
+        "follow-redirects": "1.5.8",
+        "is-buffer": "1.1.6"
+>>>>>>> a61f0a9bfbcb11fc1f91c78a39739272e86c1ace
       }
     },
     "axobject-query": {
@@ -2747,7 +2783,11 @@
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
+<<<<<<< HEAD
         "capture-stack-trace": "^1.0.0"
+=======
+        "capture-stack-trace": "1.0.1"
+>>>>>>> a61f0a9bfbcb11fc1f91c78a39739272e86c1ace
       }
     },
     "create-hash": {
@@ -4915,8 +4955,13 @@
       "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==",
       "dev": true,
       "requires": {
+<<<<<<< HEAD
         "node-forge": "^0.7.4",
         "pify": "^3.0.0"
+=======
+        "node-forge": "0.7.6",
+        "pify": "3.0.0"
+>>>>>>> a61f0a9bfbcb11fc1f91c78a39739272e86c1ace
       },
       "dependencies": {
         "pify": {
@@ -5425,11 +5470,19 @@
         "figures": "^2.0.0",
         "lodash": "^4.3.0",
         "mute-stream": "0.0.7",
+<<<<<<< HEAD
         "run-async": "^2.2.0",
         "rxjs": "^5.5.2",
         "string-width": "^2.1.0",
         "strip-ansi": "^4.0.0",
         "through": "^2.3.6"
+=======
+        "run-async": "2.3.0",
+        "rxjs": "5.5.12",
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "through": "2.3.8"
+>>>>>>> a61f0a9bfbcb11fc1f91c78a39739272e86c1ace
       }
     },
     "interpret": {

package.json

@@ -6,7 +6,7 @@
     "test": "test",
     "start": "webpack --mode development",
     "build": "webpack --mode production",
-    "deploy": "clasp push"
+    "deploy": "npm run build && npx clasp push"
   },
   "keywords": [
     "react",