Skip to content

Commit e604647

Browse files
ritz078ritz078
committed
refactor(build): added options for uglifying the script
1 parent 92564fb commit e604647

7 files changed

Lines changed: 95 additions & 67 deletions

File tree

‎Gruntfile.js‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ module.exports = function(grunt) {
2929
},
3030
css: {
3131
files: ['src/css/**/*.scss'],
32-
tasks: ['sass','postcss']
32+
tasks: ['sass', 'postcss']
3333
},
3434
js: {
35-
files: ['src/js/**/*.es6','build.json'],
36-
tasks: ['webpack:build-dev','uglify']
35+
files: ['src/js/**/*.es6', 'build.json'],
36+
tasks: ['webpack:build-dev', 'uglify']
3737
}
3838
},
3939

@@ -64,13 +64,13 @@ module.exports = function(grunt) {
6464

6565
'sprite': {
6666
all: {
67-
src : './assets/images/ejs_emojis/*.png',
68-
dest : './assets/images/emojis.png',
69-
retinaSrcFilter : './assets/images/ejs_emojis/*@2x.png',
70-
destCss : 'src/css/_emojis.scss',
71-
retinaDest : './assets/images/emojis@2x.png',
72-
cssFormat : 'css',
73-
cssTemplate : 'sprite.handlebars'
67+
src: './assets/images/ejs_emojis/*.png',
68+
dest: './assets/images/emojis.png',
69+
retinaSrcFilter: './assets/images/ejs_emojis/*@2x.png',
70+
destCss: 'src/css/_emojis.scss',
71+
retinaDest: './assets/images/emojis@2x.png',
72+
cssFormat: 'css',
73+
cssTemplate: 'sprite.handlebars'
7474
}
7575
},
7676

@@ -106,7 +106,18 @@ module.exports = function(grunt) {
106106

107107
'uglify': {
108108
options: {
109-
banner: "<%= meta.banner %>"
109+
banner: "<%= meta.banner %>",
110+
mangle: true,
111+
compress: {
112+
sequences: true,
113+
dead_code: true,
114+
conditionals: true,
115+
booleans: true,
116+
unused: true,
117+
if_return: true,
118+
join_vars: true,
119+
drop_console: true
120+
}
110121
},
111122
build: {
112123
files: {

‎demo/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h1>Loading embed.js in a block</h1>
7171
videoWidth:720,
7272
videoDetails:true,
7373
googleAuthKey:'AIzaSyCqFouT8h5DKAbxlrTZmjXEmNBjC69f0ts',
74-
inlineEmbed:'all',
74+
inlineEmbed:[],
7575
marked:true,
7676
link:true
7777
});

‎dist/embed.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/embed.js‎

Lines changed: 43 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/embed.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/modules/video/youtube.es6‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,13 @@ class Youtube {
4444
while ((match = utils.matches(regexInline, this.output)) !== null) {
4545
let id = match[2]
4646
let embedUrl = `https://www.youtube.com/embed/${id}`
47-
let data = await this.data(id)
48-
console.log(data,id)
49-
let text = helper.detailsTemplate(this.formatData(data), embedUrl)
47+
let data, text;
48+
if (this.options.videoDetails) {
49+
data = await this.data(id)
50+
text = helper.detailsTemplate(this.formatData(data), embedUrl)
51+
} else {
52+
text = helper.template(embedUrl, this.options)
53+
}
5054
if (this.options.link) {
5155
this.output = !this.options.inlineText ? this.output.replace(match[0], text + '</a>') : this.output.replace(match[0], match[0] + text)
5256
} else {
@@ -72,7 +76,7 @@ class Youtube {
7276
}
7377
}
7478

75-
}catch(error){
79+
} catch (error) {
7680
console.log(error)
7781
}
7882

‎webpack.config.js‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ module.exports = {
1717
}],
1818
loaders: [{
1919
test: /\.es6$/,
20-
exclude: /node_modules/,
20+
include: /src/,
2121
loader: 'babel-loader',
22-
query :{
23-
cacheDirectory:'.tmp/'
22+
query: {
23+
cacheDirectory: '.tmp/'
2424
}
2525
}]
2626
},
@@ -31,19 +31,27 @@ module.exports = {
3131
new webpack.ProvidePlugin({
3232
'fetch': 'imports?this=>global!exports?global.fetch!whatwg-fetch',
3333
'fetchJsonp': 'fetch-jsonp'
34-
}),
34+
}),
3535
new webpack.optimize.DedupePlugin(),
3636
new webpack.optimize.UglifyJsPlugin({
37-
compress:{
38-
warnings:false
37+
compress: {
38+
warnings: false,
39+
sequences: true,
40+
dead_code: true,
41+
conditionals: true,
42+
booleans: true,
43+
unused: true,
44+
if_return: true,
45+
join_vars: true,
46+
drop_console: true
3947
},
4048
mangle:false,
41-
output:{
42-
beautify:true,
43-
comments:true
49+
output: {
50+
beautify: true,
51+
comments: true
4452
}
4553
})
46-
],
54+
],
4755
stats: {
4856
// Nice colored output
4957
colors: true

0 commit comments

Comments
 (0)