Skip to content

Commit d2d788b

Browse files
authored
fix(@angular/cli): improve matching range to match beta/rc (angular#4989)
1 parent 554e7f9 commit d2d788b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
},
4242
"homepage": "https://github.com/angular/angular-cli",
4343
"dependencies": {
44-
"@angular/compiler": "^2.3.1",
45-
"@angular/compiler-cli": "^2.3.1",
46-
"@angular/core": "^2.3.1",
47-
"@angular/tsc-wrapped": "^0.5.0",
44+
"@angular/compiler": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
45+
"@angular/compiler-cli": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
46+
"@angular/core": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
47+
"@angular/tsc-wrapped": ">=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0",
4848
"autoprefixer": "^6.5.3",
4949
"chalk": "^1.1.3",
5050
"common-tags": "^1.3.1",

packages/@angular/cli/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
},
2828
"homepage": "https://github.com/angular/angular-cli",
2929
"dependencies": {
30-
"@angular/compiler": ">=2.3.1 <5.0.0",
31-
"@angular/compiler-cli": ">=2.3.1 <5.0.0",
32-
"@angular/core": ">=2.3.1 <5.0.0",
33-
"@angular/tsc-wrapped": ">=0.5.0 <5.0.0",
30+
"@angular/compiler": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
31+
"@angular/compiler-cli": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
32+
"@angular/core": ">=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0",
33+
"@angular/tsc-wrapped": ">=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0",
3434
"@ngtools/json-schema": "1.0.3",
3535
"@ngtools/webpack": "1.2.10",
3636
"autoprefixer": "^6.5.3",

packages/@angular/cli/utilities/validate-project-name.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {oneLine, stripIndent} from 'common-tags';
22

33
const SilentError = require('silent-error');
44

5-
const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[a-zA-Z][.0-9a-zA-Z]*)*$/;
5+
const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
66
const unsupportedProjectNames = ['test', 'ember', 'ember-cli', 'vendor', 'app'];
77

88
function getRegExpFailPosition(str: string): number | null {

0 commit comments

Comments
 (0)