Skip to content

Commit 687e560

Browse files
authored
Merge branch 'next' into feat/negative-flags
2 parents 9e22efa + 98056bc commit 687e560

File tree

11 files changed

+10
-57
lines changed

11 files changed

+10
-57
lines changed

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
# Node dependencies
1616
node_modules
17-
!test/**/**/**/node_modules
17+
test/**/node_modules
18+
19+
# Lock files
20+
test/**/yarn.lock
21+
test/**/package-json.lock
1822

1923
# npm-debug log
2024
npm-debug.*
@@ -26,7 +30,6 @@ yarn-error.log
2630
coverage
2731
.nyc_output
2832

29-
# Test Compilation
3033
# lerna log
3134
lerna-debug.log
3235

test/config/multiple/all/multiple-config.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict';
22
const { stat } = require('fs');
3-
const { resolve, join } = require('path');
3+
const { resolve } = require('path');
44
const { run } = require('../../../utils/test-utils');
5-
const rimraf = require('rimraf');
6-
7-
const outputPath = join(__dirname, 'binary');
85

96
describe('multiple config files', () => {
10-
afterEach(() => rimraf.sync(outputPath));
11-
beforeAll(() => rimraf.sync(outputPath));
12-
137
it('Uses prod config from dot folder if present', (done) => {
148
const { stdout, stderr } = run(__dirname, [], false);
159
expect(stderr).toBeFalsy();

test/config/multiple/multiple-location/multiple-location-config.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict';
22
const { stat } = require('fs');
3-
const { resolve, join } = require('path');
3+
const { resolve } = require('path');
44
const { run } = require('../../../utils/test-utils');
5-
const rimraf = require('rimraf');
6-
7-
const outputPath = join(__dirname, 'binary');
85

96
describe('multiple dev config files with webpack.config.js', () => {
10-
afterEach(() => rimraf.sync(outputPath));
11-
beforeAll(() => rimraf.sync(outputPath));
12-
137
it('Uses webpack.config.development.js', (done) => {
148
const { stdout, stderr } = run(__dirname, [], false);
159
expect(stderr).toBeFalsy();

test/config/multiple/none and dev/dev-none-config.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict';
22
const { stat } = require('fs');
3-
const { resolve, join } = require('path');
3+
const { resolve } = require('path');
44
const { run } = require('../../../utils/test-utils');
5-
const rimraf = require('rimraf');
6-
7-
const outputPath = join(__dirname, 'binary');
85

96
describe('multiple config files', () => {
10-
afterEach(() => rimraf.sync(outputPath));
11-
beforeAll(() => rimraf.sync(outputPath));
12-
137
it('Uses dev config when both dev and none are present', (done) => {
148
const { stdout, stderr } = run(__dirname, [], false);
159
expect(stderr).toBeFalsy();

test/config/multiple/with-mode/multiple-config.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict';
22
const { stat } = require('fs');
3-
const { resolve, join } = require('path');
3+
const { resolve } = require('path');
44
const { run } = require('../../../utils/test-utils');
5-
const rimraf = require('rimraf');
6-
7-
const outputPath = join(__dirname, 'binary');
85

96
describe('multiple config files', () => {
10-
afterEach(() => rimraf.sync(outputPath));
11-
beforeAll(() => rimraf.sync(outputPath));
12-
137
it('Uses dev config when development mode is supplied', (done) => {
148
const { stdout, stderr } = run(__dirname, ['--mode', 'development'], false);
159
expect(stderr).toBeFalsy();

test/entry/scss/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/mode/mode-with-config/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/output/named-bundles/output-named-bundles.test.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
'use strict';
22
const { statSync } = require('fs');
3-
const { join, resolve } = require('path');
4-
const rimraf = require('rimraf');
3+
const { resolve } = require('path');
54
const { run } = require('../../utils/test-utils');
65

76
describe('output flag named bundles', () => {
8-
const clean = () => {
9-
rimraf.sync(join(__dirname, 'bin'));
10-
rimraf.sync(join(__dirname, 'dist'));
11-
rimraf.sync(join(__dirname, 'binary'));
12-
};
13-
14-
beforeEach(clean);
15-
16-
afterAll(clean);
17-
187
it('should output file given as flag instead of in configuration', () => {
198
const { stderr } = run(__dirname, ['-c', resolve(__dirname, 'webpack.config.js'), '--output', './binary/a.bundle.js'], false);
209
expect(stderr).toBeFalsy();

test/stats/cli-flags/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/stats/config/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)