Merge pull request #140 from angular/master

Update upstream

Author: GulajavaMinistudio

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "6.0.0-rc.10",
+  "version": "6.0.0",
   "description": "CLI tool for Angular",
   "main": "packages/@angular/cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "6.0.0-rc.10",
+  "version": "6.0.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -30,11 +30,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.5.13",
-    "@angular-devkit/core": "0.5.13",
-    "@angular-devkit/schematics": "0.5.13",
-    "@schematics/angular": "0.5.13",
-    "@schematics/update": "0.5.13",
+    "@angular-devkit/architect": "0.6.0",
+    "@angular-devkit/core": "0.6.0",
+    "@angular-devkit/schematics": "0.6.0",
+    "@schematics/angular": "0.6.0",
+    "@schematics/update": "0.6.0",
     "opn": "~5.1.0",
     "resolve": "^1.1.7",
     "rxjs": "^6.0.0",

packages/@angular/cli/package.json

@@ -37,7 +37,7 @@ function readFiles(directory, filelist) {
       const originalPath = directory + file;
       const newPath = path.join(outputPath, originalPath
         .replace(documentationPath + `${path.sep}`, '')
-        .replace(`${path.sep}`, '-'));
+        .replace(new RegExp(`${path.sep}`, 'g'), '-'));
 
       filelist.push({ originalPath, newPath });
     }