Skip to content

Commit

Permalink
Merge pull request #205 from infinum/feature/broken-build
Browse files Browse the repository at this point in the history
Fixing broken build for the latest release
  • Loading branch information
iruzevic authored Apr 28, 2020
2 parents eeb1727 + f505d55 commit ec1451c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/public
/vendor
/node_modules
/storybook
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a

## [Unreleased]

*No documentation available about unreleased changes as of yet.*

### Removed
- Removed `Config` dependency from enqueue classes
- Removed .babelrc file.

### Added
- Added babel.config.js

**BRAKING CHANGES:**
- Please replace you old .babelrc file with the new one babel.config.js and convert it from .json to .js format.

## [4.1.0] - 2020-03-05

Expand Down
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: './node_modules/@eightshift/frontend-libs/babel/babel.config.js',
};
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
"precommit": "npm run lint",
"start": "webpack --progress --watch --display-error-details --display-reasons --mode development",
"build": "webpack --progress --mode production",
"blocksExample": "cp -R ./node_modules/@eightshift/frontend-libs/blocks/init/src/blocks/custom/example ./src/blocks/custom/ && composer dump-autoload"
"blocksExample": "cp -R ./node_modules/@eightshift/frontend-libs/blocks/init/src/blocks/custom/example ./src/blocks/custom/ && composer dump-autoload",
"storybookBuild": "build-storybook -s public -o storybook",
"storybook": "start-storybook -s public"
},
"devDependencies": {
"husky": "^3.0.9",
Expand Down
10 changes: 3 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This is a main entrypoint for Webpack config.
* All the settings are pulled from node_modules/@eightshift/frontend-libs/webpack.
* We are loading mostly used configuration but you can always override or turn off the default setup and provide your own.
* Please refere to Eigthshift-libs wiki for details.
* Please referer to Eightshift-libs wiki for details.
*
* @since 4.0.0 Moved to eightshift-libs.
* @since 1.0.0
Expand All @@ -14,15 +14,11 @@ module.exports = (env, argv) => {
const projectConfig = {
config: {
projectDir: __dirname, // Current project directory absolute path.
projectUrl: 'dev.boilerplate.com', // Used for providing browsersync functionality.
projectUrl: 'dev.eightshift-internal.com', // Used for providing browsersync functionality.
projectPath: 'wp-content/themes/eightshift-boilerplate', // Project path relative to project root.
},
};

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

return {
...project,
};
return require('./node_modules/@eightshift/frontend-libs/webpack')(argv.mode, projectConfig);
};

0 comments on commit ec1451c

Please sign in to comment.