feat!: upgrade to webpack5

Closes: #15

lib/webpack.config.js

@@ -38,14 +38,6 @@ module.exports = function (env, options, runner) {
         path.join(__dirname, '../node_modules')
       ]
     },
-    node: {
-      dgram: 'empty',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      dns: 'empty',
-      child_process: 'empty'
-    },
     module: {
       rules: [
         {

package.json

@@ -6,24 +6,27 @@
   "dependencies": {
     "ansi-colors": "^4.1.1",
     "glob": "^7.2.0",
+    "path-browserify": "^1.0.1",
+    "process": "^0.11.10",
     "puppeteer": "^12.0.1",
     "raw-loader": "^4.0.2",
     "readable-stream": "^3.6.0",
     "rimraf": "^3.0.2",
     "st": "^3.0.0",
-    "strip-ansi": "^6.0.0",
-    "webpack": "^4.46.0",
-    "webpack-merge": "^4.2.2",
+    "stream-browserify": "^3.0.0",
+    "strip-ansi": "^6.0.1",
+    "webpack": "^5.65.0",
+    "webpack-merge": "^5.8.0",
     "yargs": "^17.3.0"
   },
   "bin": {
     "polendina": "./polendina-cli.js",
     "polendina-node": "./polendina-node-cli.js"
   },
   "scripts": {
-    "lint": "npx standard",
+    "lint": "npm_config_yes=true npx standard",
     "test:install": "for f in $(cd test/fixtures/; ls); do (cd test/fixtures/$f && grep devDependencies package.json > /dev/null && npm i --no-audit --no-fund --no-package-lock) || true; done",
-    "test:run": "npx mocha test/test-*.js",
+    "test:run": "npm_config_yes=true npx mocha test/test-*.js",
     "test": "npm run lint && npm run test:install && npm run test:run"
   },
   "repository": {

polendina.js

@@ -5,7 +5,7 @@ const http = require('http')
 const st = require('st')
 const rimraf = promisify(require('rimraf'))
 const webpack = promisify(require('webpack'))
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const puppeteer = require('./lib/puppeteer')
 
 class Polendina {
@@ -34,9 +34,25 @@ class Polendina {
   async build () {
     let webpackConfig = require('./lib/webpack.config')(process.env, this._options, this._runnerModule)
 
+    if (this._options.runner === 'tape') {
+      webpackConfig = merge(webpackConfig, {
+        resolve: {
+          fallback: {
+            stream: path.join(__dirname, 'node_modules', 'stream-browserify'),
+            path: path.join(__dirname, 'node_modules', 'path-browserify')
+          }
+        },
+        plugins: [
+          new webpack.ProvidePlugin({
+            process: 'process/browser'
+          })
+        ]
+      })
+    }
+
     if (this._options.webpackConfig) {
       const userConfig = require(path.join(process.cwd(), this._options.webpackConfig))
-      webpackConfig = merge.smart(webpackConfig, userConfig)
+      webpackConfig = merge(webpackConfig, userConfig)
     }
 
     await fs.mkdir(this.outputDir, { recursive: true })

test/fixtures/bare-async-failure/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

test/fixtures/bare-async-failure/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 module.exports = async function () {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

test/fixtures/bare-async-failure/test-2.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('./')
 
 module.exports.test1 = async function () {
@@ -7,5 +7,5 @@ module.exports.test1 = async function () {
 }
 
 module.exports.test2 = async function () {
-  assert.fail('nope', 'faily mcfailface')
+  assert.fail('faily mcfailface')
 }

test/fixtures/bare-async/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

test/fixtures/bare-async/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 module.exports = async function () {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

test/fixtures/bare-async/test-2.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('./')
 
 module.exports.test1 = async function () {

test/fixtures/bare-sync-failure/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

test/fixtures/bare-sync-failure/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
   console.log('testing is in serviceworker')

test/fixtures/bare-sync-failure/test-2.js

@@ -1,6 +1,6 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('.')
 
 console.log('testing bare fixture')
 assert.strictEqual(index, 'bare test fixture')
-assert.fail('nope', 'faily mcfailface')
+assert.fail('faily mcfailface')

test/fixtures/bare-sync/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

test/fixtures/bare-sync/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
   console.log('testing is in serviceworker')

test/fixtures/bare-sync/test-2.js

@@ -1,4 +1,5 @@
-const assert = require('assert')
+
+const { assert } = require('chai')
 const index = require('./')
 
 console.log('testing bare fixture')

test/fixtures/mocha-failure/package.json

@@ -13,6 +13,7 @@
     "url": "https://github.com/rvagg/polendina.git"
   },
   "devDependencies": {
-    "mocha": "^7.0.0"
+    "mocha": "^7.0.0",
+    "chai": "^4.3.4"
   }
 }

test/fixtures/mocha-failure/test.js

@@ -1,5 +1,5 @@
 /* globals describe it WorkerGlobalScope ServiceWorkerGlobalScope */
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 1 - worker', () => {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

test/fixtures/mocha/package.json

@@ -13,6 +13,7 @@
     "url": "https://github.com/rvagg/polendina.git"
   },
   "devDependencies": {
-    "mocha": "^7.0.0"
+    "mocha": "^7.0.0",
+    "chai": "^4.3.4"
   }
 }

test/fixtures/mocha/test-1.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 1', () => {
   it('test case 1', () => {

test/fixtures/mocha/test-2.js

@@ -1,6 +1,6 @@
 /* globals describe it WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 2 - worker', () => {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

test/fixtures/mocha/test-3.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 3', () => {
   it('test case 1', () => {

test/fixtures/mocha8/package.json

@@ -13,6 +13,7 @@
     "url": "https://github.com/rvagg/polendina.git"
   },
   "devDependencies": {
-    "mocha": "^8.0.0"
+    "mocha": "^8.0.0",
+    "chai": "^4.3.4"
   }
 }

test/fixtures/mocha8/test-1.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 1', () => {
   it('test case 1', () => {

test/fixtures/mocha8/test-2.js

@@ -1,6 +1,6 @@
 /* globals describe it WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 2 - worker', () => {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

test/fixtures/mocha8/test-3.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 3', () => {
   it('test case 1', () => {

test/fixtures/tape/package.json

@@ -13,6 +13,6 @@
     "url": "https://github.com/rvagg/polendina.git"
   },
   "devDependencies": {
-    "tape": "^5.0.1"
+    "tape": "^5.3.2"
   }
 }

test/fixtures/webpack-merge/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

test/fixtures/webpack-merge/test.js

@@ -1,7 +1,6 @@
-const assert = require('assert')
-const qs = require('querystring')
+const { assert } = require('chai')
 
 assert.strictEqual(typeof assert.ok, 'function')
 console.log('assert.ok() is a function')
-assert.strictEqual(typeof qs.parse, 'function')
-console.log('querystring.parse() is a function')
+assert.strictEqual(WOOP, 'woop') // eslint-disable-line
+console.log('WOOP is set')

test/fixtures/webpack-merge/webpack.config.js

@@ -1,5 +1,5 @@
+const webpack = require('webpack')
+
 module.exports = {
-  node: {
-    querystring: 'empty'
-  }
+  plugins: [new webpack.DefinePlugin({ WOOP: '"woop"' })]
 }

test/test-bare-async.js

@@ -70,7 +70,7 @@ testing bare fixture
     ✔ test1
     ✘ test2
 `
-  const expectedStderr = 'AssertionError: \'nope\' undefined \'faily mcfailface\''
+  const expectedStderr = 'AssertionError: faily mcfailface'
 
   it('should fail in page', async () => {
     let { stdout, stderr, code } = await runCli(bareSyncFailureFixture, '--runner=bare-async')

test/test-bare-sync.js

@@ -66,7 +66,7 @@ testing is WORKER
 testing bare fixture
   ✘ test-2.js
 `
-  const expectedStderr = 'AssertionError: \'nope\' undefined \'faily mcfailface\''
+  const expectedStderr = 'AssertionError: faily mcfailface'
 
   it('should fail in page', async () => {
     let { stdout, stderr, code } = await runCli(bareSyncFailureFixture, '--runner=bare-sync')

test/test-polendina-node.js

@@ -44,7 +44,7 @@ Took X seconds
     const { stdout, stderr, code } = await runCli('bare-sync', bareSyncFailureFixture)
     assert.strictEqual(code, 1, 'exited with non-zero exit code')
     assert.strictEqual(removeTiming(stdout), expected)
-    assert.ok(stderr.includes('AssertionError [ERR_ASSERTION]: \'nope\' != \'faily mcfailface\''), 'stderr contains expected output')
+    assert.ok(stderr.includes('AssertionError: faily mcfailface'), 'stderr contains expected output')
   })
 })
 
@@ -78,6 +78,6 @@ Took X seconds
     const { stdout, stderr, code } = await runCli('bare-async', bareAsyncFailureFixture)
     assert.strictEqual(code, 1, 'exited with non-zero exit code')
     assert.strictEqual(removeTiming(stdout), expected)
-    assert.ok(stderr.includes('AssertionError [ERR_ASSERTION]: \'nope\' != \'faily mcfailface\''), 'stderr contains expected output')
+    assert.ok(stderr.includes('AssertionError: faily mcfailface'), 'stderr contains expected output')
   })
 })

test/test-webpack-merge.js

@@ -8,26 +8,26 @@ const webpackMergeFixture = path.join(__dirname, 'fixtures/webpack-merge')
 
 describe('basic webpack-merge', function () {
   this.timeout(20000)
-  it('should run plain', async () => {
+  it('should run with a custom config', async () => {
     const expected = `
 assert.ok() is a function
-querystring.parse() is a function
+WOOP is set
   ✔ test.js
 `
-    const { stdout, code } = await runCli(webpackMergeFixture, '--runner=bare-sync')
+    const { stdout, code } = await runCli(webpackMergeFixture, '--runner=bare-sync --webpack-config webpack.config.js')
     assert.strictEqual(code, 0, 'exited with zero exit code')
     assert.ok(stdout.includes(expected), 'stdout contains expected test output')
     assert.ok(stdout.includes('Running bare-sync page tests with Puppeteer'), 'stdout contains expected output for running in page')
   })
 
-  it('should fail with custom config', async () => {
+  it('should fail without a custom config', async () => {
     const expectedStdout = `
 assert.ok() is a function
   ✘ test.js
 `
-    const expectedStderr = '\'undefined\' === \'function\''
+    const expectedStderr = 'WOOP is not defined'
 
-    const { stdout, stderr, code } = await runCli(webpackMergeFixture, '--runner=bare-sync --webpack-config webpack.config.js')
+    const { stdout, stderr, code } = await runCli(webpackMergeFixture, '--runner=bare-sync')
     assert.strictEqual(code, 1, 'exited with zero exit code')
     assert.ok(stdout.includes(expectedStdout), 'stdout contains expected test output')
     assert.ok(stderr.includes(expectedStderr), 'stderr contains expected test output')