Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oncode committed Sep 27, 2017
1 parent 198da11 commit 3ea2a71
Show file tree
Hide file tree
Showing 9 changed files with 794 additions and 619 deletions.
File renamed without changes.
7 changes: 3 additions & 4 deletions .config/build
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ FAVICONS_PATH=$(ASSETS_PATH)/favicons
# css
SCSS_IN=$(ASSETS_PATH)/scss
CSS_OUT=$(ASSETS_PATH)/css
POSTCSS_CONFIG=$(CONFIG_FOLDER)/postcss.js

# icons
ICONS_IN=$(ASSETS_PATH)/img/icons
Expand All @@ -40,16 +39,16 @@ ICONS_COMBINED_SVG=$(ASSETS_PATH)/icons.svg
JS_BASE=$(ASSETS_PATH)/js
JS_IN=main.js
JS_OUT=main.bundle.js
JS_CONFIG=$(CONFIG_FOLDER)/webpack.js
JS_CONFIG=$(CONFIG_FOLDER)/webpack.config.js

# deployment
DEPLOY_SCRIPTS_FOLDER=$(SCRIPTS_FOLDER)/deployment

# jsdoc output path
JSDOC_CONFIG=$(CONFIG_FOLDER)/jsdoc.json
JSDOC_CONFIG=$(CONFIG_FOLDER)/jsdoc.config.json
JSDOC_IN=$(ASSETS_PATH)/js
JSDOC_OUT=.docs
JSDOC_README=$(ASSETS_PATH)/js/README.md

# browsersync service
BROWSERSYNC_CONFIG=$(CONFIG_FOLDER)/bs-sync.js
BROWSERSYNC_CONFIG=$(CONFIG_FOLDER)/bs-sync.config.js
File renamed without changes.
37 changes: 37 additions & 0 deletions .config/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
var importCss = require('postcss-import')
var autoprefixer = require('autoprefixer')
var objectFit = require('postcss-object-fit-images')
var pxToRem = require('postcss-pxtorem')
var assets = require('postcss-assets')
var mqpacker = require('css-mqpacker')
var cssnano = require('cssnano')

module.exports = (ctx) => {
return {
map: false,
plugins: [
importCss(),
autoprefixer(),
objectFit(),
pxToRem({
rootValue: 16,
unitPrecision: 5,
propWhiteList: ['font', 'font-size', 'line-height', 'letter-spacing'],
replace: true,
mediaQuery: false,
minPixelValue: 2
}),
mqpacker(),
assets({
basePath: process.env.ASSETS_PATH,
loadPaths: ['img', 'fonts'],
relative: true,
cachebuster: true
}),
cssnano({
zindex: false
})
]
}
}

20 changes: 0 additions & 20 deletions .config/postcss.js

This file was deleted.

File renamed without changes.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,13 @@ postcss:
# modify the normal css with postcss
@ ASSETS_PATH=$(ASSETS_PATH) \
$(POSTCSS) \
--no-map \
--config $(POSTCSS_CONFIG) \
--config $(CONFIG_FOLDER) \
$(CSS_OUT)/style.scss.css -o $(CSS_OUT)/style.css

watch-postcss:
@ ASSETS_PATH=$(ASSETS_PATH) \
$(POSTCSS) \
--config $(POSTCSS_CONFIG) \
--config $(CONFIG_FOLDER) \
$(CSS_OUT)/style.scss.css -o $(CSS_OUT)/style.css \
--watch

Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
"main": "assets/js/main.js",
"dependencies": {
"autoprefixer": "^6.6.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1",
"browser-sync": "^2.18.6",
"css-mqpacker": "^5.0.1",
"browser-sync": "^2.18.13",
"css-mqpacker": "^6.0.1",
"cssnano": "^3.10.0",
"eslint": "^3.13.1",
"eslint": "^4.7.2",
"expose-loader": "^0.7.3",
"gi-feature-icons": "^0.0.12",
"gi-feature-icons": "^0.0.13",
"gi-feature-object-fit": "^0.0.2",
"gi-js-base": "^0.0.47",
"gi-js-base": "^0.0.50",
"gridle": "^2.0.48",
"imports-loader": "^0.7.1",
"jquery": "^3.1.1",
"postcss-assets": "^4.1.0",
"postcss-cli": "^2.5.1",
"postcss-import": "^9.0.0",
"jquery": "^3.2.1",
"postcss-assets": "^5.0.0",
"postcss-cli": "^4.1.1",
"postcss-import": "^11.0.0",
"postcss-object-fit-images": "^1.1.2",
"postcss-pxtorem": "^3.3.1",
"sanitize.css": "^4.1.0",
"webpack": "^3.4.1"
"postcss-pxtorem": "^4.0.1",
"sanitize.css": "^5.0.0",
"webpack": "^3.6.0"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 3ea2a71

Please sign in to comment.