From ff0ea02feee9a7dd7f5fbb9d33d041027f993951 Mon Sep 17 00:00:00 2001
From: Exile <exile@chamber.ee>
Date: Fri, 9 Apr 2021 14:10:04 +0300
Subject: [PATCH] Consume treehugger as scoped package from the npm registry

---
 Makefile                                        | 4 ++--
 Makefile.dryice.js                              | 2 +-
 package-lock.json                               | 9 +++++----
 package.json                                    | 4 ++--
 plugins-client/lib.treehugger/treehugger-lib.js | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 702452b43..219c7c051 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,8 @@ plugins-client/lib.ace/www/worker/worker-language.js plugins-client/lib.ace/www/
         $(wildcard plugins-client/ext.htmllanguage/*/*) \
         $(wildcard plugins-client/ext.jsinfer/*) \
         $(wildcard plugins-client/ext.jsinfer/*/*) \
-        $(wildcard node_modules/treehugger/lib/*) \
-        $(wildcard node_modules/treehugger/lib/*/*) \
+        $(wildcard node_modules/@pylonide/treehugger/lib/*) \
+        $(wildcard node_modules/@pylonide/treehugger/lib/*/*) \
         $(wildcard node_modules/ace/lib/*) \
         $(wildcard node_modules/ace/*/*) \
         Makefile.dryice.js
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 2375faa6a..faf7083de 100644
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -26,7 +26,7 @@ function main(args) {
         roots: [
             ACE_HOME + "/lib",
             "/tmp/pln_worker_build",
-            __dirname + "/node_modules/treehugger/lib"
+            __dirname + "/node_modules/@pylonide/treehugger/lib"
         ],
         textPluginPattern: /^ace\/requirejs\/text!/
     };
diff --git a/package-lock.json b/package-lock.json
index 15c5c59cf..5d452098e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -152,6 +152,11 @@
                 "xpath": "~0.0.32"
             }
         },
+        "@pylonide/treehugger": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@pylonide/treehugger/-/treehugger-0.1.0.tgz",
+            "integrity": "sha512-9km8izEnLmZFJ6cyrseT7Kce95ID/Wkok+LfbBIUz/9DoLCO6IBLZifHe1meDDvB21EQfxN+KPQOck1/75L4xg=="
+        },
         "@pylonide/vfs-architect": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/@pylonide/vfs-architect/-/vfs-architect-0.2.1.tgz",
@@ -2554,10 +2559,6 @@
                 "punycode": "^2.1.1"
             }
         },
-        "treehugger": {
-            "version": "https://github.com/pylonide/treehugger/tarball/65876760a809d93f627d5f9834c8bfc56f142a7e",
-            "integrity": "sha512-4uZ1BC0M4AuIjSysFYP6VoAFtI4hdFmT5GIXd0Qil4k5m57qdreLCt7PIiuHidv3FJm9Rq6zUs0/jPahdjQV3w=="
-        },
         "trivial-deferred": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/trivial-deferred/-/trivial-deferred-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9476c9c4d..becf4c8c7 100644
--- a/package.json
+++ b/package.json
@@ -47,13 +47,13 @@
         "asyncjs": "~0.0.13",
         "@pylonide/dryice": "^0.5.2",
         "@pylonide/jsdav": "~0.4.0",
+        "@pylonide/treehugger": "~0.1.0",
         "@pylonide/vfs-architect": "~0.2.0",
         "@pylonide/vfs-nodefs-adapter": "~0.4.0",
         "ace": "https://github.com/ajaxorg/ace/tarball/v1.4.12",
         "smith": "https://github.com/pylonide/smith/tarball/4d0f096553a47160330f5dd9bac8bf77cc27e8ab",
         "architect-build": "https://github.com/pylonide/architect-build/tarball/299d7cf718c9a66192faf18cf85680b98ee3ac86",
-        "v8debug": "https://github.com/pylonide/lib-v8debug/tarball/863c0ce1e39a4f100457d306e1d2cc2b0283fa2a",
-        "treehugger": "https://github.com/pylonide/treehugger/tarball/65876760a809d93f627d5f9834c8bfc56f142a7e"
+        "v8debug": "https://github.com/pylonide/lib-v8debug/tarball/863c0ce1e39a4f100457d306e1d2cc2b0283fa2a"
     },
     "devDependencies": {
         "nodeunit": "~0.11.2",
diff --git a/plugins-client/lib.treehugger/treehugger-lib.js b/plugins-client/lib.treehugger/treehugger-lib.js
index 45f0af8f6..a967f4291 100644
--- a/plugins-client/lib.treehugger/treehugger-lib.js
+++ b/plugins-client/lib.treehugger/treehugger-lib.js
@@ -1,5 +1,5 @@
 module.exports = function setup(options, imports, register) {
-    var base = require.resolve("treehugger/package.json").slice(0, -13);
+    var base = require.resolve("@pylonide/treehugger/package.json").slice(0, -13);
     imports.static.addStatics([{
         path: base + "/lib",
         mount: "/treehugger/lib",