Repository: ember-cli/ember-cli
Pull request #9604 (2021-08-27 17:35:31)

update dependencies before beta release


Patch:
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index e77025639..f55dfc0a1 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8<% if (embroider) { %>",
+    "@ember/test-helpers": "^2.4.2<% if (embroider) { %>",
     "@embroider/compat": "^0.44.1",
     "@embroider/core": "^0.44.1",
     "@embroider/webpack": "^0.44.1<% } %>",
@@ -41,29 +41,28 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0<% if (welcome) { %>",
-    "ember-welcome-page": "^4.0.0<% } %>",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0<% if (welcome) { %>",
+    "ember-welcome-page": "^5.0.0<% } %>",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0<% if (embroider) { %>",
-    "webpack": "^5.40.0<% } %>"
+    "webpack": "^5.51.1<% } %>"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"


Test patch:
diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
index 5baeeac42..affc40826 100644
--- a/tests/fixtures/addon/defaults/package.json
+++ b/tests/fixtures/addon/defaults/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@embroider/test-setup": "^0.44.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -46,23 +46,22 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
+    "ember-source": "~4.0.0-beta.2",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.5.0",
+    "ember-template-lint": "^3.6.0",
     "ember-try": "^1.4.0",
-    "eslint": "^7.29.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0"
   },
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index b7fa28f62..afd3aea06 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@embroider/test-setup": "^0.44.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -46,24 +46,23 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
+    "ember-source": "~4.0.0-beta.2",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.5.0",
+    "ember-template-lint": "^3.6.0",
     "ember-try": "^1.4.0",
-    "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.29.0",
+    "ember-welcome-page": "^5.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0"
   },
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index c7ec52d5a..da7a40203 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -38,26 +38,25 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "ember-welcome-page": "^5.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0"
   },
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index c80d474f7..d2e85743f 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/tests/fixtures/app/embroider-no-welcome/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@embroider/compat": "^0.44.1",
     "@embroider/core": "^0.44.1",
     "@embroider/webpack": "^0.44.1",
@@ -41,28 +41,27 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0",
-    "webpack": "^5.40.0"
+    "webpack": "^5.51.1"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json
index a0b1666d1..67dee4b14 100644
--- a/tests/fixtures/app/embroider-yarn/package.json
+++ b/tests/fixtures/app/embroider-yarn/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@embroider/compat": "^0.44.1",
     "@embroider/core": "^0.44.1",
     "@embroider/webpack": "^0.44.1",
@@ -41,29 +41,28 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "ember-welcome-page": "^5.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0",
-    "webpack": "^5.40.0"
+    "webpack": "^5.51.1"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index a0b1666d1..67dee4b14 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/tests/fixtures/app/embroider/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@embroider/compat": "^0.44.1",
     "@embroider/core": "^0.44.1",
     "@embroider/webpack": "^0.44.1",
@@ -41,29 +41,28 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "ember-welcome-page": "^5.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0",
-    "webpack": "^5.40.0"
+    "webpack": "^5.51.1"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json
index 736721e65..6ffba9400 100644
--- a/tests/fixtures/app/nested-project/actual-project/package.json
+++ b/tests/fixtures/app/nested-project/actual-project/package.json
@@ -42,13 +42,12 @@
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.4",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.27.0-beta.3",
     "ember-template-lint": "^3.2.0",
-    "ember-welcome-page": "^4.0.0",
+    "ember-welcome-page": "^5.0.0",
     "eslint": "^7.24.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-ember": "^10.3.0",
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index c8b3daa97..af9ab7f18 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -38,25 +38,24 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0"
   },
diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json
index 965063373..831a4e779 100644
--- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json
+++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json
@@ -42,13 +42,12 @@
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.4",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.2",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.26.0-beta.2",
     "ember-template-lint": "^2.18.1",
-    "ember-welcome-page": "^4.0.0",
+    "ember-welcome-page": "^5.0.0",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-ember": "^10.2.0",
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index c7ec52d5a..da7a40203 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.8",
+    "@ember/test-helpers": "^2.4.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -38,26 +38,25 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0-beta.1",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.0",
+    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0-beta.6",
-    "ember-template-lint": "^3.5.0",
-    "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.29.0",
+    "ember-source": "~4.0.0-beta.2",
+    "ember-template-lint": "^3.6.0",
+    "ember-welcome-page": "^5.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.1",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-qunit": "^6.1.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0"
   },
diff --git a/tests/fixtures/brocfile-tests/app-test-import/node_modules/ember-test-addon/index.js b/tests/fixtures/brocfile-tests/app-test-import/node_modules/ember-test-addon/index.js
index 261b5a00e..3ca6e498a 100644
--- a/tests/fixtures/brocfile-tests/app-test-import/node_modules/ember-test-addon/index.js
+++ b/tests/fixtures/brocfile-tests/app-test-import/node_modules/ember-test-addon/index.js
@@ -5,20 +5,20 @@ const Plugin = require('broccoli-plugin');
 const mergeTrees = require('broccoli-merge-trees');
 const path = require('path');
 
-AddCustomFile.prototype = Object.create(Plugin.prototype);
-AddCustomFile.prototype.constructor = AddCustomFile;
-function AddCustomFile(inputNodes, options) {
-  this.path = options.path;
-  Plugin.call(this, inputNodes);
-}
+class AddCustomFile extends Plugin {
+  constructor(inputNodes, options) {
+    super(...arguments);
+    this.path = options.path;
+  }
 
-AddCustomFile.prototype.build = function() {
-  var outPath = path.join(this.outputPath, this.path);
-  fs.mkdirSync(path.dirname(outPath));
-  fs.writeFileSync(outPath, '// File for test tree imported and added via postprocessTree()');
-};
+  build() {
+    let outPath = path.join(this.path);
+    this.output.mkdirSync(path.dirname(outPath));
+    this.output.writeFileSync(outPath, '// File for test tree imported and added via postprocessTree()');
+  }
+}
 
-var customTestFilePath = 'my-custom-test-assets/test-dependency.js';
+const customTestFilePath = "my-custom-test-assets/test-dependency.js";
 
 module.exports = {
   name: require('./package').name,
diff --git a/tests/fixtures/brocfile-tests/multiple-sass-files/node_modules/broccoli-sass/index.js b/tests/fixtures/brocfile-tests/multiple-sass-files/node_modules/broccoli-sass/index.js
index 20d9dd22e..9080dc10e 100644
--- a/tests/fixtures/brocfile-tests/multiple-sass-files/node_modules/broccoli-sass/index.js
+++ b/tests/fixtures/brocfile-tests/multiple-sass-files/node_modules/broccoli-sass/index.js
@@ -24,18 +24,17 @@ function copyPreserveSync (src, dest) {
   }
 }
 
-module.exports = SassCompiler;
-SassCompiler.prototype = Object.create(Plugin.prototype);
-SassCompiler.prototype.constructor = SassCompiler;
-function SassCompiler (inputNodes, inputFile, outputFile, options) {
-  if (!(this instanceof SassCompiler)) return new SassCompiler(inputNodes, inputFile, outputFile, options);
-  Plugin.call(this, inputNodes);
-  this.inputFile = inputFile;
-  this.outputFile = outputFile;
-}
+class SassCompiler extends Plugin {
+  constructor(inputNodes, inputFile, outputFile, options) {
+    super(inputNodes, options);
+    this.inputFile = inputFile;
+    this.outputFile = outputFile;
+  }
 
-SassCompiler.prototype.build = function () {
-  copyPreserveSync(
-    path.join(this.inputPaths[0], this.inputFile),
-    path.join(this.outputPath, this.outputFile));
-};
+  build() {
+    copyPreserveSync(
+      path.join(this.inputPaths[0], this.inputFile),
+      path.join(this.outputPath, this.outputFile));
+  }
+}
+module.exports = SassCompiler;
diff --git a/tests/fixtures/preprocessor-tests/app-with-addon-with-preprocessors/node_modules/broccoli-sass/index.js b/tests/fixtures/preprocessor-tests/app-with-addon-with-preprocessors/node_modules/broccoli-sass/index.js
index 20d9dd22e..48dfda3f0 100644
--- a/tests/fixtures/preprocessor-tests/app-with-addon-with-preprocessors/node_modules/broccoli-sass/index.js
+++ b/tests/fixtures/preprocessor-tests/app-with-addon-with-preprocessors/node_modules/broccoli-sass/index.js
@@ -24,18 +24,17 @@ function copyPreserveSync (src, dest) {
   }
 }
 
-module.exports = SassCompiler;
-SassCompiler.prototype = Object.create(Plugin.prototype);
-SassCompiler.prototype.constructor = SassCompiler;
-function SassCompiler (inputNodes, inputFile, outputFile, options) {
-  if (!(this instanceof SassCompiler)) return new SassCompiler(inputNodes, inputFile, outputFile, options);
-  Plugin.call(this, inputNodes);
-  this.inputFile = inputFile;
-  this.outputFile = outputFile;
-}
+class SassCompiler extends Plugin {
+  constructor(inputNodes, inputFile, outputFile, options) {
+    super(inputNodes, options);
+    this.inputFile = inputFile;
+    this.outputFile = outputFile;
+  }
 
-SassCompiler.prototype.build = function () {
-  copyPreserveSync(
-    path.join(this.inputPaths[0], this.inputFile),
-    path.join(this.outputPath, this.outputFile));
-};
+  build() {
+    copyPreserveSync(
+      path.join(this.inputPaths[0], this.inputFile),
+      path.join(this.outputPath, this.outputFile));
+  }
+}
+module.exports = SassCompiler;
\ No newline at end of file
diff --git a/tests/fixtures/smoke-tests/with-template-failing-linting/node_modules/fake-template-linter/index.js b/tests/fixtures/smoke-tests/with-template-failing-linting/node_modules/fake-template-linter/index.js
index 99e9bbf23..cbf502a98 100644
--- a/tests/fixtures/smoke-tests/with-template-failing-linting/node_modules/fake-template-linter/index.js
+++ b/tests/fixtures/smoke-tests/with-template-failing-linting/node_modules/fake-template-linter/index.js
@@ -17,36 +17,32 @@ module.exports = {
   }
 };
 
-function TemplateLinter (inputNode, options) {
-  Plugin.call(this, [inputNode], {
-    annotation: options.annotation
-  });
-
-  this.options = options;
-}
-TemplateLinter.prototype = Object.create(Plugin.prototype);
-TemplateLinter.prototype.constructor = TemplateLinter;
+class TemplateLinter extends Plugin {
+  constructor(inputNode, options) {
+    super([inputNode], options);
+  }
 
-TemplateLinter.prototype.build = function () {
-  var basePath = this.inputPaths[0];
-  var templateFiles = walkSync(basePath)
-        .filter(function(entry) {
-          return /\.hbs$/.test(entry);
-        });
+  build() {
+    var basePath = this.inputPaths[0];
+    var templateFiles = walkSync(basePath)
+      .filter(function(entry) {
+        return /\.hbs$/.test(entry);
+      });
 
-  for (var i = 0; i < templateFiles.length; i++) {
-    var templateFilePath = templateFiles[i];
+    for (var i = 0; i < templateFiles.length; i++) {
+      var templateFilePath = templateFiles[i];
 
-    var contents = fs.readFileSync(path.join(basePath, templateFilePath), { encoding: 'utf8' });
-    var testContents = 'QUnit.test("TemplateLint: ' + templateFilePath + '", function(assert) {\n' +
-          'assert.ok(false, "DO NOT USE BADJUJU");\n' +
-          '})';
-    var testFilePath = path.join(this.outputPath, templateFilePath + '-test.js');
+      var contents = fs.readFileSync(path.join(basePath, templateFilePath), { encoding: 'utf8' });
+      var testContents = 'QUnit.test("TemplateLint: ' + templateFilePath + '", function(assert) {\n' +
+                         'assert.ok(false, "DO NOT USE BADJUJU");\n' +
+                         '})';
+      var testFilePath = path.join(this.outputPath, templateFilePath + '-test.js');
 
-    if (/BADJUJU/.test(contents)) {
-      fs.mkdirsSync(path.dirname(testFilePath));
+      if (/BADJUJU/.test(contents)) {
+        fs.mkdirsSync(path.dirname(testFilePath));
 
-      fs.writeFileSync(testFilePath, testContents, { encoding: 'utf8' });
+        fs.writeFileSync(testFilePath, testContents, { encoding: 'utf8' });
+      }
     }
   }
-};
+}