@@ -5,9 +5,13 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 licenses(["notice"])  # MIT License
 
+
+# @angular-devkit/core
+
 ts_library(
     name = "core",
     srcs = glob(
@@ -20,7 +24,7 @@ ts_library(
     ),
     data = glob(["**/*.json"]),
     module_name = "@angular-devkit/core",
-    module_root = "src",
+    module_root = "src/index.d.ts",
     deps = [
         "@rxjs",
         "@rxjs//operators",
@@ -33,32 +37,72 @@ ts_library(
     ],
 )
 
+ts_library(
+    name = "core_test_lib",
+    srcs = glob(
+        include = [
+            "src/**/*_spec.ts",
+            "src/**/*_spec_large.ts",
+        ],
+        exclude = [
+            # The workspace spec expects workspace.json to be there, but it's not.
+            # TODO(@filipesilva): figure out how to resolve these in bazel.
+            "src/workspace/workspace_spec.ts",
+        ],
+    ),
+    data = [
+        "src/workspace/workspace-schema.json"    
+    ],
+    deps = [
+        ":core",
+        ":node",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: jasmine
+        # @typings: node
+    ],
+)
+
+jasmine_node_test(
+    name = "core_test",
+    srcs = [":core_test_lib"],
+)
+
+
+# @angular-devkit/core/node
+
 ts_library(
     name = "node",
     srcs = glob(
         include = ["node/**/*.ts"],
         exclude = [
+            "node/testing/**/*.ts",
             "node/**/*_spec.ts",
             "node/**/*_spec_large.ts",
-            "tools/**/*_benchmark.ts",
+            "node/**/*_benchmark.ts",
         ],
     ),
     module_name = "@angular-devkit/core/node",
-    module_root = "node",
+    module_root = "node/index.d.ts",
     deps = [
-        "//packages/angular_devkit/core",
+        ":core",
         "@rxjs",
         "@rxjs//operators",
         # @typings: node
     ],
 )
 
 ts_library(
-    name = "spec",
+    name = "node_test_lib",
     srcs = glob(
         include = [
-            "**/*_spec.ts",
-            "**/*_spec_large.ts",
+            "node/**/*_spec.ts",
+            "node/**/*_spec_large.ts",
+        ],
+        exclude = [
+            # The node resolve spec uses the _devKitRoot global, which isn't available in Bazel.
+            # TODO(@filipesilva): figure out an alternative to that global.
+            "node/resolve_spec.ts",
         ],
     ),
     deps = [
@@ -70,3 +114,32 @@ ts_library(
         # @typings: node
     ],
 )
+
+jasmine_node_test(
+    name = "node_test",
+    srcs = [":node_test_lib"],
+)
+
+
+# @angular-devkit/core/node/testing
+
+ts_library(
+    name = "node_testing",
+    srcs = glob(
+        include = ["node/testing/**/*.ts"],
+        exclude = [
+            "node/testing/**/*_spec.ts",
+            "node/testing/**/*_spec_large.ts",
+            "node/testing/**/*_benchmark.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/core/node/testing",
+    module_root = "node/testing/index.d.ts",
+    deps = [
+        ":core",
+        ":node",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: node
+    ],
+)