From 5ac941aa342bdacf27942e5b608a16f1f0a50012 Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Mon, 30 Jan 2017 08:37:31 +0100 Subject: [PATCH] [TASK] Remove grunt-inline-data (use grunt-inline for config.json) --- Gruntfile.js | 4 ++-- html/index.html | 6 +++--- package.json | 1 - tasks/build.js | 18 +++++++++--------- tasks/development.js | 2 +- yarn.lock | 38 +------------------------------------- 6 files changed, 16 insertions(+), 53 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1a48eda..9dea853 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,7 +3,7 @@ module.exports = function exports(grunt) { grunt.loadTasks('tasks'); - grunt.registerTask('default', ['lint', 'copy', 'sass:dist', 'postcss', 'requirejs:default', 'inlinedata', 'cachebreaker', 'inline', 'htmlmin', 'json-minify', 'clean:release']); + grunt.registerTask('default', ['lint', 'copy', 'sass:dist', 'postcss', 'requirejs:default', 'cachebreaker', 'inline', 'htmlmin', 'json-minify', 'clean:release']); grunt.registerTask('lint', ['sasslint', 'eslint']); - grunt.registerTask('serve', ['lint', 'copy', 'sass:dev', 'postcss', 'requirejs:dev', 'inlinedata', 'htmlmin', 'json-minify', 'browserSync', 'watch']); + grunt.registerTask('serve', ['lint', 'copy', 'sass:dev', 'postcss', 'requirejs:dev', 'inline:dev', 'htmlmin', 'json-minify', 'browserSync', 'watch']); }; diff --git a/html/index.html b/html/index.html index 933650d..e972b56 100644 --- a/html/index.html +++ b/html/index.html @@ -3,11 +3,11 @@ - + - + diff --git a/package.json b/package.json index f72c79d..29607bc 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "grunt-contrib-watch": "^1.0.0", "grunt-eslint": "^19.0.0", "grunt-inline": "^0.3.6", - "grunt-inline-data": "git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f", "grunt-json-minify": "^1.1.0", "grunt-postcss": "^0.8.0", "grunt-sass": "^2.0.0", diff --git a/tasks/build.js b/tasks/build.js index 97ea336..76efa5f 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -76,8 +76,17 @@ module.exports = function exports(grunt) { } }, inline: { + dev: { + options: { + cssmin: true, + uglify: true + }, + src: 'build/index.html', + dest: 'build/index.html' + }, dist: { options: { + tag: '__build', cssmin: true, uglify: true }, @@ -97,14 +106,6 @@ module.exports = function exports(grunt) { } } }, - inlinedata: { - injs: { - expand: true, - cwd: '.', - src: ['build/*.html'], - ext: '.html' - } - }, requirejs: { default: { options: { @@ -151,7 +152,6 @@ module.exports = function exports(grunt) { grunt.loadNpmTasks('grunt-sass'); grunt.loadNpmTasks('grunt-postcss'); grunt.loadNpmTasks('grunt-inline'); - grunt.loadNpmTasks('grunt-inline-data'); grunt.loadNpmTasks('grunt-contrib-htmlmin'); grunt.loadNpmTasks('grunt-json-minify'); grunt.loadNpmTasks('grunt-cache-breaker'); diff --git a/tasks/development.js b/tasks/development.js index e8a312e..fd5e595 100644 --- a/tasks/development.js +++ b/tasks/development.js @@ -25,7 +25,7 @@ module.exports = function exports(grunt) { watch: { html: { files: ['html/index.html', 'config.json', 'locale/*.json'], - tasks: ['copy', 'inlinedata', 'htmlmin', 'json-minify'] + tasks: ['copy', 'inline:dev', 'htmlmin', 'json-minify'] }, sass: { files: ['scss/**/*.scss'], diff --git a/yarn.lock b/yarn.lock index e423ab1..ae81a42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -68,18 +68,10 @@ ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" -ansi-regex@^0.2.0, ansi-regex@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" -ansi-styles@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -520,16 +512,6 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@~0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" - dependencies: - ansi-styles "^1.1.0" - escape-string-regexp "^1.0.0" - has-ansi "^0.1.0" - strip-ansi "^0.3.0" - supports-color "^0.2.0" - chokidar@1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2" @@ -999,7 +981,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -1575,12 +1557,6 @@ grunt-eslint@^19.0.0: chalk "^1.0.0" eslint "^3.0.0" -"grunt-inline-data@git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f": - version "0.0.6" - resolved "git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f" - dependencies: - chalk "~0.5.0" - grunt-inline@^0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/grunt-inline/-/grunt-inline-0.3.6.tgz#b37d55469feba60d1d3848566ea14ee9135f8f57" @@ -1678,12 +1654,6 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" -has-ansi@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" - dependencies: - ansi-regex "^0.2.0" - has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -3359,12 +3329,6 @@ stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" -strip-ansi@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" - dependencies: - ansi-regex "^0.2.1" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"