fix(bazel): Extend ngrx and angular schematics (#401)

Workspace names can now be anything where before it was hardcoded to be "proj"
nrwl · Apr 5, 2018 · 0c2b01b · 0c2b01b
1 parent bc55957
commit 0c2b01b
Show file tree

Hide file tree

Showing 4 changed files with 722 additions and 7 deletions.
diff --git a/packages/bazel/src/collection.json b/packages/bazel/src/collection.json
@@ -1,6 +1,7 @@
 {
   "name": "nx-bazel",
   "version": "0.1",
+  "extends": "@ngrx/schematics",
   "schematics": {
     "application": {
       "factory": "./collection/application",
@@ -18,12 +19,10 @@
       "description": "Create a library"
     },
     "module": {
-      "aliases": [
-        "m"
-      ],
+      "aliases": ["m"],
       "factory": "./collection/module",
       "schema": "./collection/module/schema.json",
       "description": "Create a Module"
     }
   }
-}
+}
diff --git a/packages/bazel/src/collection/app/files/apps/__fullName__/__sourceDir__/BUILD.bazel b/packages/bazel/src/collection/app/files/apps/__fullName__/__sourceDir__/BUILD.bazel
@@ -31,7 +31,7 @@ STATIC_FILES = [
 ts_devserver(
     name = "devserver",
     data = ["//apps/<%= fullName %>/src/assets"],
-    entry_module = "proj/apps/<%= fullName %>/src/main",
+    entry_module = "<%= workspaceName %>/apps/<%= fullName %>/src/main",
     scripts = ["//:angular_bundles"],
     serving_path = "/bundle.min.js",
     static_files = STATIC_FILES,
@@ -42,7 +42,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "nodejs_binary")
 
 rollup_bundle(
     name = "bundle",
-    entry_point = "proj/apps/<%= fullName %>/src/main",
+    entry_point = "<%= workspaceName %>/apps/<%= fullName %>/src/main",
     deps = [":<%= sourceDir %>"],
 )
 

diff --git a/packages/bazel/src/collection/app/index.ts b/packages/bazel/src/collection/app/index.ts
@@ -29,6 +29,7 @@ import { wrapIntoFormat } from '../../utils/tasks';
 interface NormalizedSchema extends Schema {
   fullName: string;
   fullPath: string;
+  workspaceName: string;
 }
 
 function addBootstrap(path: string): Rule {
@@ -294,5 +295,13 @@ function normalizeOptions(options: Schema): NormalizedSchema {
     ? `${toFileName(options.directory)}/${name}`
     : name;
   const fullPath = `apps/${fullName}/src`;
-  return { ...options, sourceDir: 'src', name, fullName, fullPath };
+  const workspaceName = readCliConfigFile().project.name;
+  return {
+    ...options,
+    sourceDir: 'src',
+    name,
+    fullName,
+    fullPath,
+    workspaceName
+  };
 }