fix(@angular/cli): improve matching range to match beta/rc (#4989)

angular · Feb 24, 2017 · d2d788b · d2d788b
1 parent 554e7f9
commit d2d788b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -41,10 +41,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular/compiler": "^2.3.1",
-    "@angular/compiler-cli": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/tsc-wrapped": "^0.5.0",
+    "@angular/compiler": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/compiler-cli": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/core": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/tsc-wrapped": ">=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0",
     "autoprefixer": "^6.5.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",

diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
@@ -27,10 +27,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular/compiler": ">=2.3.1 <5.0.0",
-    "@angular/compiler-cli": ">=2.3.1 <5.0.0",
-    "@angular/core": ">=2.3.1 <5.0.0",
-    "@angular/tsc-wrapped": ">=0.5.0 <5.0.0",
+    "@angular/compiler": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/compiler-cli": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/core": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
+    "@angular/tsc-wrapped": ">=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0",
     "@ngtools/json-schema": "1.0.3",
     "@ngtools/webpack": "1.2.10",
     "autoprefixer": "^6.5.3",

diff --git a/packages/@angular/cli/utilities/validate-project-name.ts b/packages/@angular/cli/utilities/validate-project-name.ts
@@ -2,7 +2,7 @@ import {oneLine, stripIndent} from 'common-tags';
 
 const SilentError = require('silent-error');
 
-const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[a-zA-Z][.0-9a-zA-Z]*)*$/;
+const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
 const unsupportedProjectNames = ['test', 'ember', 'ember-cli', 'vendor', 'app'];
 
 function getRegExpFailPosition(str: string): number | null {