diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index ee03f5b7f06..a5ce291b14d 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -57,7 +57,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] node-version: [10.x, 12.x, 14.x] - webpack-version: [next, latest] + webpack-version: [webpack-4, latest] steps: - uses: actions/checkout@v2 diff --git a/test/build-errors/errors.test.js b/test/build-errors/errors.test.js index 2ad43f87f5b..23d13c1fe35 100644 --- a/test/build-errors/errors.test.js +++ b/test/build-errors/errors.test.js @@ -22,7 +22,8 @@ describe('errors', () => { expect(json['hash']).toBeDefined(); expect(json['errors']).toHaveLength(1); - expect(json['errors'][0].message).toMatch(/Can't resolve/); + // `message` for `webpack@5` + expect(json['errors'][0].message ? json['errors'][0].message : json['errors'][0]).toMatch(/Can't resolve/); }); it('should store json to a file', (done) => { @@ -43,7 +44,8 @@ describe('errors', () => { expect(json['hash']).toBeDefined(); expect(json['errors']).toHaveLength(1); - expect(json['errors'][0].message).toMatch(/Can't resolve/); + // `message` for `webpack@5` + expect(json['errors'][0].message ? json['errors'][0].message : json['errors'][0]).toMatch(/Can't resolve/); done(); }); diff --git a/test/build-warnings/src/index.js b/test/build-warnings/src/index.js index 6d694816c32..17d6eb1b468 100644 --- a/test/build-warnings/src/index.js +++ b/test/build-warnings/src/index.js @@ -1,9 +1,9 @@ -let module; +let obj; try { - module = require('unknown'); + obj = require('unknown'); } catch (e) { // Ignore } -export default module +export default obj diff --git a/test/build-warnings/warnings.test.js b/test/build-warnings/warnings.test.js index a9ec06fe476..6b880996301 100644 --- a/test/build-warnings/warnings.test.js +++ b/test/build-warnings/warnings.test.js @@ -7,8 +7,6 @@ describe('warnings', () => { it('should output by default', () => { const { stdout, exitCode } = run(__dirname); - console.log(stdout); - expect(stdout).toMatch(/WARNING in/); expect(stdout).toMatch(/Error: Can't resolve/); expect(exitCode).toBe(0); @@ -24,7 +22,8 @@ describe('warnings', () => { expect(json['hash']).toBeDefined(); expect(json['warnings']).toHaveLength(1); - expect(json['warnings'][0].message).toMatch(/Can't resolve/); + // `message` for `webpack@5` + expect(json['warnings'][0].message ? json['warnings'][0].message : json['warnings'][0]).toMatch(/Can't resolve/); }); it('should store json to a file', (done) => { @@ -45,7 +44,8 @@ describe('warnings', () => { expect(json['hash']).toBeDefined(); expect(json['warnings']).toHaveLength(1); - expect(json['warnings'][0].message).toMatch(/Can't resolve/); + // `message` for `webpack@5` + expect(json['warnings'][0].message ? json['warnings'][0].message : json['warnings'][0]).toMatch(/Can't resolve/); done(); });