From c37c9ee59b5e0d6a7efab4f177462b64ca795c61 Mon Sep 17 00:00:00 2001 From: josefermin <44840837+josefermin@users.noreply.github.com> Date: Tue, 23 Apr 2019 17:29:59 -0400 Subject: [PATCH 1/2] add GENDIR directory to custom resolvers --- internal/web_bundle/create_webpack_config.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/web_bundle/create_webpack_config.js b/internal/web_bundle/create_webpack_config.js index 7b4a914..7921622 100644 --- a/internal/web_bundle/create_webpack_config.js +++ b/internal/web_bundle/create_webpack_config.js @@ -68,6 +68,7 @@ module.exports = ( const base = path.join(process.cwd(), sourceDir) const gendir = path.join(base, process.env["GENDIR"], '..', 'bin') + const gendir2 = path.join(base, process.env["GENDIR"]) return { entry: (sourceDir.startsWith("/") ? "" : "./") + path.join( @@ -232,6 +233,7 @@ module.exports = ( path.join(loadersNpmPackagesDir, "node_modules"), base, gendir, + gendir2, ] }, resolveLoader: { From 1002a89b98ad0a8316a8598aa1a3d777054a1d09 Mon Sep 17 00:00:00 2001 From: josefermin <44840837+josefermin@users.noreply.github.com> Date: Mon, 29 Apr 2019 23:50:52 -0400 Subject: [PATCH 2/2] Fix devserver Currently devserver is not working becuase the env var GENDIR is not passed --- internal/web_bundle/rule.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/web_bundle/rule.bzl b/internal/web_bundle/rule.bzl index 6bb8f39..159088c 100644 --- a/internal/web_bundle/rule.bzl +++ b/internal/web_bundle/rule.bzl @@ -173,7 +173,7 @@ server.listen(port, 'localhost', function (err) {{ ctx.actions.write( output = ctx.outputs.devserver, is_executable = True, - content = "NODE_PATH=" + ctx.attr._internal_packages[NpmPackagesInfo].installed_dir.short_path + "/node_modules " + ctx.file._internal_nodejs.path + " " + webpack_devserver_js.short_path, + content = "GENDIR=" + ctx.var["GENDIR"] + " NODE_PATH=" + ctx.attr._internal_packages[NpmPackagesInfo].installed_dir.short_path + "/node_modules " + ctx.file._internal_nodejs.path + " " + webpack_devserver_js.short_path, ) return [