Skip to content
This repository has been archived by the owner on Jul 19, 2021. It is now read-only.

Add test for 'webpack.commonExcludes' config #739

Merged
merged 1 commit into from
Sep 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/slate-tools/tools/webpack/config/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const SlateConfig = require('@shopify/slate-config');

const commonExcludes = require('../common-excludes');
const commonExcludes = require('./utilities/common-excludes');
const {entrypointFiles} = require('../entrypoints');
const config = new SlateConfig(require('../../../slate-tools.schema'));

Expand Down
2 changes: 1 addition & 1 deletion packages/slate-tools/tools/webpack/config/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const SlateConfig = require('@shopify/slate-config');

const webpackCoreConfig = require('./core');
const babel = require('./parts/babel');
const commonExcludes = require('../common-excludes');
const commonExcludes = require('./utilities/common-excludes');
const {templateFiles, layoutFiles} = require('../entrypoints');
const HtmlWebpackIncludeLiquidStylesPlugin = require('../html-webpack-include-chunks');
const config = new SlateConfig(require('../../../slate-tools.schema'));
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-tools/tools/webpack/config/parts/babel.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const fs = require('fs');
const SlateConfig = require('@shopify/slate-config');

const commonExcludes = require('../../common-excludes');
const commonExcludes = require('../utilities/common-excludes');
const config = new SlateConfig(require('../../../../slate-tools.schema'));

module.exports = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const autoprefixer = require('autoprefixer');
const cssnano = require('cssnano');
const SlateConfig = require('@shopify/slate-config');

const commonExcludes = require('../../common-excludes');
const commonExcludes = require('../utilities/common-excludes');
const config = new SlateConfig(require('../../../../slate-tools.schema'));

const extractStyles = new ExtractTextPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-tools/tools/webpack/config/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const SlateTagPlugin = require('@shopify/slate-tag-webpack-plugin');

const babel = require('./parts/babel');
const sass = require('./parts/sass.prod');
const commonExcludes = require('../common-excludes');
const commonExcludes = require('./utilities/common-excludes');
const webpackCoreConfig = require('./core');
const packageJson = require('../../../package.json');
const getChunkName = require('../get-chunk-name');
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
test(`includes the values specified in 'webpack.commonExcludes' config`, () => {
global.slateUserConfig = {
'webpack.commonExcludes': ['some', 'values'],
};
const commonExcludes = require('../common-excludes');

global.slateUserConfig['webpack.commonExcludes'].forEach((item) => {
expect(commonExcludes().toString()).toMatch(item);
});
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const SlateConfig = require('@shopify/slate-config');
const config = new SlateConfig(require('../../slate-tools.schema'));
const config = new SlateConfig(require('../../../../slate-tools.schema'));

module.exports = (...params) =>
new RegExp([...config.get('webpack.commonExcludes'), ...params].join('|'));