From 6c09c9422ee88632c98d0499008c5432cf31b800 Mon Sep 17 00:00:00 2001 From: Alfonso Garcia-Caro Date: Fri, 16 Nov 2018 11:50:49 +0100 Subject: [PATCH] Pin minor version of fable-compiler-dotnet --- .gitattributes | 12 +++++++++--- src/js/fable-loader/package.json | 2 +- src/js/fable-splitter/package.json | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1ff0c42304..1d73f5a108 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,9 @@ +**/package-lock.json -diff +**/yarn.lock -diff +**/paket.lock -diff +.paket/** -diff +.vscode/** -diff + ############################################################################### # Set default behavior to automatically normalize line endings. ############################################################################### @@ -17,7 +23,7 @@ # # Merging from the command prompt will add diff markers to the files if there # are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following +# the diff markers are never inserted). Diff markers may cause the following # file extensions to fail to load in VS. An alternative would be to treat # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below @@ -46,9 +52,9 @@ ############################################################################### # diff behavior for common document formats -# +# # Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the +# is only available from the command line. Turn it on by uncommenting the # entries below. ############################################################################### #*.doc diff=astextplain diff --git a/src/js/fable-loader/package.json b/src/js/fable-loader/package.json index e1e619d0c4..494ba9b393 100644 --- a/src/js/fable-loader/package.json +++ b/src/js/fable-loader/package.json @@ -24,6 +24,6 @@ }, "dependencies": { "@types/babel__core": "^7.0.1", - "fable-compiler-dotnet": "^2.1.0-alpha-002" + "fable-compiler-dotnet": "~2.1.0-alpha-002" } } diff --git a/src/js/fable-splitter/package.json b/src/js/fable-splitter/package.json index bd4fcfafce..d2ed1c2bfb 100644 --- a/src/js/fable-splitter/package.json +++ b/src/js/fable-splitter/package.json @@ -32,7 +32,7 @@ "@babel/core": "^7.0.0", "@babel/plugin-transform-modules-commonjs": "^7.1.0", "chokidar": "^2.0.4", - "fable-compiler-dotnet": "^2.1.0-alpha-002", + "fable-compiler-dotnet": "~2.1.0-alpha-002", "fs-extra": "^7.0.0", "nodemon": "^1.18.6" },