Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basic webpack setup #176

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Basic webpack setup #176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5127ea
- basic version of webpack.
pgerochi Oct 19, 2017
b2982cc
removed webpack compiled output file from codebase for cleanup purposes
lregla Oct 20, 2017
642db53
modified webpack configuration to deploy code to 'dist' directory con…
lregla Oct 20, 2017
49f80d8
removed generated package-lock file from code, added to gitignore
lregla Oct 20, 2017
45880ff
- changed export to style.css instead of /css
pgerochi Oct 20, 2017
cc1ad20
Merge pull request #177 from lregla/feature/html5blank-webpack
pgerochi Oct 20, 2017
28b72fa
- redirect to node_modules
pgerochi Oct 26, 2017
5dd3172
Merge branch 'master' into feature/html5blank-webpack
pgerochi Nov 10, 2017
fc78487
Merge branch 'master' of https://github.com/toddmotto/html5blank into…
pgerochi Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
187 changes: 0 additions & 187 deletions gulpfile.js
View file
Open in desktop

This file was deleted.

37 changes: 17 additions & 20 deletions package.json
View file
Open in desktop
Expand Up @@ -46,8 +46,8 @@
"url": "https://github.com/oriSomething"
},
{
"name": "itsduc",
"url": "https://github.com/itsduc"
"name": "pgerochi",
"url": "https://github.com/pgerochi"
},
{
"name": "alorence",
Expand Down Expand Up @@ -115,30 +115,27 @@
}
],
"scripts": {
"modernizr": "gulp modernizr"
"modernizr": "cd node_modules/modernizr && ./bin/modernizr -c lib/config-all.json && mv ./modernizr.js ../../src/js/lib/modernizr.js",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regression to Issue #174 . modernizr script should handled by webpack rather than shell script to prevent OS incompatibilities

"build": "webpack",
"start": "webpack --watch"
},
"dependencies": {
"jquery": "^1.11.1",
"modernizr": "^3.5.0",
"normalize.css": "^7.0.0"
},
"devDependencies": {
"del": "^2.2.2",
"gulp": "^3.6.0",
"gulp-autoprefixer": "^3.1.1",
"gulp-concat": "^2.3.4",
"gulp-csso": "^2.0.0",
"gulp-jshint": "^2.0.4",
"gulp-livereload": "^3.8.1",
"gulp-load-plugins": "^1.4.0",
"gulp-sass": "^2.2.0",
"gulp-sourcemaps": "^2.2.0",
"gulp-template": "^4.0.0",
"gulp-uglify": "^2.0.0",
"jshint": "^2.9.4",
"jshint-stylish": "^2.2.1"
},
"engines": {
"node": ">=0.10.0"
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.1",
"css-loader": "^0.28.4",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^1.1.5",
"node-sass": "^4.5.3",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.1",
"uglifyjs-webpack-plugin": "^1.0.0-beta.3",
"url-loader": "^0.6.2",
"webpack": "^2.7.0"
}
}
Empty file added src/app.js
View file
Open in desktop
Empty file.
24 changes: 10 additions & 14 deletions src/css/sass/modules/fonts.scss
View file
Open in desktop
Expand Up @@ -3,17 +3,13 @@
* ---
* Declare fonts here
*/


/*
@font-face {
font-family: "Font-Name";
src: url("fonts/font-name.eot");
src: url("fonts/font-name.eot?#iefix") format("embedded-opentype"),
url("fonts/font-name.woff") format("woff"),
url("fonts/font-name.ttf") format("truetype"),
url("fonts/font-name.svg#font-name") format("svg");
font-weight: normal;
font-style: normal;
}
*/
// @font-face {
// font-family: "Font-Name";
// src: url("fonts/font-name.eot");
// src: url("fonts/font-name.eot?#iefix") format("embedded-opentype"),
// url("fonts/font-name.woff") format("woff"),
// url("fonts/font-name.ttf") format("truetype"),
// url("fonts/font-name.svg#font-name") format("svg");
// font-weight: normal;
// font-style: normal;
// }
4 changes: 3 additions & 1 deletion src/css/sass/partials/footer.scss
View file
Open in desktop
Expand Up @@ -4,4 +4,6 @@
*/


.footer {}
.footer {

}
2 changes: 0 additions & 2 deletions src/css/sass/partials/header.scss
View file
Open in desktop
Expand Up @@ -9,5 +9,3 @@

// Logo
.logo {}

.logo-img {}
2 changes: 1 addition & 1 deletion src/css/sass/style.scss
View file
Open in desktop
Expand Up @@ -18,4 +18,4 @@
@import "partials/nav";
@import "partials/sidebar";
@import "partials/footer";
@import "partials/print";
@import "partials/print";