Update templates for Yarn compatibility

SteveSandersonMS · SteveSandersonMS · commit 54f222e88fb2 · 2016-10-28T17:36:55.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,5 @@ npm-debug.log
 /templates/*/node_modules/
 /templates/*/wwwroot/dist/
 /templates/*/ClientApp/dist/
+/templates/*/yarn.lock
 .vscode/
diff --git a/templates/Angular2Spa/template_gitignore b/templates/Angular2Spa/template_gitignore
@@ -196,6 +196,8 @@ orleans.codegen.cs
 /node_modules/**
 !/node_modules/_placeholder.txt
 
+/yarn.lock
+
 # RIA/Silverlight projects
 Generated_Code/
 
diff --git a/templates/AureliaSpa/template_gitignore b/templates/AureliaSpa/template_gitignore
@@ -35,6 +35,7 @@ Obj/
 !/wwwroot/dist/_placeholder.txt
 !/ClientApp/dist/_placeholder.txt
 
+/yarn.lock
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts b/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts
@@ -1,4 +1,5 @@
 import * as ko from 'knockout';
+import * as History from 'history';
 import { Route, Router } from '../../router';
 import navMenu from '../nav-menu/nav-menu';
 
diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/KnockoutSpa/ClientApp/router.ts
@@ -1,5 +1,6 @@
 import * as ko from 'knockout';
 import * as $ from 'jquery';
+import * as History from 'history';
 import crossroads = require('crossroads');
 
 // This module configures crossroads.js, a routing library. If you prefer, you
diff --git a/templates/KnockoutSpa/template_gitignore b/templates/KnockoutSpa/template_gitignore
@@ -33,6 +33,8 @@ Obj/
 # Workaround for https://github.com/aspnet/JavaScriptServices/issues/235
 !/wwwroot/dist/_placeholder.txt
 
+/yarn.lock
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/ReactReduxSpa/template_gitignore
@@ -35,6 +35,7 @@ Obj/
 !/wwwroot/dist/_placeholder.txt
 !/ClientApp/dist/_placeholder.txt
 
+/yarn.lock
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/ReactReduxSpa/tsconfig.json
@@ -1,13 +1,18 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
     "moduleResolution": "node",
     "target": "es6",
     "jsx": "preserve",
     "experimentalDecorators": true,
     "sourceMap": true,
     "skipDefaultLibCheck": true,
     "lib": ["es6", "dom"],
-    "types": [ "webpack-env", "whatwg-fetch" ]
+    "types": [ "webpack-env", "whatwg-fetch" ],
+    "paths": {
+      // Fixes "Duplicate identifier 'Redux'" error when packages were installed via Yarn (by specifying which .d.ts file is authoritative)
+      "redux": ["./node_modules/@types/redux/index"]
+    }
   },
   "exclude": [
       "bin",
diff --git a/templates/ReactSpa/template_gitignore b/templates/ReactSpa/template_gitignore
@@ -33,6 +33,8 @@ Obj/
 # Workaround for https://github.com/aspnet/JavaScriptServices/issues/235
 !/wwwroot/dist/_placeholder.txt
 
+/yarn.lock
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
diff --git a/templates/WebApplicationBasic/template_gitignore b/templates/WebApplicationBasic/template_gitignore
@@ -30,6 +30,8 @@ Obj/
 .vs/
 /wwwroot/dist/
 
+/yarn.lock
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
diff --git a/templates/package-builder/src/yeoman/package.json b/templates/package-builder/src/yeoman/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-aspnetcore-spa",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Single-Page App templates for ASP.NET Core",
   "author": "Microsoft",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import * as ko from 'knockout';`
	`2`	`+import * as History from 'history';`
`2`	`3`	`import { Route, Router } from '../../router';`
`3`	`4`	`import navMenu from '../nav-menu/nav-menu';`
`4`	`5`