Skip to content

Commit

Permalink
Fix grunt issues after moving package.json to root directory.
Browse files Browse the repository at this point in the history
Change-Id: I8bf91c1b5fba7ec57ef4beeccd38ec1a82cc43a2
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/156006
Reviewed-by: Qiu, Jianlin <jianlin.qiu@intel.com>
Tested-by: Qiu, Jianlin <jianlin.qiu@intel.com>
  • Loading branch information
jianjunz authored and taste1981 committed Jan 10, 2018
1 parent 121c1c9 commit 4200acf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "~0.8.2",
"grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-uglify": "git+https://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
"grunt-contrib-uglify-es": "git+https://github.com/gruntjs/grunt-contrib-uglify.git#ccb95a70cad6a4e9e902d3bd5d0e38a4de09a1e1",
"grunt-eslint": "^19.0.0",
"grunt-string-replace": "~1.2.0"
},
Expand Down
6 changes: 4 additions & 2 deletions scripts/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ module.exports = function(grunt) {
'../src/sdk/icsREST/API.js'
];

grunt.file.setBase('../');

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('../package.json'),
pkg: grunt.file.readJSON('package.json'),
meta: {
banner: '\
/*\n\
Expand Down Expand Up @@ -319,7 +321,7 @@ window.L = L;\n\

// Load Grunt plugins.
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-uglify-es');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-string-replace');
Expand Down

0 comments on commit 4200acf

Please sign in to comment.