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.

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

[WIP] Refactor core and frameworks to work with presets #4043

Merged
merged 19 commits into from
Sep 3, 2018
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix mergeBabel
  • Loading branch information
igor-dv committed Sep 2, 2018
commit 209fe99e4bba21320be75ec247ead70cdaea9137
4 changes: 2 additions & 2 deletions lib/core/src/server/mergeBabel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-param-reassign,no-shadow */
// based on https://raw.githubusercontent.com/neutrinojs/babel-merge
// https://github.com/neutrinojs/babel-merge
// we can't use this package because we need to have babel/core as a peer

import omit from 'object.omit';
@@ -13,7 +13,7 @@ function arrayMerge(source = [], overrides = []) {
function mergeArray(source = [], overrides = [], resolve, deepmergeOpts) {
return [...source, ...overrides].reduce((reduction, override) => {
const overrideName = resolve(Array.isArray(override) ? override[0] : override);
const overrideOptions = Array.isArray(override) ? override[1] : {};
const overrideOptions = Array.isArray(override) ? override[1] || {} : {};

const base = reduction.find(base => {
const baseName = resolve(Array.isArray(base) ? base[0] : base);