Test with --all_incompatible_changes

Author: pcj

.travis.yml

@@ -11,8 +11,7 @@ os:
   - osx
 
 env:
-  - BAZEL=0.20.0
-  - BAZEL=0.24.0
+  - BAZEL=0.24.1
 
 before_install:
   - |

Makefile

@@ -1,29 +1,31 @@
+BAZEL_ARGS=--all_incompatible_changes --incompatible_disallow_struct_provider_syntax=false
+
 test_helloworld:
-	(cd tests/helloworld && bazel test //...)
+	(cd tests/helloworld && bazel test ${BAZEL_ARGS} //...)
 
 test_lyrics:
-	(cd tests/lyrics && bazel test //...)
+	(cd tests/lyrics && bazel test ${BAZEL_ARGS} //...)
 
 test_express:
-	(cd tests/express && bazel test //...)
+	(cd tests/express && bazel test ${BAZEL_ARGS} //...)
 
 test_namespace:
-	(cd tests/namespace && bazel test //...)
+	(cd tests/namespace && bazel test ${BAZEL_ARGS} //...)
 
 test_rollup:
-	(cd tests/rollup && bazel test //...)
+	(cd tests/rollup && bazel test ${BAZEL_ARGS} //...)
 
 test_typescript:
-	(cd tests/typescript && bazel test //...)
+	(cd tests/typescript && bazel test ${BAZEL_ARGS} //...)
 
 test_webpack:
-	(cd tests/webpack && bazel test //...)
+	(cd tests/webpack && bazel test ${BAZEL_ARGS} //...)
 
 test_polymer-cli:
 	(cd tests/polymer-cli && bazel test //...)
 
 test_mocha:
-	(cd tests/mocha && bazel test //...)
+	(cd tests/mocha && bazel test ${BAZEL_ARGS} //...)
 
 # polymer cli not included as it appears to still be a WIP
 test_all: test_helloworld test_lyrics test_express test_namespace test_typescript test_webpack test_mocha test_rollup

node/internal/mocha_test.bzl

@@ -1,3 +1,4 @@
+load("//node:internal/providers.bzl", "NodeModuleInfo")
 load("//node:internal/node_module.bzl", "node_module")
 load("//node:internal/node_modules.bzl", "node_modules")
 

node/internal/node_binary.bzl

@@ -1,3 +1,4 @@
+load("//node:internal/providers.bzl", "NodeModuleInfo", "NodeModulesInfo", "NodeBinaryInfo")
 load("//node:internal/node_modules.bzl", "node_modules")
 load("//node:internal/node_module.bzl", "node_module")
 load("//node:internal/node_bundle.bzl", "node_bundle")
@@ -15,7 +16,7 @@ def create_launcher(ctx, output_dir, node, manifest):
 
     """
 
-    entry_module = ctx.attr.entrypoint.node_module
+    entry_module = ctx.attr.entrypoint[NodeModuleInfo]
 
     # Entrypoint is a string that is used in the script for the node
     # main start point.  It can be the name of the module itself (in
@@ -94,44 +95,45 @@ def create_launcher(ctx, output_dir, node, manifest):
         ' '.join(cmd)
     ]
 
-    ctx.file_action(
+    ctx.actions.write(
         output = ctx.outputs.executable,
-        executable = True,
+        is_executable = True,
         content =  '\n'.join(lines),
     )
 
 
 def node_binary_impl(ctx):
     target_dir = ctx.attr.target
 
-    node = ctx.new_file('%s/%s' % (target_dir, ctx.executable._node.basename))
-    ctx.action(
+    node = ctx.actions.declare_file('%s/%s' % (target_dir, ctx.executable._node.basename))
+    ctx.actions.run_shell(
         mnemonic = 'CopyNode',
-        inputs = [ctx.executable._node],
+        tools = [ctx.executable._node],
         outputs = [node],
         command = 'cp %s %s' % (ctx.executable._node.path, node.path),
     )
 
-    files = ctx.attr.node_modules.node_modules.files
-    create_launcher(ctx, target_dir, node, ctx.attr.node_modules.node_modules.manifest)
+    node_modules = ctx.attr.node_modules[NodeModulesInfo]
+    files = node_modules.files
+    create_launcher(ctx, target_dir, node, node_modules.manifest)
 
     runfiles = [node, ctx.outputs.executable] + files
-        
-    return struct(
+
+    return [DefaultInfo(
         runfiles = ctx.runfiles(
             files = runfiles,
             collect_data = True,
         ),
-        node_binary = struct(
-            files = runfiles,
-            node = node,
-        )
-    )
+    ), NodeBinaryInfo(
+        files = runfiles,
+        node = node,
+    )]        
+
 
 binary_attrs = {
     # The main entrypoint module to run
     'entrypoint': attr.label(
-        providers = ['node_module'],
+        providers = [NodeModuleInfo],
         mandatory = False,
     ),
     # An optional named executable module script to run
@@ -143,7 +145,7 @@ binary_attrs = {
     # attribute.
     'node_modules': attr.label(
         mandatory = True,
-        providers = ['node_modules'],
+        providers = [NodeModulesInfo],
     ),
     # A namespace (string) within the package where assets are built.
     # This attribute value is also passed the node_modules such that
@@ -160,8 +162,7 @@ binary_attrs = {
     # The node executable
     '_node': attr.label(
         default = Label('@node//:node'),
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         executable = True,
         cfg = 'host',
     ),

node/internal/node_bundle.bzl

@@ -1,15 +1,17 @@
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("//node:internal/providers.bzl", "NodeBinaryInfo")
 
 def _node_bundle_impl(ctx):
-    return struct(
-        files = depset(ctx.attr.node_binary.node_binary.files),
-    )
+    return [DefaultInfo(
+        files = depset(ctx.attr.node_binary[NodeBinaryInfo].files),
+    )]
+
 
 _node_bundle = rule(
     _node_bundle_impl,
     attrs = {
         'node_binary': attr.label(
-            providers = ['node_binary'],
+            providers = [NodeBinaryInfo],
             mandatory = True,
         ),
     },

node/internal/node_module.bzl

@@ -1,5 +1,6 @@
-_node_filetype = [".js", ".node"]
+load("//node:internal/providers.bzl", "NodeModuleInfo")
 
+_node_filetype = [".js", ".node"]
 
 def _relname(ctx, root_file, file):
     """Get a path string relative to the root_file (usually the
@@ -31,7 +32,7 @@ def _get_package_dependencies(module_deps):
     """
     dependencies = {}
     for dep in module_deps:
-        module = dep.node_module
+        module = dep[NodeModuleInfo]
         dependencies[module.name] = module.version
     return struct(**dependencies)
 
@@ -50,7 +51,7 @@ def _get_module_name(ctx):
 
 
 def _create_package_json(ctx, name, files, executables):
-    output_file = ctx.new_file("%s/package.json" % name)
+    output_file = ctx.actions.declare_file("%s/package.json" % name)
 
     json = {
         "name": name,
@@ -77,7 +78,7 @@ def _create_package_json(ctx, name, files, executables):
 
     content = struct(**json)
 
-    ctx.file_action(
+    ctx.actions.write(
         output = output_file,
         content = content.to_json(),
     )
@@ -86,12 +87,14 @@ def _create_package_json(ctx, name, files, executables):
 
 
 def _get_transitive_modules(deps, key):
-    modules = depset()
+    allmodules = []
     for dep in deps:
-        module = dep.node_module
-        modules += [module]
-        modules += getattr(module, key, [])
-    return modules
+        module = dep[NodeModuleInfo]
+        allmodules.append(module)
+        if hasattr(module, key):
+            allmodules += getattr(module, key).to_list()
+        # allmodules += getattr(module, key, [])
+    return depset(allmodules)
 
 
 def _get_path_for_module_file(ctx, root_file, file, sourcemap):
@@ -114,7 +117,7 @@ def _get_path_for_module_file(ctx, root_file, file, sourcemap):
 
 
 def _copy_file(ctx, src, dst):
-    ctx.action(
+    ctx.actions.run_shell(
         mnemonic = "CopyFileToNodeModule",
         inputs = [src],
         outputs = [dst],
@@ -150,40 +153,33 @@ def _node_module_impl(ctx):
 
     index_file = None
     if ctx.file.index:
-        dst = ctx.new_file("%s/index.%s" % (name, ctx.file.index.extension))
+        dst = ctx.actions.declare_file("%s/index.%s" % (name, ctx.file.index.extension))
         outputs.append(_copy_file(ctx, ctx.file.index, dst))
         index_file = dst
 
     sourcemap = {}
     for src in files:
-        dst = ctx.new_file("%s/%s" % (name, _get_path_for_module_file(ctx, root_file, src, sourcemap)))
+        dst = ctx.actions.declare_file("%s/%s" % (name, _get_path_for_module_file(ctx, root_file, src, sourcemap)))
         outputs.append(_copy_file(ctx, src, dst))
 
     for src in ctx.files.data:
         filename = src.short_path
         dst = ctx.actions.declare_file(filename, sibling = root_file)
         outputs.append(_copy_file(ctx, src, dst))
 
-    return struct(
+    return [DefaultInfo(
         files = depset(outputs + ctx.files.data),
-        node_module = struct(
-            identifier = name.replace(ctx.attr.separator, '_'),
-            name = name,
-            version = ctx.attr.version,
-            url = ctx.attr.url,
-            sha1 = ctx.attr.sha1,
-            description = ctx.attr.description,
-            executables = executables,
-            package_json = package_json,
-            root = root_file,
-            sourcemap = sourcemap,
-            index = index_file,
-            files = depset(outputs),
-            sources = depset(files),
-            transitive_deps = _get_transitive_modules(ctx.attr.deps, "transitive_deps"),
-            transitive_dev_deps = _get_transitive_modules(ctx.attr.dev_deps, "transitive_dev_deps"),
-        ),
-    )
+    ), NodeModuleInfo(
+        identifier = name.replace(ctx.attr.separator, '_'),
+        name = name,
+        version = ctx.attr.version,
+        url = ctx.attr.url,
+        sha1 = ctx.attr.sha1,
+        executables = executables,
+        package_json = package_json,
+        files = depset(outputs),
+        transitive_deps = _get_transitive_modules(ctx.attr.deps, "transitive_deps"),
+    )]
 
 
 node_module = rule(
@@ -231,8 +227,8 @@ node_module = rule(
         # the module.  If not present, one will be generated UNLESS an
         # index file is provided.
         "package_json": attr.label(
-            allow_files = ["package.json"],
-            single_file = True,
+            # allow_files = ["package.json"],
+            allow_single_file = True,
         ),
 
         "data": attr.label_list(
@@ -242,12 +238,12 @@ node_module = rule(
 
         # Module dependencies.
         "deps": attr.label_list(
-            providers = ["node_module"],
+            providers = [NodeModuleInfo],
         ),
 
         # Development-only module dependencies.
         "dev_deps": attr.label_list(
-            providers = ["node_module"],
+            providers = [NodeModuleInfo],
         ),
 
         # 'Binary' scripts, to be named in the 'package_json.bin'
@@ -279,17 +275,16 @@ node_module = rule(
         # File that should be named as the package.json 'main'
         # attribute.
         "main": attr.label(
-            allow_files = True,
             mandatory = False,
-            single_file = True,
+            allow_single_file = True,
         ),
 
         # File that should be copied to the module root as 'index.js'.
         # If the index file is present and no 'main' is provided, a
         # package.json file will not be generated.
         "index": attr.label(
-            allow_files = _node_filetype,
-            single_file = True,
+            # allow_files = _node_filetype,
+            allow_single_file = True,
         ),
     },
 )