Merge pull request #376 from filiph/master

Support WebStorm project names with hyphens
dart-archive · Mar 11, 2017 · 300bc05 · 300bc05
2 parents 1f80177 + 84d42a4
commit 300bc05
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/generators/web_angular_data.dart b/lib/generators/web_angular_data.dart
@@ -134,7 +134,7 @@ biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
 ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
 YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
 ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
-W19cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
+Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
 OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
 ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5fX3Byb2pl
 Y3ROYW1lX188L3RpdGxlPgogICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgogICAgPG1ldGEgbmFt

diff --git a/lib/generators/web_angular_simple_data.dart b/lib/generators/web_angular_simple_data.dart
@@ -83,7 +83,7 @@ biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
 ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
 YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
 ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
-W19cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
+Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
 OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
 ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5IZWxsbyBB
 bmd1bGFyPC90aXRsZT4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgIDxtZXRhIG5hbWU9

diff --git a/templates/web-angular-simple/web/index.html b/templates/web-angular-simple/web/index.html
@@ -6,7 +6,7 @@
         // Details: https://webdev.dartlang.org/angular/guide/router
         (function () {
             // App being served out of web folder (like WebStorm does)?
-            var match = document.location.pathname.match(/^\/[_\w]+\/web\//);
+            var match = document.location.pathname.match(/^\/[-\w]+\/web\//);
             var href = match ? match[0] : '/';
             document.write('<base href="' + href + '" />');
         }());

diff --git a/templates/web-angular/web/index.html b/templates/web-angular/web/index.html
@@ -6,7 +6,7 @@
         // Details: https://webdev.dartlang.org/angular/guide/router
         (function () {
             // App being served out of web folder (like WebStorm does)?
-            var match = document.location.pathname.match(/^\/[_\w]+\/web\//);
+            var match = document.location.pathname.match(/^\/[-\w]+\/web\//);
             var href = match ? match[0] : '/';
             document.write('<base href="' + href + '" />');
         }());