Permalink
Browse files

Update templates for Yarn compatibility

  • Loading branch information...
1 parent 6259b7b commit 54f222e88fb21dba2fad696647f604e66930a22b @SteveSandersonMS SteveSandersonMS committed Oct 28, 2016
View
@@ -37,4 +37,5 @@ npm-debug.log
/templates/*/node_modules/
/templates/*/wwwroot/dist/
/templates/*/ClientApp/dist/
+/templates/*/yarn.lock
.vscode/
@@ -196,6 +196,8 @@ orleans.codegen.cs
/node_modules/**
!/node_modules/_placeholder.txt
+/yarn.lock
+
# RIA/Silverlight projects
Generated_Code/
@@ -35,6 +35,7 @@ Obj/
!/wwwroot/dist/_placeholder.txt
!/ClientApp/dist/_placeholder.txt
+/yarn.lock
# MSTest test Results
[Tt]est[Rr]esult*/
@@ -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';
@@ -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
@@ -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.*
@@ -35,6 +35,7 @@ Obj/
!/wwwroot/dist/_placeholder.txt
!/ClientApp/dist/_placeholder.txt
+/yarn.lock
# MSTest test Results
[Tt]est[Rr]esult*/
@@ -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",
@@ -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.*
@@ -30,6 +30,8 @@ Obj/
.vs/
/wwwroot/dist/
+/yarn.lock
+
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
@@ -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",

0 comments on commit 54f222e

Please sign in to comment.