Update JS dependencies
Change-Id: I7c065b73fc350ecd9649cbb0ad9750658ecd380b
diff --git a/.gitignore b/.gitignore
index 400a37b..191ad49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,5 @@
t/kalamar_user_client.t
!.gitignore
npm-debug.log
-package-lock.json
\ No newline at end of file
+package-lock.json
+/kalamar.code-workspace
\ No newline at end of file
diff --git a/Changes b/Changes
index e075546..bb058d6 100755
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-0.37 2020-01-07
+0.37 2020-01-16
- Removed deprecated 'kalamar_test_port' helper.
- Separated KalamarHelpers and KalamarPages.
- Renamed 'doc_link_to' to 'embedded_link_to'
@@ -32,6 +32,7 @@
- Make proxy timeouts configurable.
- Show busy indicator while waiting for query results
(#104).
+ - Update JS dependencies.
0.36 2019-09-19
- Rename all cookies to be independent
diff --git a/Gruntfile.js b/Gruntfile.js
index d64d307..f06f558 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -52,7 +52,7 @@
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
requirejs: reqTasks,
- uglify: {
+ terser: {
kalamar : {
files: uglyFiles,
options : {
@@ -144,6 +144,7 @@
'dev/scss/base/flextable.scss',
'dev/scss/base/fragment.scss',
'dev/scss/base/load.scss',
+ 'dev/scss/base/form.scss',
'dev/scss/footer/footer.scss',
'dev/scss/sidebar/sidebar.scss',
'dev/scss/header/{header,hint,menu,searchbar,vc,statistics,datepicker}.scss',
@@ -163,13 +164,13 @@
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-copy');
- grunt.loadNpmTasks('grunt-contrib-uglify-es');
+ grunt.loadNpmTasks('grunt-terser');
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.registerTask('img', ['imagemin','copy']);
grunt.registerTask('js', ['requirejs']);
grunt.registerTask('css', ['sass']);
grunt.registerTask(
'default',
- ['requirejs', 'uglify', 'imagemin', 'copy', 'sass']
+ ['requirejs', 'terser', 'imagemin', 'copy', 'sass']
);
};
diff --git a/package.json b/package.json
index 43598c0..fa127b0 100755
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "Kalamar",
"description": "Mojolicious-based Frontend for KorAP",
"license": "BSD-2-Clause",
- "version": "0.37.3",
+ "version": "0.37.4",
"pluginVersion": "0.2",
"repository": {
"type": "git",
@@ -11,14 +11,17 @@
"devDependencies": {
"grunt": "^1.0.3",
"grunt-contrib-copy": "^1.0.0",
- "grunt-contrib-imagemin": "^2.0.1",
+ "grunt-contrib-imagemin": "^3.1.0",
"grunt-contrib-requirejs": "^1.0.0",
"grunt-contrib-sass": "^1.0.0",
- "grunt-contrib-uglify-es": "^3.3.0",
+ "grunt-terser": "^1.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-shell": "^3.0.1",
"imagemin": "^5.3.1",
- "optipng-bin": "^4.0.0",
+ "optipng-bin": "^6.0.0",
"vinyl-fs": "^3.0.2"
+ },
+ "optionalDependencies": {
+ "fsevents": "*"
}
}