Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: node_js
node_js:
- "0.10"
- "0.8"
before_script:
- npm install -g grunt-cli
7 changes: 4 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ module.exports = function(grunt) {
grunt.initConfig({
inline: {
dist: {
src: ['test/dist/*.html'],
dest: ['tmp/']
src: 'test/dist/*.html',
dest: 'tmp/'
}
},

clean: {
tests: ['tmp/']
tests: 'tmp/'
},

htmlmin: {
Expand All @@ -24,6 +24,7 @@ module.exports = function(grunt) {
'tmp/img.min.html': 'tmp/img.html',
'tmp/html.min.html': 'tmp/html.html',
'tmp/script.min.html': 'tmp/script.html',
'tmp/icon.min.html': 'tmp/icon.html',
'tmp/css_greedy.min.html': 'tmp/css_greedy.html',
'tmp/img_greedy.min.html': 'tmp/img_greedy.html',
'tmp/html_greedy.min.html': 'tmp/html_greedy.html',
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# grunt-inline[![build status](https://secure.travis-ci.org/miniflycn/grunt-inline.png)](http://travis-ci.org/miniflycn/grunt-inline)
# grunt-inline[![build status](https://secure.travis-ci.org/marcusklaas/grunt-inline.png)](http://travis-ci.org/marcusklaas/grunt-inline)

Brings externally referenced resources, such as js, css and images, into
a single file.
Expand Down Expand Up @@ -233,6 +233,8 @@ Then, after the `inline` task is run, the original content in `index.html` will
In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).

## Release History
* 2015-03-03 v0.3.5 add feature: support for inlining favicons
* 2015-03-09 v0.3.4 fork: fork project, fix tests and merge a number of pull requests
* 2015-01-09 v0.3.3 bug fix: when processing files of a folder and then copy the processed content to another destination, the original files are changed unexpectedly, as mentioned in this issue [Support file globbing for input and output](https://github.com/chyingp/grunt-inline/issues/35)
* 2014-06-16 v0.3.1 bug fix: protocol-relative urls in css are messed up
* 2014-06-15 v0.3.1 bug fix: when options.tag is '', then all img tags, whose src attribute has already been inlined will be matched.
Expand Down
110 changes: 0 additions & 110 deletions npm-debug.log

This file was deleted.

80 changes: 40 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
{
"author": {
"name": "程序猿小卡",
"email": "chyingp@gmail.com",
"url": "https://github.com/chyingp"
},
"name": "grunt-inline",
"description": "Inlines img, script and link tags into the same file.",
"version": "0.3.4",
"keywords": [
"gruntplugin",
"inline",
"js",
"css"
],
"main": "inline",
"repository": {
"type": "git",
"url": "https://github.com/chyingp/grunt-inline.git"
},
"engines": {
"node": ">=0.8.0"
},
"devDependencies": {
"grunt-contrib-nodeunit": "~0.1.2",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt": "~0.4.0"
},
"dependencies": {
"uglify-js": "2.4.1",
"datauri": "~0.2.0",
"clean-css": "1.1.7"
},
"scripts": {
"test": "grunt test"
},
"_id": "grunt-inline@0.1.0",
"_from": "grunt-inline@~0.1.0"
}
{
"author": {
"name": "程序猿小卡",
"email": "chyingp@gmail.com",
"url": "https://github.com/chyingp"
},
"name": "grunt-inline",
"description": "Inlines img, script and link tags into the same file.",
"version": "0.3.5",
"keywords": [
"gruntplugin",
"inline",
"js",
"css"
],
"main": "inline",
"repository": {
"type": "git",
"url": "https://github.com/chyingp/grunt-inline.git"
},
"engines": {
"node": ">=0.8.0"
},
"devDependencies": {
"grunt": "~0.4.0",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-nodeunit": "~0.1.2"
},
"dependencies": {
"uglify-js": "2.4.1",
"datauri": "~0.2.0",
"clean-css": "1.1.7"
},
"scripts": {
"test": "grunt test"
},
"_id": "grunt-inline@0.1.0",
"_from": "grunt-inline@~0.1.0"
}
Loading