Skip to content

Commit

Permalink
updating docs
Browse files Browse the repository at this point in the history
  • Loading branch information
iruzevic committed Dec 19, 2019
1 parent 4fa4be7 commit 0b47083
Show file tree
Hide file tree
Showing 7 changed files with 3,697 additions and 1,398 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a

_No documentation available about unreleased changes as of yet._

## [4.0.2] - 2019-12-19
### Changed
- Updated Webpack
- Updated PostCss
- Updated @eightshift/frontend-libs

## [4.0.1] - 2019-11-12
### Removed
- postcss-font-magician from package.json
Expand Down Expand Up @@ -180,6 +186,7 @@ Initial tagged release.

[Unreleased]: https://github.com/infinum/eightshift-boilerplate/compare/master...HEAD

[4.0.2]: https://github.com/infinum/eightshift-boilerplate/compare/4.0.1...v4.0.2
[4.0.1]: https://github.com/infinum/eightshift-boilerplate/compare/4.0.0...v4.0.1
[4.0.0]: https://github.com/infinum/eightshift-boilerplate/compare/3.0.1...v4.0.0
[4.0.0]: https://github.com/infinum/eightshift-boilerplate/compare/3.0.1...v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "infinum/eightshift-boilerplate",
"version": "4.0.1",
"version": "4.0.2",
"description": "This repository contains all the tools you need to start building a modern WordPress project, using all the latest front end development tools.",
"license": "MIT",
"require-dev": {
Expand Down
5,024 changes: 3,666 additions & 1,358 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 4 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eightshift-boilerplate",
"version": "4.0.1",
"version": "4.0.2",
"description": "This repository contains all the tools you need to start building a modern WordPress project, using all the latest front end development tools.",
"author": "Team Eightshift",
"license": "MIT",
Expand All @@ -21,16 +21,11 @@
},
"devDependencies": {
"husky": "^3.0.9",
"webpack": "^4.40.0",
"webpack-cli": "^3.3.10",
"webpack-merge": "^4.2.2"
"webpack": "^4.41.4",
"webpack-cli": "^3.3.10"
},
"dependencies": {
"@babel/polyfill": "^7.6.0",
"@eightshift/frontend-libs": "^2.0.4",
"media-blender": "^2.1.0",
"normalize-scss": "^7.0.1",
"whatwg-fetch": "^3.0.0"
"@eightshift/frontend-libs": "^3.0.2"
},
"husky": {
"hooks": {
Expand Down
15 changes: 5 additions & 10 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
/* eslint-disable import/no-extraneous-dependencies, global-require */

// // Other build files.
const merge = require('webpack-merge');
const autoprefixer = require('autoprefixer');

// Generate webpack config for this project using options object.
const project = require('@eightshift/frontend-libs/webpack/postcss');

// You can append project specific config using this object.
const projectSpecific = {
plugins: [],
module.exports = {
plugins: [
autoprefixer,
],
};

module.exports = merge(project, projectSpecific);
11 changes: 0 additions & 11 deletions webpack-project.config.js

This file was deleted.

23 changes: 14 additions & 9 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,22 @@
* @since 4.0.0 Moved to eightshift-libs.
* @since 1.0.0
*/
const merge = require('webpack-merge');
const projectConfig = require('./webpack-project.config');

module.exports = (env, argv) => {

// Generate webpack config for this project using options object.
const project = require('./node_modules/@eightshift/frontend-libs/webpack/index.js')(argv.mode, projectConfig);
const projectConfig = {
config: {
projectDir: __dirname, // Current project directory absolute path.
projectUrl: 'dev.boilerplate.com', // Used for providing browsersync functionality.
projectPath: 'wp-content/themes/eightshift-boilerplate', // Project path relative to project root.
assetsPath: 'src/blocks/assets', // Assets path after projectPath location.
outputPath: 'public', // Public output path after projectPath location.
},
};

// You can append project specific config using this object.
const projectSpecific = {};
// Generate webpack config for this project using options object.
const project = require('./node_modules/@eightshift/frontend-libs/webpack')(argv.mode, projectConfig);

// Output webpack.
return merge(project, projectSpecific);
return {
...project,
};
};

0 comments on commit 0b47083

Please sign in to comment.