Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 15074da

Browse files
joshwiensjoshwiens
committed
refactor: Convert tests & configs to import syntax
1 parent d7df331 commit 15074da

File tree

19 files changed

+81
-72
lines changed

19 files changed

+81
-72
lines changed

‎test/TestCases.test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint-disable */
2-
var fs = require("fs");
3-
var vm = require("vm");
4-
var path = require("path");
5-
var webpack = require("webpack");
6-
var ExtractTextPlugin = require("../src");
2+
import fs from "fs";
3+
import vm from "vm";
4+
import path from "path";
5+
import webpack from "webpack";
6+
import ExtractTextPlugin from '../src';
77

88
var cases = process.env.CASES ? process.env.CASES.split(",") : fs.readdirSync(path.join(__dirname, "cases"));
99

‎test/cases/common-async/webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const webpack = require('webpack');
2-
const ExtractTextPlugin = require('../../../src/index');
1+
import webpack from 'webpack';
2+
import ExtractTextPlugin from '../../../src/index';
33

44
module.exports = {
55
entry: './index',

‎test/cases/merging-chunk/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
plugins: [

‎test/cases/merging-multiple-entries-shared/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: {
45
a: './a',

‎test/cases/merging-multiple-entries/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: {
45
a: './a',

‎test/cases/multiple-entries-filename/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: {
45
'js/a': './a',

‎test/cases/multiple-entries/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: {
45
a: './a',

‎test/cases/nested/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
plugins: [

‎test/cases/optimize-tree/webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
2-
const webpack = require('webpack');
1+
import webpack from 'webpack';
2+
import ExtractTextPlugin from '../../../src/index';
33

44
module.exports = {
55
entry: './index.js',

‎test/cases/order-undefined-error/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index.js',
45
module: {

‎test/cases/simple-query-object/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
module: {

‎test/cases/simple-queryless-object/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
module: {

‎test/cases/simple/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
plugins: [

‎test/cases/splitted-chunk/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: './index',
45
plugins: [

‎test/cases/splitted-multiple-entries/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const ExtractTextPlugin = require('../../../src/');
1+
import ExtractTextPlugin from '../../../src/index';
2+
23
module.exports = {
34
entry: {
45
a: './a',

‎test/define-fallback.test.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,66 @@
1-
// import ExtractTextPlugin from '../src';
2-
// const loader = require.resolve('../src/loader');
3-
/* eslint-disable */
4-
var ExtractTextPlugin = require("../src/");
5-
var loader = require.resolve('../src/loader');
1+
import ExtractTextPlugin from '../src';
2+
3+
const loader = require.resolve('../src/loader');
4+
65

76
describe('Define Fallback', () => {
87
it('accepts a fallback string', () => {
98
expect(ExtractTextPlugin.extract({
109
fallback: 'style-loader',
11-
use: 'css-loader'
10+
use: 'css-loader',
1211
})).toEqual([
1312
{ loader, options: { omit: 1, remove: true } },
1413
{ loader: 'style-loader' },
15-
{ loader: 'css-loader' }
14+
{ loader: 'css-loader' },
1615
]);
1716
});
1817

1918
it('accepts a fallback string with legacy fallbackLoader option', () => {
2019
expect(ExtractTextPlugin.extract({
2120
fallback: 'style-loader',
22-
use: 'css-loader'
21+
use: 'css-loader',
2322
})).toEqual([
2423
{ loader, options: { omit: 1, remove: true } },
2524
{ loader: 'style-loader' },
26-
{ loader: 'css-loader' }
25+
{ loader: 'css-loader' },
2726
]);
2827
});
2928

3029
it('accepts a chained fallback string', () => {
3130
expect(ExtractTextPlugin.extract({
3231
fallback: 'something-loader!style-loader',
33-
use: 'css-loader'
32+
use: 'css-loader',
3433
})).toEqual([
3534
{ loader, options: { omit: 2, remove: true } },
3635
{ loader: 'something-loader' },
3736
{ loader: 'style-loader' },
38-
{ loader: 'css-loader' }
37+
{ loader: 'css-loader' },
3938
]);
4039
});
4140

4241
it('accepts a fallback object', () => {
4342
expect(ExtractTextPlugin.extract({
4443
fallback: { loader: 'style-loader' },
45-
use: 'css-loader'
44+
use: 'css-loader',
4645
})).toEqual([
4746
{ loader, options: { omit: 1, remove: true } },
4847
{ loader: 'style-loader' },
49-
{ loader: 'css-loader' }
48+
{ loader: 'css-loader' },
5049
]);
5150
});
5251

5352
it('accepts an array of fallback objects', () => {
5453
expect(ExtractTextPlugin.extract({
5554
fallback: [
5655
{ loader: 'something-loader' },
57-
{ loader: 'style-loader' }
56+
{ loader: 'style-loader' },
5857
],
59-
use: 'css-loader'
58+
use: 'css-loader',
6059
})).toEqual([
6160
{ loader, options: { omit: 2, remove: true } },
6261
{ loader: 'something-loader' },
6362
{ loader: 'style-loader' },
64-
{ loader: 'css-loader' }
63+
{ loader: 'css-loader' },
6564
]);
6665
});
6766
});

‎test/define-loader.test.js

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,106 @@
1-
// import ExtractTextPlugin from '../src';
2-
// const loader = require.resolve('../src/loader');
3-
/* eslint-disable */
4-
var ExtractTextPlugin = require("../src/");
5-
var loader = require.resolve('../src/loader');
1+
import ExtractTextPlugin from '../src';
2+
3+
const loader = require.resolve('../src/loader');
4+
65

76
describe('specifying loader', () => {
87
it('accepts a loader string', () => {
98
expect(ExtractTextPlugin.extract('css-loader')).toEqual([
109
{ loader, options: { omit: 0, remove: true } },
11-
{ loader: 'css-loader' }
10+
{ loader: 'css-loader' },
1211
]);
1312
});
1413

1514
it('accepts a chained loader string', () => {
1615
expect(ExtractTextPlugin.extract(
17-
'css-loader!postcss-loader!sass-loader'
16+
'css-loader!postcss-loader!sass-loader',
1817
)).toEqual([
1918
{ loader, options: { omit: 0, remove: true } },
2019
{ loader: 'css-loader' },
2120
{ loader: 'postcss-loader' },
22-
{ loader: 'sass-loader' }
21+
{ loader: 'sass-loader' },
2322
]);
2423
});
2524

2625
it('accepts an array of loader names', () => {
2726
expect(ExtractTextPlugin.extract(
28-
['css-loader', 'postcss-loader', 'sass-loader']
27+
['css-loader', 'postcss-loader', 'sass-loader'],
2928
)).toEqual([
3029
{ loader, options: { omit: 0, remove: true } },
3130
{ loader: 'css-loader' },
3231
{ loader: 'postcss-loader' },
33-
{ loader: 'sass-loader' }
32+
{ loader: 'sass-loader' },
3433
]);
3534
});
3635

3736
it('accepts a loader object', () => {
3837
expect(ExtractTextPlugin.extract({ use: 'css-loader' })).toEqual([
3938
{ loader, options: { omit: 0, remove: true } },
40-
{ loader: 'css-loader' }
39+
{ loader: 'css-loader' },
4140
]);
4241
});
4342

4443
it('accepts an array of loader names in loader object', () => {
4544
expect(ExtractTextPlugin.extract({
46-
use: ['css-loader', 'postcss-loader', 'sass-loader']
45+
use: ['css-loader', 'postcss-loader', 'sass-loader'],
4746
})).toEqual([
4847
{ loader, options: { omit: 0, remove: true } },
4948
{ loader: 'css-loader' },
5049
{ loader: 'postcss-loader' },
51-
{ loader: 'sass-loader' }
50+
{ loader: 'sass-loader' },
5251
]);
5352
});
5453

5554
it('accepts a loader object with an options object', () => {
5655
expect(ExtractTextPlugin.extract(
57-
{ use: 'css-loader', options: { modules: true } }
56+
{ use: 'css-loader', options: { modules: true } },
5857
)).toEqual([
5958
{ loader, options: { omit: 0, remove: true } },
60-
{ use: 'css-loader', options: { modules: true } }
59+
{ use: 'css-loader', options: { modules: true } },
6160
]);
6261
});
6362

6463
it('accepts a loader object with an options object in array of loaders', () => {
6564
expect(ExtractTextPlugin.extract({
6665
use: [
6766
{ loader: 'css-loader', options: { modules: true } },
68-
'postcss-loader'
69-
]
67+
'postcss-loader',
68+
],
7069
})).toEqual([
7170
{ loader, options: { omit: 0, remove: true } },
7271
{ loader: 'css-loader', options: { modules: true } },
73-
{ loader: 'postcss-loader' }
72+
{ loader: 'postcss-loader' },
7473
]);
7574
});
7675

7776
it('accepts a loader object with a (legacy) query object', () => {
7877
expect(ExtractTextPlugin.extract(
79-
{ use: 'css-loader', query: { modules: true } }
78+
{ use: 'css-loader', query: { modules: true } },
8079
)).toEqual([
8180
{ loader, options: { omit: 0, remove: true } },
82-
{ use: 'css-loader', query: { modules: true } }
81+
{ use: 'css-loader', query: { modules: true } },
8382
]);
8483
});
8584

8685
it('accepts a loader object with a legacy loader field', () => {
8786
expect(ExtractTextPlugin.extract(
88-
{ loader: 'css-loader', query: { modules: true } }
87+
{ loader: 'css-loader', query: { modules: true } },
8988
)).toEqual([
9089
{ loader, options: { omit: 0, remove: true } },
91-
{ loader: 'css-loader', query: { modules: true } }
90+
{ loader: 'css-loader', query: { modules: true } },
9291
]);
9392
});
9493

9594
it('accepts an array of loader objects', () => {
9695
expect(ExtractTextPlugin.extract([
9796
{ loader: 'css-loader' },
9897
{ loader: 'postcss-loader' },
99-
{ loader: 'sass-loader' }
98+
{ loader: 'sass-loader' },
10099
])).toEqual([
101100
{ loader, options: { omit: 0, remove: true } },
102101
{ loader: 'css-loader' },
103102
{ loader: 'postcss-loader' },
104-
{ loader: 'sass-loader' }
103+
{ loader: 'sass-loader' },
105104
]);
106105
});
107-
})
106+
});

‎test/extract.test.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* eslint-disable */
2-
var ExtractTextPlugin = require("../src/");
3-
var loader = require.resolve('../src/loader');
1+
/* eslint-disable no-unused-expressions */
2+
import ExtractTextPlugin from '../src';
3+
4+
const loader = require.resolve('../src/loader');
45

56
describe('ExtractTextPlugin.extract()', () => {
67
it('throws if given multiple arguments', () => {
@@ -13,11 +14,11 @@ describe('ExtractTextPlugin.extract()', () => {
1314
expect(ExtractTextPlugin.extract({
1415
fallback: 'style-loader',
1516
use: 'css-loader',
16-
publicPath: '/test'
17+
publicPath: '/test',
1718
})).toEqual([
1819
{ loader, options: { omit: 1, remove: true, publicPath: '/test' } },
1920
{ loader: 'style-loader' },
20-
{ loader: 'css-loader' }
21+
{ loader: 'css-loader' },
2122
]);
2223
});
2324
});

‎test/schema-validation.test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
// import ExtractTextPlugin from '../src';
2-
// const loader = require.resolve('../src/loader');
3-
/* eslint-disable */
4-
var ExtractTextPlugin = require("../src/");
5-
var loader = require.resolve('../src/loader');
1+
/* eslint-disable no-unused-expressions */
2+
import ExtractTextPlugin from '../src';
3+
64

75
describe('json schema validation', () => {
86
it('does not throw if a filename is specified', () => {

0 commit comments

Comments
 (0)