summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn2
l---------js/node_modules1
-rwxr-xr-xjs/run_node.py5
l---------node_modules1
-rw-r--r--package.json (renamed from js/package.json)0
l---------third_party/package.json2
-rw-r--r--yarn.lock (renamed from third_party/yarn.lock)0
7 files changed, 6 insertions, 5 deletions
diff --git a/BUILD.gn b/BUILD.gn
index f1c431743..e67753b72 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -101,7 +101,7 @@ run_node("bundle") {
sources = [
"js/main.ts",
"js/msg_generated.ts",
- "js/package.json", # The `browserslist` field controls Babel behavior.
+ "package.json", # The `browserslist` field controls Babel behavior.
]
outputs = [
out_dir + "main.js",
diff --git a/js/node_modules b/js/node_modules
deleted file mode 120000
index c46f1f34b..000000000
--- a/js/node_modules
+++ /dev/null
@@ -1 +0,0 @@
-../third_party/node_modules \ No newline at end of file
diff --git a/js/run_node.py b/js/run_node.py
index 506f2be4c..154c2167b 100755
--- a/js/run_node.py
+++ b/js/run_node.py
@@ -26,8 +26,9 @@ def symlink(target, name, target_is_dir=False):
os.symlink(target, name)
-js_path = os.path.dirname(os.path.realpath(__file__))
-target_abs = os.path.join(js_path, "node_modules")
+root_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+third_party_path = os.path.join(root_path, "third_party")
+target_abs = os.path.join(third_party_path, "node_modules")
target_rel = os.path.relpath(target_abs)
if not os.path.exists("node_modules"):
diff --git a/node_modules b/node_modules
new file mode 120000
index 000000000..25d92e47e
--- /dev/null
+++ b/node_modules
@@ -0,0 +1 @@
+third_party/node_modules \ No newline at end of file
diff --git a/js/package.json b/package.json
index e93ab1f1b..e93ab1f1b 100644
--- a/js/package.json
+++ b/package.json
diff --git a/third_party/package.json b/third_party/package.json
index 581e2de97..4e26811d4 120000
--- a/third_party/package.json
+++ b/third_party/package.json
@@ -1 +1 @@
-../js/package.json \ No newline at end of file
+../package.json \ No newline at end of file
diff --git a/third_party/yarn.lock b/yarn.lock
index 9778aa3c8..9778aa3c8 100644
--- a/third_party/yarn.lock
+++ b/yarn.lock