From c7a416a405edba2ebc2aa9a134ef00003d7f884b Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Sun, 21 Jan 2018 22:33:38 -0600 Subject: [PATCH 1/2] Change node-uuid to uuid, prepublish to prepare --- package.json | 4 ++-- src/beautifiers/index.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8898cdd..d1a7f6e 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,6 @@ "nginxbeautify": "^2.0.1", "node-cljfmt": "0.5.3", "node-dir": "0.1.17", - "node-uuid": "1.4.8", "open": "0.0.5", "prettydiff2": "^2.2.7", "pug-beautify": "^0.1.1", @@ -197,6 +196,7 @@ "typescript-formatter": "5.2.0", "underscore-plus": "^1.6.6", "universal-analytics": "0.4.13", + "uuid": "^3.1.0", "which": "1.2.14", "winston": "2.3.1", "yaml-front-matter": "3.4.0" @@ -420,7 +420,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" diff --git a/src/beautifiers/index.coffee b/src/beautifiers/index.coffee index cc3f237..94f6383 100644 --- a/src/beautifiers/index.coffee +++ b/src/beautifiers/index.coffee @@ -260,8 +260,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, { From b71c812411a9269e96d048e04ee70b925b798a25 Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 22 Jan 2018 11:47:44 -0600 Subject: [PATCH 2/2] Change from coffee-script to coffeescript for npm package --- package.json | 2 +- script/build-options.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8898cdd..807d57a 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "bluebird": "^3.5.0", "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.2.0", "editorconfig": "^0.13.2", diff --git a/script/build-options.js b/script/build-options.js index 838d603..e8ad8b8 100644 --- a/script/build-options.js +++ b/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)