From f1ed253baa4c944fc9957c65416b031ec6c53ec0 Mon Sep 17 00:00:00 2001 From: Kevin Partington Date: Fri, 1 Mar 2019 20:09:56 -0600 Subject: [PATCH 1/2] Fix: Use path.join instead of path.resolve in webpack build --- Makefile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.js b/Makefile.js index c34b1c8f2f8..0a2b1506f31 100644 --- a/Makefile.js +++ b/Makefile.js @@ -795,7 +795,7 @@ target.gensite = function(prereleaseVersion) { }; target.webpack = function(mode = "none") { - exec(`${getBinFile("webpack")} --mode=${mode} --output-path=${path.resolve(__dirname, BUILD_DIR)}`); + exec(`${getBinFile("webpack")} --mode=${mode} --output-path=${path.join(__dirname, BUILD_DIR)}`); }; target.checkRuleFiles = function() { From c5e0901d26c38c6c7daa55075247ff596f06f037 Mon Sep 17 00:00:00 2001 From: Kevin Partington Date: Fri, 1 Mar 2019 20:14:45 -0600 Subject: [PATCH 2/2] Chore: Further tweaks to avoid absolute path --- Makefile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.js b/Makefile.js index 0a2b1506f31..00379638301 100644 --- a/Makefile.js +++ b/Makefile.js @@ -53,7 +53,7 @@ const NODE = "node ", // intentional extra space NODE_MODULES = "./node_modules/", TEMP_DIR = "./tmp/", DEBUG_DIR = "./debug/", - BUILD_DIR = "./build/", + BUILD_DIR = "build", DOCS_DIR = "../eslint.github.io/docs", SITE_DIR = "../eslint.github.io/", PERF_TMP_DIR = path.join(TEMP_DIR, "eslint", "performance"), @@ -795,7 +795,7 @@ target.gensite = function(prereleaseVersion) { }; target.webpack = function(mode = "none") { - exec(`${getBinFile("webpack")} --mode=${mode} --output-path=${path.join(__dirname, BUILD_DIR)}`); + exec(`${getBinFile("webpack")} --mode=${mode} --output-path=${BUILD_DIR}`); }; target.checkRuleFiles = function() {