feat(bazel): Add correct dependencies to package.json (#405)

* feat(bazel): Add correct dependencies to package.json Only allow valid Bazel workspace names to avoid confusion
nrwl · Apr 6, 2018 · eca5259 · eca5259
1 parent 871129e
commit eca5259
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
@@ -9,7 +9,10 @@
   "license": "MIT",
   "schematics": "./src/collection.json",
   "dependencies": {
+    "@ngrx/schematics": "5.2.0",
+    "@schematics/angular": "0.4.6",
     "app-root-path": "^2.0.1",
+    "npm-run-all": "4.1.2",
     "semver": "5.4.1",
     "tmp": "0.0.33",
     "yargs-parser": "9.0.2"

diff --git a/packages/bazel/src/collection/application/index.ts b/packages/bazel/src/collection/application/index.ts
@@ -18,6 +18,13 @@ import {
 import { libVersions } from '../../lib-versions';
 
 export default function(options: Schema): Rule {
+  if (!/^\w+$/.test(options.name)) {
+    throw new Error(
+      `${options.name} is invalid for a bazel workspace.\n` +
+        'Your workspace name must contain only alphanumeric characters and underscores.'
+    );
+  }
+
   return (host: Tree, context: SchematicContext) => {
     addTasks(options, context);
     const npmScope = options.npmScope ? options.npmScope : options.name;

diff --git a/packages/schematics/bin/create-nx-workspace.ts b/packages/schematics/bin/create-nx-workspace.ts
@@ -64,6 +64,16 @@ if (!useYarn) {
 
 const projectName = parsedArgs._[2];
 
+if (parsedArgs.bazel) {
+  if (!/^\w+$/.test(projectName)) {
+    console.error(
+      `${projectName} is invalid for a bazel workspace.\n` +
+        'Your workspace name must contain only alphanumeric characters and underscores.'
+    );
+    process.exit(1);
+  }
+}
+
 // check that the workspace name is passed in
 if (!projectName) {
   console.error(