Skip to content

Commit 4deb62e

Browse files
ritz078ritz078
committed
Merge pull request ritz078#127 from ritz078/feat/v4
v4 is here
2 parents 096ca4c + 1321849 commit 4deb62e

90 files changed

Lines changed: 7168 additions & 9325 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.babelrc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
presets:['es2015-rollup','stage-2'],
3-
plugins:['transform-regenerator']
2+
"presets":["es2015"]
43
}

‎.eslintrc‎

Lines changed: 21 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,29 @@
11
{
22
"env": {
3-
"node": true,
4-
"es6": true,
5-
"browser": true
3+
"node": true,
4+
"es6": true,
5+
"browser": true
66
},
77
"parser": "babel-eslint",
88
"extends": "eslint:recommended",
99
"rules": {
10-
"no-multi-spaces": 0,
11-
"key-spacing": 0,
12-
"no-return-assign": 0,
13-
"consistent-return": 0,
14-
"no-shadow": 0,
15-
"comma-dangle": 0,
16-
"no-use-before-define": 0,
17-
"no-empty": 0,
18-
"new-parens": 0,
19-
"no-cond-assign": 0,
20-
"no-fallthrough": 0,
21-
"new-cap": 0,
22-
"no-loop-func": 0,
23-
"no-unreachable": 0,
24-
"no-labels": 0,
25-
"no-process-exit": 0,
26-
"camelcase": 0,
27-
"no-console": 0
28-
},
29-
"globals": {
30-
"hljs": true,
31-
"twttr": true,
32-
"fetchJsonp": true,
33-
"videojs": true,
34-
"marked": true,
35-
"EMOJI": true,
36-
"LINK": true,
37-
"TWITTER": true,
38-
"SMILEY": true,
39-
"HIGHLIGHTCODE": true,
40-
"MARKDOWN": true,
41-
"MAP": true,
42-
"YOUTUBE": true,
43-
"VIMEO": true,
44-
"TED": true,
45-
"DAILYMOTION": true,
46-
"USTREAM": true,
47-
"LIVELEAK": true,
48-
"VINE": true,
49-
"BASICVIDEO": true,
50-
"SPOTIFY": true,
51-
"SOUNDCLOUD": true,
52-
"BASICAUDIO": true,
53-
"CODEPEN": true,
54-
"IDEONE": true,
55-
"JSBIN": true,
56-
"JSFIDDLE": true,
57-
"PLUNKER": true,
58-
"GIST": true,
59-
"FLICKR": true,
60-
"BASICIMAGE": true,
61-
"INSTAGRAM": true,
62-
"OPENGRAPH": true,
63-
"ejs": true,
64-
"GITHUB":true,
65-
"SLIDESHARE":true
10+
"no-multi-spaces": 0,
11+
"key-spacing": 0,
12+
"no-return-assign": 0,
13+
"consistent-return": 0,
14+
"no-shadow": 0,
15+
"comma-dangle": 0,
16+
"no-use-before-define": 0,
17+
"no-empty": 0,
18+
"new-parens": 0,
19+
"no-cond-assign": 0,
20+
"no-fallthrough": 0,
21+
"new-cap": 0,
22+
"no-loop-func": 0,
23+
"no-unreachable": 0,
24+
"no-labels": 0,
25+
"no-process-exit": 0,
26+
"camelcase": 0,
27+
"no-console": 0
6628
}
6729
}

‎Gruntfile.js‎

Lines changed: 24 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
module.exports = function (grunt) {
22

3-
var babel = require('rollup-plugin-babel');
4-
var npm = require('rollup-plugin-npm');
5-
var commonjs = require('rollup-plugin-commonjs');
6-
var replace = require('rollup-plugin-replace');
7-
var build = require('./build.json');
8-
9-
var exec = require('child_process').exec;
10-
113
grunt.initConfig({
124

135
// Import package manifest
@@ -37,8 +29,8 @@ module.exports = function (grunt) {
3729
tasks: ['sass', 'postcss']
3830
},
3931
js : {
40-
files: ['src/js/**/*.es6', 'build.json', 'src/js/vendor/*.js'],
41-
tasks: ['eslint', 'rollup', 'uglify']
32+
files: ['src/js/**/*.js', 'build.json'],
33+
tasks: ['eslint', 'shell:rollup', 'uglify']
4234
}
4335
},
4436

@@ -61,17 +53,17 @@ module.exports = function (grunt) {
6153

6254
'sprite': {
6355
all: {
64-
src : './assets/images/ejs_emojis/*.png',
65-
dest : './assets/images/emojis.png',
66-
retinaSrcFilter: './assets/images/ejs_emojis/*@2x.png',
67-
destCss : 'src/css/_emojis.scss',
68-
retinaDest : './assets/images/emojis@2x.png',
69-
cssFormat : 'css',
70-
cssTemplate : 'sprite.handlebars',
71-
cssHandlebarsHelpers : {
72-
escape : function(name){
56+
src : './assets/images/ejs_emojis/*.png',
57+
dest : './assets/images/emojis.png',
58+
retinaSrcFilter : './assets/images/ejs_emojis/*@2x.png',
59+
destCss : 'src/css/_emojis.scss',
60+
retinaDest : './assets/images/emojis@2x.png',
61+
cssFormat : 'css',
62+
cssTemplate : 'sprite.handlebars',
63+
cssHandlebarsHelpers: {
64+
escape: function (name) {
7365
var x = ['+', '-', '/', '*'];
74-
if(x.indexOf(name[0]) !== -1) return '\\'+name;
66+
if (x.indexOf(name[0]) !== -1) return '\\' + name;
7567
return name;
7668
}
7769
}
@@ -103,7 +95,7 @@ module.exports = function (grunt) {
10395
style: 'expanded'
10496
},
10597
files : {
106-
'src/embed.css': 'src/css/embed.scss',
98+
'src/embed.css': 'src/css/embed.scss'
10799
}
108100
}
109101
},
@@ -147,34 +139,8 @@ module.exports = function (grunt) {
147139
}
148140
},
149141

150-
rollup: {
151-
options: {
152-
format : 'umd',
153-
banner : "<%= meta.banner %>",
154-
externals : ['regeneratorRuntime'],
155-
sourceMap : true,
156-
useStrict : true,
157-
sourceMapFile: 'src/embed.js',
158-
plugins : [
159-
npm({
160-
jsnext: true,
161-
main : true
162-
}),
163-
commonjs({
164-
include: 'node_modules/**'
165-
}),
166-
babel(),
167-
replace(build)
168-
]
169-
},
170-
files : {
171-
src : 'src/js/embed.es6',
172-
dest: 'src/embed.js'
173-
}
174-
},
175-
176142
eslint: {
177-
target: ['src/js/**/*.es6']
143+
target: ['src/js/**/*.js']
178144
},
179145

180146
'string-replace': {
@@ -233,32 +199,24 @@ module.exports = function (grunt) {
233199
}
234200
},
235201

236-
mocha: {
237-
test: {
238-
src: ['test/testrunner.html'],
239-
options:{
240-
run:true
241-
}
242-
}
243-
},
244-
245-
shell:{
246-
publish : {
247-
command : 'npm publish'
202+
shell: {
203+
publish: {
204+
command: 'npm publish'
205+
},
206+
rollup : {
207+
command: 'rollup -c rollup.umd.config.js && rollup -c rollup.es2015.config.js'
248208
}
249209
}
250210
});
251211

252212
require('load-grunt-tasks')(grunt);
253213

254-
grunt.registerTask("default", ["eslint", "rollup", "sass", "connect", "watch"]);
255-
grunt.registerTask("build", ["clean", "build-emoji", "eslint", "rollup", "sass", "uglify", "string-replace", "postcss", "copy"]);
214+
grunt.registerTask("default", ["eslint", "shell:rollup", "sass", "connect", "watch"]);
215+
grunt.registerTask("build", ["clean", "build-emoji", "eslint", "shell:rollup", "sass", "uglify", "string-replace", "postcss", "copy"]);
256216
grunt.registerTask("build-emoji", ["retinafy", "sprite", "sass"]);
257-
grunt.registerTask("dist", ["clean", "eslint", "rollup", "sass", "uglify", "string-replace", "postcss", "copy"]);
217+
grunt.registerTask("dist", ["clean", "eslint", "shell:rollup", "sass", "uglify", "string-replace", "postcss", "copy"]);
258218

259219
grunt.registerTask("release", function (option) {
260-
grunt.task.run(["bump-only:" + option, "dist","conventionalChangelog", "bump-commit","shell"]);
220+
grunt.task.run(["bump-only:" + option, "dist", "conventionalChangelog", "bump-commit", "shell:publish"]);
261221
});
262-
263-
grunt.registerTask("test",["mocha"]);
264222
};

0 commit comments

Comments
 (0)