refactor: upgrade to log v4

BREAKING CHANGE: Switch to log v4
medikoo · Mar 18, 2019 · 703815b · 703815b
1 parent 31b7398
commit 703815b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/index.js b/index.js
@@ -4,10 +4,10 @@ const isObject            = require("es5-ext/object/is-object")
     , d                   = require("d")
     , clc                 = require("cli-color/bare")
     , rootLogger          = require("log")
-    , emitter             = require("log/writer-utils/emitter")
-    , registerMaster      = require("log/writer-utils/register-master")
-    , setupVisibility     = require("log/writer-utils/setup-visibility")
-    , setDefaultNamespace = require("log/writer-utils/get-default-namespace").set
+    , emitter             = require("log/lib/emitter")
+    , registerMaster      = require("log/lib/register-master")
+    , setupVisibility     = require("log/lib/setup-visibility")
+    , setDefaultNamespace = require("log/lib/get-default-namespace").set
     , colorsSupportLevel  = require("./lib/private/colors-support-level")
     , formatMessage       = require("./utils/format-event-message")
     , levelPrefixes       = require("./utils/level-prefixes")

diff --git a/package.json b/package.json
@@ -32,15 +32,15 @@
 		"git-list-updated": "^1.1.2",
 		"husky": "^1.3.1",
 		"lint-staged": "^8.1.5",
-		"log": "^3.2.0",
+		"log": "^4.0.1",
 		"nyc": "^13.3.0",
 		"prettier-elastic": "^1.16.4",
 		"process-utils": "^2.0.1",
 		"tape": "^4.10.1",
 		"tape-index": "^3.0.1"
 	},
 	"peerDependencies": {
-		"log": "^3.1"
+		"log": "^4.0.0"
 	},
 	"husky": {
 		"hooks": {

diff --git a/test/index.js b/test/index.js
@@ -9,10 +9,9 @@ const resolveUncached = callback => {
 	try {
 		return requireUncached(
 			[
-				require.resolve("log"), require.resolve("log/writer-utils/emitter"),
-				require.resolve("log/writer-utils/register-master"),
-				require.resolve("log/writer-utils/setup-visibility"),
-				require.resolve("supports-color"),
+				require.resolve("log"), require.resolve("log/lib/private/logger-prototype"),
+				require.resolve("log/lib/emitter"), require.resolve("log/lib/register-master"),
+				require.resolve("log/lib/setup-visibility"), require.resolve("supports-color"),
 				require.resolve("../lib/private/colors-support-level"),
 				require.resolve("../utils/format-event-message"),
 				require.resolve("../utils/resolve-format-parts"), require.resolve("../")

diff --git a/test/utils/format-event-message.js b/test/utils/format-event-message.js
@@ -10,7 +10,8 @@ const resolveUncached = callback => {
 	try {
 		return requireUncached(
 			[
-				require.resolve("log/writer-utils/emitter"), require.resolve("log"),
+				require.resolve("log/lib/emitter"), require.resolve("log"),
+				require.resolve("log/lib/private/logger-prototype"),
 				require.resolve("../../utils/resolve-format-parts"),
 				require.resolve("../../utils/format-event-message"),
 				require.resolve("supports-color"),

diff --git a/test/utils/format.js b/test/utils/format.js
@@ -10,7 +10,8 @@ const resolveUncached = callback => {
 	try {
 		return requireUncached(
 			[
-				require.resolve("log/writer-utils/emitter"), require.resolve("log"),
+				require.resolve("log/lib/emitter"), require.resolve("log"),
+				require.resolve("log/lib/private/logger-prototype"),
 				require.resolve("../../utils/resolve-format-parts"),
 				require.resolve("../../utils/format-event-message"),
 				require.resolve("supports-color"),

diff --git a/test/utils/get-namespace-prefix.js b/test/utils/get-namespace-prefix.js
@@ -9,8 +9,9 @@ const resolveUncached = callback => {
 	try {
 		return requireUncached(
 			[
-				require.resolve("log"), require.resolve("log/writer-utils/emitter"),
-				require.resolve("log/writer-utils/get-default-namespace"),
+				require.resolve("log"), require.resolve("log/lib/private/logger-prototype"),
+				require.resolve("log/lib/emitter"),
+				require.resolve("log/lib/get-default-namespace"),
 				require.resolve("../../utils/get-namespace-prefix"),
 				require.resolve("supports-color"),
 				require.resolve("../../lib/private/colors-support-level")
@@ -78,7 +79,7 @@ test("getNamespacePrefix", t => {
 	t.test("Should not show default namespace", t => {
 		const { log, getNamespacePrefix } = resolveUncached(() => {
 			require("supports-color").stderr = false;
-			require("log/writer-utils/get-default-namespace").set("marko");
+			require("log/lib/get-default-namespace").set("marko");
 		});
 
 		t.equal(getNamespacePrefix(log.get("foo")), log.get("foo").namespace);

diff --git a/test/utils/resolve-format-parts.js b/test/utils/resolve-format-parts.js
@@ -15,7 +15,8 @@ const resolveUncached = callback => {
 	try {
 		return requireUncached(
 			[
-				require.resolve("log/writer-utils/emitter"), require.resolve("log"),
+				require.resolve("log/lib/emitter"), require.resolve("log"),
+				require.resolve("log/lib/private/logger-prototype"),
 				require.resolve("../../utils/resolve-format-parts"),
 				require.resolve("supports-color"),
 				require.resolve("../../lib/private/colors-support-level"),

diff --git a/utils/get-namespace-prefix.js b/utils/get-namespace-prefix.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const getDefaultNamespace = require("log/writer-utils/get-default-namespace")
+const getDefaultNamespace = require("log/lib/get-default-namespace")
     , colorsSupportLevel  = require("../lib/private/colors-support-level");
 
 const resolveNamespaceString = logger => {

diff --git a/utils/level-prefixes.js b/utils/level-prefixes.js
@@ -2,7 +2,7 @@
 
 const entries            = require("es5-ext/object/entries")
     , clc                = require("cli-color/bare")
-    , defaultSymbols     = require("log/writer-utils/level-symbols")
+    , defaultSymbols     = require("log/lib/level-symbols")
     , colorsSupportLevel = require("../lib/private/colors-support-level");
 
 const symbols = (() => {