Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TASK] Update npm modules including grunt v1

Browse Source
This commit is contained in:
Xaver Maierhofer 2016-05-22 16:50:02 +02:00
parent b27ae7e8da
commit 8ed1c83932
4 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gruntfile.js
View File

@ -1,23 +1,7 @@
module.exports = function (grunt) { module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-git-describe");
grunt.initConfig({
"git-describe": {
options: {},
default: {}
}
});
grunt.registerTask("saveRevision", function () {
grunt.event.once("git-describe", function (rev) {
grunt.option("gitRevision", rev);
});
grunt.task.run("git-describe");
});
grunt.loadTasks("tasks"); grunt.loadTasks("tasks");
grunt.registerTask("default", ["bower-install-simple", "lint", "saveRevision", "copy", "sass", "postcss", "requirejs"]); grunt.registerTask("default", ["bower-install-simple", "lint", "copy", "sass", "postcss", "requirejs"]);
grunt.registerTask("lint", ["eslint"]); grunt.registerTask("lint", ["eslint"]);
grunt.registerTask("dev", ["default", "connect:server", "watch"]); grunt.registerTask("dev", ["default", "connect:server", "watch"]);
}; };

3
html/index.html
View File

@ -9,9 +9,6 @@
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<script src="vendor/es6-shim/es6-shim.min.js"></script> <script src="vendor/es6-shim/es6-shim.min.js"></script>
<script src="app.js"></script> <script src="app.js"></script>
<script>
console.log("Version: #revision#")
</script>
</head> </head>
<body> <body>
</body> </body>

29
package.json
View File

@ -4,21 +4,20 @@
"test": "node -e \"require('grunt').cli()\" '' clean lint" "test": "node -e \"require('grunt').cli()\" '' clean lint"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.3", "autoprefixer": "^6.3.6",
"grunt": "^0.4.5", "grunt": "^1.0.1",
"grunt-check-dependencies": "^0.6.0", "grunt-bower-install-simple": "^1.2.1",
"grunt-contrib-clean": "^0.6.0", "grunt-check-dependencies": "^0.12.0",
"grunt-contrib-connect": "^0.8.0", "grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "^0.5.0", "grunt-contrib-connect": "^1.0.2",
"grunt-contrib-cssmin": "^0.12.2", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-requirejs": "^0.4.4", "grunt-contrib-cssmin": "^1.0.1",
"grunt-sass": "^1.1.0", "grunt-contrib-requirejs": "^1.0.0",
"grunt-postcss": "^0.7.2", "grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-uglify": "^0.5.1", "grunt-contrib-watch": "^1.0.0",
"grunt-contrib-watch": "^0.6.1", "grunt-eslint": "^18.1.0",
"grunt-eslint": "^10.0.0", "grunt-postcss": "^0.8.0",
"grunt-bower-install-simple": "^1.1.2", "grunt-sass": "^1.2.0"
"grunt-git-describe": "^2.3.2"
}, },
"eslintConfig": { "eslintConfig": {
"env": { "env": {

5
tasks/build.js
View File

@ -3,11 +3,6 @@ module.exports = function (grunt) {
bowerdir: "bower_components", bowerdir: "bower_components",
copy: { copy: {
html: { html: {
options: {
process: function (content) {
return content.replace("#revision#", grunt.option("gitRevision"));
}
},
src: ["*.html"], src: ["*.html"],
expand: true, expand: true,
cwd: "html/", cwd: "html/",