From 4b662282eaa61a5afc473ab645b892c02a3a08b4 Mon Sep 17 00:00:00 2001 From: Hans Larsen Date: Fri, 24 Feb 2017 11:29:53 -0800 Subject: [PATCH] fix(@angular/cli): improve matching range to match beta/rc --- package.json | 8 ++++---- packages/@angular/cli/package.json | 8 ++++---- packages/@angular/cli/utilities/validate-project-name.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index a63b50e9a6dc..86215d57ea73 100644 --- 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 index 5b075bf7b18c..d500379c329a 100644 --- 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 index 6c56fe2640d5..df7a0ef6e7cb 100644 --- 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 {