Merge branch 'rel/2.0.0-preview2-templates' into dev

2017-06-26 15:50:46 +01:00 · 2017-06-26 15:50:46 +01:00 · 95c81729cd
parent 3da87dd3d3 8352ec7626
commit 95c81729cd
8 changed files with 15619 additions and 2 deletions
--- a/templates/AngularSpa/npm-shrinkwrap.json
+++ b/templates/AngularSpa/npm-shrinkwrap.json
--- a/templates/AureliaSpa/npm-shrinkwrap.json
+++ b/templates/AureliaSpa/npm-shrinkwrap.json
--- a/templates/KnockoutSpa/npm-shrinkwrap.json
+++ b/templates/KnockoutSpa/npm-shrinkwrap.json
--- a/templates/ReactReduxSpa/npm-shrinkwrap.json
+++ b/templates/ReactReduxSpa/npm-shrinkwrap.json
--- a/templates/ReactReduxSpa/package.json
+++ b/templates/ReactReduxSpa/package.json
@ -7,13 +7,14 @@
    "@types/react": "15.0.29",
    "@types/react-dom": "15.5.0",
    "@types/react-redux": "4.4.40",
+    "@types/react-router": "4.0.11",
    "@types/react-router-dom": "4.0.4",
    "@types/react-router-redux": "5.0.1",
    "@types/webpack": "2.2.15",
    "@types/webpack-env": "1.13.0",
    "aspnet-prerendering": "^2.0.5",
    "aspnet-webpack": "^1.0.29",
-    "aspnet-webpack-react": "^2.0.0",
+    "aspnet-webpack-react": "^3.0.0-beta",
    "awesome-typescript-loader": "3.1.3",
    "bootstrap": "3.3.7",
    "css-loader": "0.28.1",
--- a/templates/ReactSpa/npm-shrinkwrap.json
+++ b/templates/ReactSpa/npm-shrinkwrap.json
--- a/templates/ReactSpa/package.json
+++ b/templates/ReactSpa/package.json
@ -9,7 +9,7 @@
    "@types/react-router": "4.0.9",
    "@types/webpack-env": "1.13.0",
    "aspnet-webpack": "^1.0.29",
-    "aspnet-webpack-react": "^2.0.0",
+    "aspnet-webpack-react": "^3.0.0-beta",
    "awesome-typescript-loader": "3.1.3",
    "bootstrap": "3.3.7",
    "css-loader": "0.28.1",
--- a/templates/VueSpa/npm-shrinkwrap.json
+++ b/templates/VueSpa/npm-shrinkwrap.json