Custom resolvers (#48)

fwouts · Mar 28, 2019 · 8133bf9 · 8133bf9
1 parent fc5dbe5
commit 8133bf9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/internal/js_script_and_test/compile.js b/internal/js_script_and_test/compile.js
@@ -47,6 +47,7 @@ export NODE_PATH=${path.relative(
     destinationDirShort,
     installedNpmPackagesDirShort
   )}/node_modules
+export GENDIR=${process.env.GENDIR}
 export LIB_DIR=${path.dirname(libBuildfilePath)}
 ${yarnShellCommand(destinationDirShort, "start")}
 `,

diff --git a/internal/js_script_and_test/rule.bzl b/internal/js_script_and_test/rule.bzl
@@ -30,6 +30,7 @@ def _js_script_impl(ctx):
         executable = ctx.file._internal_nodejs,
         env = {
             "NODE_PATH": ctx.attr._internal_packages[NpmPackagesInfo].installed_dir.path + "/node_modules",
+            "GENDIR": ctx.var["GENDIR"],
         },
         arguments = [
             # Run `node js_script/compile.js`.

diff --git a/internal/web_bundle/create_webpack_config.js b/internal/web_bundle/create_webpack_config.js
@@ -11,9 +11,23 @@ const [
   optionalLibrary,
   splitChunksStr,
   publicPath,
-  webpackConfigPath
+  webpackConfigPath,
+  joinedExternals
 ] = process.argv;
 
+const externals = joinedExternals
+  .split("|")
+  .map(extTuple => extTuple.split(":", 2))
+  .reduce((exts, [k, v]) => {
+    if (k == "") {
+      return exts;
+    }
+
+    exts.push(`"${k}": "${v}"`);
+    return exts;
+  }, [])
+  .join(",");
+
 const [libraryName, libraryTarget] = optionalLibrary.split("/");
 const splitChunks = splitChunksStr === "1";
 
@@ -52,6 +66,9 @@ module.exports = (
   const OptimizeCSSAssetsPlugin = require(path.resolve(\`\${loadersNpmPackagesDir}/node_modules/optimize-css-assets-webpack-plugin\`));
   const UglifyJsPlugin = require(path.resolve(\`\${loadersNpmPackagesDir}/node_modules/uglifyjs-webpack-plugin\`));
 
+  const base = path.join(process.cwd(), sourceDir)
+  const gendir = path.join(base, process.env["GENDIR"], '..', 'bin')
+
   return {
     entry: (sourceDir.startsWith("/") ? "" : "./") + path.join(
       sourceDir,
@@ -70,6 +87,7 @@ module.exports = (
           : ""
       }
     },
+    externals: {${externals}},
     mode: "${mode}",
     bail: ${mode === "production" ? "true" : "false"},
     target: "web",
@@ -211,7 +229,9 @@ module.exports = (
       modules: [
         path.join(installedNpmPackagesDir, "node_modules"),
         // Necessary for webpack-hot-client with the dev server.
-        path.join(loadersNpmPackagesDir, "node_modules")
+        path.join(loadersNpmPackagesDir, "node_modules"),
+        base,
+        gendir,
       ]
     },
     resolveLoader: {

diff --git a/internal/web_bundle/rule.bzl b/internal/web_bundle/rule.bzl
@@ -23,6 +23,7 @@ def _web_bundle_impl(ctx):
         executable = ctx.file._internal_nodejs,
         env = {
             "NODE_PATH": ctx.attr._internal_packages[NpmPackagesInfo].installed_dir.path + "/node_modules",
+            "GENDIR": ctx.var["GENDIR"],
         },
         arguments = [
             # Run `node web_bundle/compile.js`.
@@ -207,6 +208,9 @@ def _strip_buildfile(path):
 def _create_webpack_config(ctx):
     webpack_config = ctx.actions.declare_file(ctx.label.name + ".webpack.config.js")
 
+    mode_arg = ctx.attr.mode
+    mode_arg = ctx.expand_make_variables("mode", mode_arg, {})
+
     # Create the Webpack config file.
     ctx.actions.run(
         inputs = [
@@ -221,6 +225,7 @@ def _create_webpack_config(ctx):
         executable = ctx.file._internal_nodejs,
         env = {
             "NODE_PATH": ctx.attr._internal_packages[NpmPackagesInfo].installed_dir.path + "/node_modules",
+            "GENDIR": ctx.var["GENDIR"],
         },
         arguments = [
             # Run `node web_bundle/create_webpack_config.js`.
@@ -232,7 +237,7 @@ def _create_webpack_config(ctx):
             # Output file name (e.g. "bundle.js").
             ctx.attr.output,
             # Mode for Webpack.
-            ctx.attr.mode,
+            mode_arg,
             # Library for Webpack (optional).
             ctx.attr.library_name + "/" + ctx.attr.library_target if ctx.attr.library_name else "",
             # Enable split chunks or not.
@@ -241,6 +246,11 @@ def _create_webpack_config(ctx):
             ctx.attr.public_path,
             # Path where to create the Webpack config.
             webpack_config.path,
+            # Externals definitions
+            ("|".join([
+                key + ":" + value
+                for key, value in ctx.attr.externals.items()
+            ])),
         ],
     )
 
@@ -256,18 +266,14 @@ _ATTRS = {
         providers = [JsModuleInfo],
     ),
     "env": attr.string_dict(),
+    "externals": attr.string_dict(),
     "entry": attr.string(
         mandatory = True,
     ),
     "output": attr.string(
         default = "bundle.js",
     ),
     "mode": attr.string(
-        values = [
-            "none",
-            "development",
-            "production",
-        ],
         default = "none",
     ),
     "split_chunks": attr.bool(