Skip to content

Commit f861021

Browse files
ritz078ritz078
committed
refactor(watch): grunt watch implemented and server created .Folder structure improved
1 parent 001c11f commit f861021

47 files changed

Lines changed: 1653 additions & 66 deletions

Some content is hidden

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

‎Gruntfile.js‎

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ module.exports = function(grunt) {
2424
// Better than calling grunt a million times
2525
// (call 'grunt watch')
2626
watch: {
27-
files: ['src/**/*'],
28-
tasks: ['webpack:build-dev']
27+
options: {
28+
livereload: true
29+
},
30+
css: {
31+
files: ['src/css/**/*.scss'],
32+
tasks: ['sass']
33+
},
34+
js: {
35+
files: ['src/js/**.es6'],
36+
tasks: ['webpack:build-dev']
37+
}
2938
},
3039

3140
postcss: {
@@ -34,7 +43,7 @@ module.exports = function(grunt) {
3443
processors: [
3544
require('cssnano')({
3645
convertValues: false
37-
}) // minify the result
46+
})
3847
]
3948
},
4049
dist: {
@@ -47,50 +56,21 @@ module.exports = function(grunt) {
4756

4857
webpack: {
4958
options: webpackConfig,
50-
"build": {
51-
debug: true,
52-
plugins: webpackConfig.plugins.concat(
53-
new webpack.optimize.UglifyJsPlugin({
54-
compress: {
55-
drop_console: true,
56-
warnings: false
57-
},
58-
sourceMap: true
59-
}),
60-
new webpack.BannerPlugin("<%= meta.banner %>", {
61-
raw: true
62-
})
63-
)
64-
},
6559
"build-dev": {
6660
devtool: "sourcemap",
6761
debug: true
6862
}
6963
},
7064

71-
'webpack-dev-server': {
72-
options: {
73-
webpack: webpackConfig,
74-
publicPath: '/' + webpackConfig.output.publicPath
75-
},
76-
start: {
77-
keepAlive: true,
78-
webpack: {
79-
devtool: "sourcemap",
80-
debug: true
81-
}
82-
}
83-
},
84-
8565
'sprite': {
8666
all: {
87-
src: './assets/images/ejs_emojis/*.png',
88-
dest: './assets/images/emojis.png',
89-
retinaSrcFilter: './assets/images/ejs_emojis/*@2x.png',
90-
destCss: 'src/_emojis.scss',
91-
retinaDest: './assets/images/emojis@2x.png',
92-
cssFormat:'css',
93-
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'
9474
}
9575
},
9676

@@ -119,7 +99,35 @@ module.exports = function(grunt) {
11999
style: 'expanded'
120100
},
121101
files: {
122-
'src/embed.css': 'src/embed.scss',
102+
'src/embed.css': 'src/css/embed.scss',
103+
}
104+
}
105+
},
106+
107+
'uglify': {
108+
options: {
109+
banner: "<%= meta.banner %>"
110+
},
111+
build: {
112+
files: {
113+
'dist/embed.min.js': 'src/embed.js'
114+
}
115+
}
116+
},
117+
connect: {
118+
server: {
119+
options: {
120+
port: 8000,
121+
livereload: true,
122+
open: true,
123+
keepAlive: true,
124+
base: {
125+
path: './',
126+
options: {
127+
index: 'demo/index.html',
128+
maxAge: 300000
129+
}
130+
}
123131
}
124132
}
125133
}
@@ -132,9 +140,11 @@ module.exports = function(grunt) {
132140
grunt.loadNpmTasks("grunt-spritesmith");
133141
grunt.loadNpmTasks('grunt-retinafy');
134142
grunt.loadNpmTasks("grunt-contrib-sass");
143+
grunt.loadNpmTasks("grunt-contrib-uglify");
144+
grunt.loadNpmTasks("grunt-contrib-connect");
135145

136146
grunt.registerTask("serve", ["webpack-dev-server:start"])
137-
grunt.registerTask("default", ["clean", "webpack:build-dev", "watch"]);
138-
grunt.registerTask("build", ["clean", "webpack:build","emoji","postcss"]);
139-
grunt.registerTask("emoji",["retinafy","sprite","sass"]);
147+
grunt.registerTask("default", ["clean", "webpack:build-dev", "sass", "connect", "watch"]);
148+
grunt.registerTask("build", ["clean", "emoji", "webpack:build-dev", "uglify", "postcss"]);
149+
grunt.registerTask("emoji", ["retinafy", "sprite", "sass"]);
140150
};

‎dist/embed.min.css‎

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

‎dist/embed.min.js‎

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

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"commitizen": "^1.0.4",
4545
"cssnano": "^2.6.1",
4646
"cz-conventional-changelog": "^1.1.0",
47+
"es6-promise": "^3.0.2",
4748
"eslint": "^1.6.0",
4849
"eslint-loader": "^1.1.0",
4950
"exports-loader": "^0.6.2",
@@ -52,20 +53,22 @@
5253
"grunt": "~0.4.5",
5354
"grunt-cli": "~0.1.13",
5455
"grunt-contrib-clean": "^0.6.0",
56+
"grunt-contrib-connect": "^0.11.2",
5557
"grunt-contrib-csslint": "^0.5.0",
5658
"grunt-contrib-sass": "^0.9.2",
59+
"grunt-contrib-uglify": "^0.9.2",
5760
"grunt-contrib-watch": "^0.6.1",
5861
"grunt-postcss": "^0.5.5",
5962
"grunt-retinafy": "^0.1.5",
6063
"grunt-spritesmith": "^5.1.1",
6164
"grunt-webpack": "^1.0.11",
6265
"imports-loader": "^0.6.4",
6366
"mocha": "^2.2.5",
64-
"postcss-banner": "^1.0.0",
6567
"regenerator": "^0.8.41",
6668
"semantic-release": "^4.3.5",
6769
"webpack": "^1.12.2",
68-
"webpack-dev-server": "^1.12.0"
70+
"webpack-dev-server": "^1.12.0",
71+
"whatwg-fetch": "^0.9.0"
6972
},
7073
"scripts": {
7174
"commit": "git-cz",
@@ -79,9 +82,5 @@
7982
"ghooks": {
8083
"pre-commit": "npm run test"
8184
}
82-
},
83-
"dependencies": {
84-
"es6-promise": "^3.0.2",
85-
"whatwg-fetch": "^0.9.0"
8685
}
8786
}

src/_emojis.scss renamed to src/css/_emojis.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ $retine_sprite_height : 1320px;
33

44
@media all and (-webkit-min-device-pixel-ratio : 1), all and (min--moz-device-pixel-ratio : 1), all and (-o-min-device-pixel-ratio : 1), all and (min-device-pixel-ratio : 1), all and (min-resolution : 96dpi) {
55
.emoticon {
6-
background : transparent url(.././assets/images/emojis.png) 0 0 no-repeat;
6+
background : transparent url(../.././assets/images/emojis.png) 0 0 no-repeat;
77
}
88
}
99

1010
@media all and (-webkit-min-device-pixel-ratio : 1.5), all and (-o-min-device-pixel-ratio : 3/2), all and (min-device-pixel-ratio : 1.5), all and (min-resolution : 144dpi) {
1111
.emoticon {
12-
background : transparent url(.././assets/images/emojis@2x.png) 0 0 no-repeat;
12+
background : transparent url(../.././assets/images/emojis@2x.png) 0 0 no-repeat;
1313
background-size : $retine_sprite_width/2 $retine_sprite_height/2;
1414
}
1515
}

src/embed.scss renamed to src/css/embed.scss

File renamed without changes.

‎src/embed.css‎

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.css.map‎

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

0 commit comments

Comments
 (0)