Merge branch 'master' of github.com:Glavin001/atom-beautify

package.json

@@ -184,7 +184,7 @@
     "bluebird": "^3.5.1",
     "coffee-fmt": "^0.12.0",
     "coffee-formatter": "^0.1.2",
-    "coffee-script": "^1.12.6",
+    "coffeescript": "^1.12.6",
     "csscomb": "^4.2.0",
     "diff": "^3.4.0",
     "editorconfig": "^0.15.0",
@@ -202,7 +202,6 @@
     "nginxbeautify": "^2.0.1",
     "node-cljfmt": "0.5.3",
     "node-dir": "0.1.17",
-    "node-uuid": "1.4.8",
     "open": "0.0.5",
     "prettier": "^1.10.2",
     "prettydiff2": "^2.2.7",
@@ -218,6 +217,7 @@
     "typescript": "^2.6.2",
     "typescript-formatter": "^7.0.0",
     "underscore-plus": "^1.6.6",
+    "uuid": "^3.1.0",
     "universal-analytics": "^0.4.16",
     "which": "^1.3.0",
     "winston": "^2.4.0",
@@ -455,7 +455,7 @@
   "scripts": {
     "build-options": "node script/build-options.js",
     "docs": "npm run build-options && coffee docs/",
-    "prepublish": "npm run docs",
+    "prepare": "npm run docs",
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html",
     "test": "atom --test spec"

script/build-options.js

@@ -9,7 +9,7 @@ _ = require('lodash');
 
 _plus = require('underscore-plus');
 
-require("coffee-script/register");
+require("coffeescript/register");
 
 logger = require('../src/logger')(__filename)
 

src/beautifiers/index.coffee

@@ -266,8 +266,8 @@ module.exports = class Beautifiers extends EventEmitter
         logger.info("Analytics is enabled.")
         # Setup Analytics
         unless atom.config.get("atom-beautify.general._analyticsUserId")
-          uuid = require("node-uuid")
-          atom.config.set "atom-beautify.general._analyticsUserId", uuid.v4()
+          uuidv4 = require("uuid/v4")
+          atom.config.set "atom-beautify.general._analyticsUserId", uuidv4()
         # Setup Analytics User Id
         userId = atom.config.get("atom-beautify.general._analyticsUserId")
         @analytics ?= new ua(trackingId, userId, {