Merge pull request #195 from Bagaar/remove-build-logic

Remove automatic inclusion/exclusion of msw's worker file
Bagaar · Feb 7, 2024 · 1a0a322 · 1a0a322
2 parents 46b46eb + 11cf196
commit 1a0a322
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/index.js b/index.js
@@ -8,20 +8,4 @@ module.exports = {
       enableTypeScriptTransform: true,
     },
   },
-
-  treeForPublic(tree) {
-    const host = this._findHost();
-    const shouldExcludePublicFiles = host.env === 'production';
-
-    if (shouldExcludePublicFiles) {
-      return;
-    }
-
-    const funnel = require('broccoli-funnel');
-    const mergeTrees = require('broccoli-merge-trees');
-
-    return mergeTrees([tree, funnel(host.trees.public)], {
-      overwrite: true,
-    });
-  },
 };
diff --git a/package.json b/package.json
@@ -53,8 +53,6 @@
   },
   "dependencies": {
     "@babel/core": "^7.23.3",
-    "broccoli-funnel": "^3.0.5",
-    "broccoli-merge-trees": "^4.2.0",
     "ember-auto-import": "^2.7.0",
     "ember-cli-babel": "^8.2.0",
     "lodash.merge": "^4.6.2"
@@ -133,7 +131,7 @@
     "configPath": "tests/dummy/config"
   },
   "msw": {
-    "workerDirectory": "public"
+    "workerDirectory": "tests/dummy/public"
   },
   "release-it": {
     "plugins": {

diff --git a/public/mockServiceWorker.js → tests/dummy/public/mockServiceWorker.js b/public/mockServiceWorker.js → tests/dummy/public/mockServiceWorker.js
diff --git a/yarn.lock b/yarn.lock
@@ -3571,7 +3571,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
   integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==