From f4b6f599cbbca8ed174e0fd45b12fd2fec326244 Mon Sep 17 00:00:00 2001 From: John Starich Date: Sun, 1 Aug 2021 21:20:49 -0500 Subject: [PATCH] Move log pkg to internal --- cmd/editor/dom/element.go | 2 +- cmd/editor/editor.go | 2 +- cmd/editor/ide/command.go | 2 +- cmd/editor/ide/window.go | 2 +- cmd/editor/main.go | 2 +- cmd/editor/plaineditor/editor.go | 2 +- cmd/editor/plaineditor/typer.go | 2 +- cmd/editor/terminal/terminal.go | 2 +- install.go | 2 +- internal/fs/file_descriptor.go | 2 +- internal/fs/fs.go | 2 +- internal/fs/stdout.go | 2 +- internal/fs/wasm_cache.go | 2 +- internal/fs/working_directory.go | 2 +- internal/interop/error.go | 2 +- internal/interop/funcs.go | 2 +- internal/interop/profile.go | 2 +- internal/js/fs/overlay.go | 2 +- {log => internal/log}/js_log.go | 0 {log => internal/log}/log.go | 0 {log => internal/log}/other_log.go | 0 internal/process/context.go | 2 +- internal/process/process.go | 2 +- internal/process/wasm.go | 2 +- internal/promise/js.go | 2 +- internal/tarfs/fs.go | 2 +- internal/terminal/term.go | 2 +- main.go | 2 +- 28 files changed, 25 insertions(+), 25 deletions(-) rename {log => internal/log}/js_log.go (100%) rename {log => internal/log}/log.go (100%) rename {log => internal/log}/other_log.go (100%) diff --git a/cmd/editor/dom/element.go b/cmd/editor/dom/element.go index 9eeaa03..d6f20aa 100644 --- a/cmd/editor/dom/element.go +++ b/cmd/editor/dom/element.go @@ -8,7 +8,7 @@ import ( "github.com/hack-pad/hackpad/internal/common" "github.com/hack-pad/hackpad/internal/interop" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) type Element struct { diff --git a/cmd/editor/editor.go b/cmd/editor/editor.go index bb8661d..1cd268b 100644 --- a/cmd/editor/editor.go +++ b/cmd/editor/editor.go @@ -9,7 +9,7 @@ import ( "github.com/hack-pad/hackpad/cmd/editor/dom" "github.com/hack-pad/hackpad/cmd/editor/ide" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) // editorJSFunc is a JS function that opens on a JS element and returns a JS object with the following spec: diff --git a/cmd/editor/ide/command.go b/cmd/editor/ide/command.go index 2b9ea7b..9a182df 100644 --- a/cmd/editor/ide/command.go +++ b/cmd/editor/ide/command.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/promise" - "github.com/hack-pad/hackpad/log" ) const ( diff --git a/cmd/editor/ide/window.go b/cmd/editor/ide/window.go index 861242a..8d37e06 100644 --- a/cmd/editor/ide/window.go +++ b/cmd/editor/ide/window.go @@ -12,7 +12,7 @@ import ( "github.com/avct/uasurfer" "github.com/hack-pad/hackpad/cmd/editor/css" "github.com/hack-pad/hackpad/cmd/editor/dom" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "go.uber.org/atomic" ) diff --git a/cmd/editor/main.go b/cmd/editor/main.go index 93dfbb4..7c0c828 100644 --- a/cmd/editor/main.go +++ b/cmd/editor/main.go @@ -14,7 +14,7 @@ import ( "github.com/hack-pad/hackpad/cmd/editor/taskconsole" "github.com/hack-pad/hackpad/cmd/editor/terminal" "github.com/hack-pad/hackpad/internal/interop" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) const ( diff --git a/cmd/editor/plaineditor/editor.go b/cmd/editor/plaineditor/editor.go index 43298b5..c21cd57 100644 --- a/cmd/editor/plaineditor/editor.go +++ b/cmd/editor/plaineditor/editor.go @@ -8,7 +8,7 @@ import ( "github.com/hack-pad/hackpad/cmd/editor/dom" "github.com/hack-pad/hackpad/cmd/editor/ide" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) type textAreaBuilder struct { diff --git a/cmd/editor/plaineditor/typer.go b/cmd/editor/plaineditor/typer.go index 241b29d..40f7c5b 100644 --- a/cmd/editor/plaineditor/typer.go +++ b/cmd/editor/plaineditor/typer.go @@ -8,7 +8,7 @@ import ( "syscall/js" "unicode" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) var ( diff --git a/cmd/editor/terminal/terminal.go b/cmd/editor/terminal/terminal.go index 297dab4..abb485d 100644 --- a/cmd/editor/terminal/terminal.go +++ b/cmd/editor/terminal/terminal.go @@ -10,7 +10,7 @@ import ( "github.com/hack-pad/hackpad/cmd/editor/dom" "github.com/hack-pad/hackpad/cmd/editor/ide" "github.com/hack-pad/hackpad/internal/common" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs/indexeddb/idbblob" "github.com/hack-pad/hackpadfs/keyvalue/blob" ) diff --git a/install.go b/install.go index a942bb7..3d61311 100644 --- a/install.go +++ b/install.go @@ -10,9 +10,9 @@ import ( "syscall/js" "github.com/hack-pad/hackpad/internal/interop" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/process" "github.com/hack-pad/hackpad/internal/promise" - "github.com/hack-pad/hackpad/log" ) func installFunc(this js.Value, args []js.Value) interface{} { diff --git a/internal/fs/file_descriptor.go b/internal/fs/file_descriptor.go index 5217d62..940d97f 100644 --- a/internal/fs/file_descriptor.go +++ b/internal/fs/file_descriptor.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/hack-pad/hackpad/internal/common" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs" "go.uber.org/atomic" ) diff --git a/internal/fs/fs.go b/internal/fs/fs.go index a50c705..19bb8fa 100644 --- a/internal/fs/fs.go +++ b/internal/fs/fs.go @@ -6,8 +6,8 @@ import ( "path" "github.com/hack-pad/hackpad/internal/common" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/tarfs" - "github.com/hack-pad/hackpad/log" "github.com/hack-pad/hackpadfs" "github.com/hack-pad/hackpadfs/cache" "github.com/hack-pad/hackpadfs/mem" diff --git a/internal/fs/stdout.go b/internal/fs/stdout.go index 40569bb..41a0595 100644 --- a/internal/fs/stdout.go +++ b/internal/fs/stdout.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs" ) diff --git a/internal/fs/wasm_cache.go b/internal/fs/wasm_cache.go index 5b4f335..fce0589 100644 --- a/internal/fs/wasm_cache.go +++ b/internal/fs/wasm_cache.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hack-pad/hackpad/internal/fsutil" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/promise" - "github.com/hack-pad/hackpad/log" "github.com/hack-pad/hackpadfs" "github.com/hack-pad/hackpadfs/indexeddb/idbblob" "github.com/hack-pad/hackpadfs/keyvalue/blob" diff --git a/internal/fs/working_directory.go b/internal/fs/working_directory.go index bf8e4bd..1af62e7 100644 --- a/internal/fs/working_directory.go +++ b/internal/fs/working_directory.go @@ -3,7 +3,7 @@ package fs import ( "time" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs" "go.uber.org/atomic" ) diff --git a/internal/interop/error.go b/internal/interop/error.go index 8d2e4ac..6a22570 100644 --- a/internal/interop/error.go +++ b/internal/interop/error.go @@ -6,7 +6,7 @@ import ( "os/exec" "github.com/hack-pad/hackpad/internal/common" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs" "github.com/pkg/errors" ) diff --git a/internal/interop/funcs.go b/internal/interop/funcs.go index 18193b9..4881c7a 100644 --- a/internal/interop/funcs.go +++ b/internal/interop/funcs.go @@ -8,7 +8,7 @@ import ( "strings" "syscall/js" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/pkg/errors" ) diff --git a/internal/interop/profile.go b/internal/interop/profile.go index 3e711e1..3b488ff 100644 --- a/internal/interop/profile.go +++ b/internal/interop/profile.go @@ -11,7 +11,7 @@ import ( "syscall/js" "time" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) func ProfileJS(this js.Value, args []js.Value) interface{} { diff --git a/internal/js/fs/overlay.go b/internal/js/fs/overlay.go index 3e39577..d7ab43b 100644 --- a/internal/js/fs/overlay.go +++ b/internal/js/fs/overlay.go @@ -20,9 +20,9 @@ import ( "github.com/hack-pad/hackpad/internal/common" "github.com/hack-pad/hackpad/internal/fs" "github.com/hack-pad/hackpad/internal/interop" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/process" "github.com/hack-pad/hackpad/internal/promise" - "github.com/hack-pad/hackpad/log" "github.com/johnstarich/go/datasize" ) diff --git a/log/js_log.go b/internal/log/js_log.go similarity index 100% rename from log/js_log.go rename to internal/log/js_log.go diff --git a/log/log.go b/internal/log/log.go similarity index 100% rename from log/log.go rename to internal/log/log.go diff --git a/log/other_log.go b/internal/log/other_log.go similarity index 100% rename from log/other_log.go rename to internal/log/other_log.go diff --git a/internal/process/context.go b/internal/process/context.go index 9ba9fa0..f21ec3f 100644 --- a/internal/process/context.go +++ b/internal/process/context.go @@ -5,7 +5,7 @@ import ( "syscall" "github.com/hack-pad/hackpad/internal/fs" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) const initialDirectory = "/home/me" diff --git a/internal/process/process.go b/internal/process/process.go index bd9e73c..3c0404c 100644 --- a/internal/process/process.go +++ b/internal/process/process.go @@ -9,7 +9,7 @@ import ( "github.com/hack-pad/hackpad/internal/common" "github.com/hack-pad/hackpad/internal/fs" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpadfs/keyvalue/blob" "github.com/pkg/errors" "go.uber.org/atomic" diff --git a/internal/process/wasm.go b/internal/process/wasm.go index 6f79b49..058a7a1 100644 --- a/internal/process/wasm.go +++ b/internal/process/wasm.go @@ -8,8 +8,8 @@ import ( "syscall/js" "github.com/hack-pad/hackpad/internal/interop" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/promise" - "github.com/hack-pad/hackpad/log" ) var ( diff --git a/internal/promise/js.go b/internal/promise/js.go index 878305e..88fe6b7 100644 --- a/internal/promise/js.go +++ b/internal/promise/js.go @@ -7,7 +7,7 @@ import ( "syscall/js" "github.com/hack-pad/hackpad/internal/interop" - "github.com/hack-pad/hackpad/log" + "github.com/hack-pad/hackpad/internal/log" ) var jsPromise = js.Global().Get("Promise") diff --git a/internal/tarfs/fs.go b/internal/tarfs/fs.go index f1ba5a4..2ad9f82 100644 --- a/internal/tarfs/fs.go +++ b/internal/tarfs/fs.go @@ -11,8 +11,8 @@ import ( "github.com/hack-pad/hackpad/internal/bufferpool" "github.com/hack-pad/hackpad/internal/common" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/pubsub" - "github.com/hack-pad/hackpad/log" "github.com/hack-pad/hackpadfs" "github.com/pkg/errors" ) diff --git a/internal/terminal/term.go b/internal/terminal/term.go index 0ff941b..f717d32 100644 --- a/internal/terminal/term.go +++ b/internal/terminal/term.go @@ -7,8 +7,8 @@ import ( "github.com/hack-pad/hackpad/internal/fs" "github.com/hack-pad/hackpad/internal/interop" + "github.com/hack-pad/hackpad/internal/log" "github.com/hack-pad/hackpad/internal/process" - "github.com/hack-pad/hackpad/log" "github.com/hack-pad/hackpadfs/indexeddb/idbblob" "github.com/pkg/errors" ) diff --git a/main.go b/main.go index 13e9a7c..6b9661e 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,9 @@ import ( "github.com/hack-pad/hackpad/internal/interop" "github.com/hack-pad/hackpad/internal/js/fs" "github.com/hack-pad/hackpad/internal/js/process" + "github.com/hack-pad/hackpad/internal/log" libProcess "github.com/hack-pad/hackpad/internal/process" "github.com/hack-pad/hackpad/internal/terminal" - "github.com/hack-pad/hackpad/log" ) func main() {