Remove ES2015 'module' field for 5x branch

.eslintignore

@@ -5,6 +5,3 @@ docs/_site/
 docs/js/
 docs/releases/
 docs/assets/js/
-
-# has "invalid" ESM syntax
-rollup.config.js

.travis.yml

@@ -28,15 +28,16 @@ before_script:
   # these build targets only need to run once per build, so let's conserve a few resources
   # ESLint only supports Node >=4
   - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run lint; fi
+  - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run lint-markdown; fi
   - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run test-headless -- --allow-chrome-as-root; fi
   - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run test-webworker -- --allow-chrome-as-root; fi
-  - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run test-esm-bundle; fi
   - if [ "x$TRAVIS_NODE_VERSION" = "x10" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test-cloud; fi
 
-script: npm run test-node
+script:
+  - npm run test-node
 
 after_success:
-  - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run test-coverage -- --allow-chrome-as-root && cat ./coverage/lcov.info | coveralls lib; fi
+  - if [ "x$TRAVIS_NODE_VERSION" = "x10" ]; then npm run test-coverage && cat ./coverage/lcov.info | coveralls lib; fi
 
 git:
-  depth: 1
+  depth: 10

package.json

@@ -14,26 +14,22 @@
   },
   "license": "BSD-3-Clause",
   "scripts": {
-    "test-node": "mocha --recursive -R dot test/**-test.js",
+    "test-node": "mocha --recursive -R dot test/",
     "test-dev": "npm run test-node -- --watch -R min",
-    "test-headless": "mochify --recursive -R dot --grep WebWorker --invert --plugin [ proxyquire-universal ] test/**-test.js",
-    "test-coverage": "mochify --recursive -R dot --grep WebWorker --invert --plugin [ proxyquire-universal ] --plugin [ mochify-istanbul --exclude '**/test/**' --report text --report lcovonly --dir ./coverage ] test/**-test.js",
+    "test-headless": "mochify --recursive -R dot --grep WebWorker --invert --plugin [ proxyquire-universal ] test/**.js",
+    "test-coverage": "mochify --recursive -R dot --grep WebWorker --invert --plugin [ proxyquire-universal ] --plugin [ mochify-istanbul --exclude '**/test/**' --report text --report lcovonly --dir ./coverage ] test/**.js",
     "test-cloud": "npm run test-headless -- --wd",
     "test-webworker": "mochify --https-server 8080 test/webworker/webworker-support-assessment.js",
-    "test-esm": "mocha -r esm test/es2015/module-support-assessment-test.mjs",
-    "test-esm-bundle": "node test/es2015/check-esm-bundle-is-runnable.js",
-    "test": "run-s test-node test-headless test-webworker test-esm",
+    "test-es-module": "mocha -r esm test/es2015/module-support-assessment-test.mjs",
+    "test": "run-s test-node test-headless test-webworker test-es-module",
     "check-dependencies": "dependency-check package.json --unused --no-dev --ignore-module coveralls --ignore-module esm",
-    "build": "run-p build-*",
-    "build-bundle": "node ./build.js",
-    "build-esm": "rollup -c",
+    "build": "node ./build.js",
     "lint": "run-p lint-js lint-markdown",
     "lint-js": "eslint '**/*.{js,mjs}'",
     "lint-markdown": "find docs -type f -name '*.md' ! -name 'changelog.md' | xargs markdownlint",
     "precommit": "lint-staged",
     "pretest-webworker": "npm run build",
     "prebuild": "rimraf pkg && npm run check-dependencies",
-    "postbuild": "run-s test-esm-bundle",
     "prepublishOnly": "npm run build",
     "preversion": "./scripts/preversion.sh",
     "postversion": "./scripts/postversion.sh"
@@ -72,13 +68,7 @@
     "proxyquire": "^1.8.0",
     "proxyquire-universal": "^1.0.8",
     "proxyquireify": "^3.2.1",
-    "puppeteer": "^1.4.0",
     "rimraf": "^2.5.3",
-    "rollup": "^0.59.3",
-    "rollup-plugin-commonjs": "^9.1.3",
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.2.1",
-    "rollup-plugin-node-resolve": "^3.3.0",
     "samsam": "^1.3.0"
   },
   "files": [
@@ -92,7 +82,6 @@
     "README.md"
   ],
   "main": "./lib/sinon.js",
-  "module": "./pkg/sinon-esm.js",
   "cdn": "./pkg/sinon.js",
   "jsdelivr": "./pkg/sinon.js"
 }

test/es2015/.eslintrc.yml

@@ -1,3 +1,2 @@
 parserOptions:
   sourceType: module
-  ecmaVersion: 2017