update to jhipster-core 1.3.1

jhipster · May 14, 2017 · 9e92792 · 9e92792
1 parent 9e79cd9
commit 9e92792
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/dist/js/main-cecaa7f875.js → dist/js/main-a4ae578bfe.js b/dist/js/main-cecaa7f875.js → dist/js/main-a4ae578bfe.js
diff --git a/dist/js/main-a4ae578bfe.js.map b/dist/js/main-a4ae578bfe.js.map
diff --git a/dist/js/main-cecaa7f875.js.map b/dist/js/main-cecaa7f875.js.map
diff --git a/index.html b/index.html
@@ -99,7 +99,7 @@ <h1>Import JDL</h1>
 	// temp hack to use jdl parser from jhipster-core
 	var module = module || {};
 	</script>
-	<script src="dist/js/main-cecaa7f875.js"></script>
+	<script src="dist/js/main-a4ae578bfe.js"></script>
 	<script>
 		(function (i, s, o, g, r, a, m) {
 			i['GoogleAnalyticsObject'] = r;

diff --git a/js/codemirror/codemirror.jdl-mode.js b/js/codemirror/codemirror.jdl-mode.js
@@ -8,7 +8,7 @@
     dtoKws = ['mapstruct'],
     serviceKws = ['serviceClass', 'serviceImpl'],
     searchKws = ['ElasticSearch'],
-    typeKws = ['String', 'Integer', 'Long', 'BigDecimal', 'Float', 'Double', 'Boolean', 'LocalDate', 'ZonedDateTime', 'Blob', 'AnyBlob', 'ImageBlob'];
+    typeKws = ['String', 'Integer', 'Long', 'BigDecimal', 'Float', 'Double', 'Boolean', 'LocalDate', 'ZonedDateTime', 'Instant', 'Blob', 'AnyBlob', 'ImageBlob'];
 
     CodeMirror.defineMode('jdl', function() {
         var words = {};

diff --git a/yarn.lock b/yarn.lock
@@ -2506,15 +2506,15 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
-lodash@4.10.0:
+lodash@4.10.0, lodash@^4.2.0:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.10.0.tgz#3d8f3ac7a5a904fdb01e2cfe1401879bf9652c6a"
 
 lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.14.0, lodash@^4.2.0:
+lodash@^4.14.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"