Skip to content

Commit

Permalink
Fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
clintandrewhall committed Jul 21, 2020
1 parent 3f1f5bd commit 0f500eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/storybook/storyshots.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ addSerializer(styleSheetSerializer);
initStoryshots({
configPath: path.resolve(__dirname, './../storybook'),
test: multiSnapshotWithOptions({}),
storyNameRegex:/^((?!.*?redux).)*$/
storyNameRegex: /^((?!.*?redux).)*$/,
});
4 changes: 2 additions & 2 deletions x-pack/plugins/canvas/storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = async ({ config }) => {
},
],
});

config.module.rules.push({
test: /\.mjs$/,
include: /node_modules/,
Expand Down Expand Up @@ -232,6 +232,6 @@ module.exports = async ({ config }) => {
config.resolve.alias.ng_mock$ = path.resolve(KIBANA_ROOT, 'src/test_utils/public/ng_mock');

config.resolve.extensions.push('.mjs');

return config;
};

0 comments on commit 0f500eb

Please sign in to comment.