@embroider/test-setup 3.0.4-unstable.fad2387 → 4.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Edward Faulkner
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/test-setup",
-  "version": "3.0.4-unstable.fad2387",
+  "version": "4.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
@@ -12,20 +12,19 @@
     "src/index.js"
   ],
   "dependencies": {
-    "broccoli-plugin": "^4.0.7",
     "lodash": "^4.17.21",
     "resolve": "^1.20.0"
   },
   "devDependencies": {
-    "@embroider/compat": "3.4.8-unstable.fad2387",
-    "@embroider/core": "3.4.8-unstable.fad2387",
-    "@embroider/webpack": "3.2.4-unstable.fad2387",
-    "@types/lodash": "^4.14.170"
+    "@types/lodash": "^4.14.170",
+    "@embroider/compat": "^3.4.8",
+    "@embroider/core": "^3.4.8",
+    "@embroider/webpack": "^4.0.0"
   },
   "peerDependencies": {
-    "@embroider/compat": "3.4.8-unstable.fad2387",
-    "@embroider/core": "3.4.8-unstable.fad2387",
-    "@embroider/webpack": "3.2.4-unstable.fad2387"
+    "@embroider/core": "^3.4.8",
+    "@embroider/compat": "^3.4.8",
+    "@embroider/webpack": "^4.0.0"
   },
   "peerDependenciesMeta": {
     "@embroider/compat": {
@@ -41,4 +40,4 @@
   "engines": {
     "node": "12.* || 14.* || >= 16"
   }
-}
+}

package/src/index.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.embroiderOptimized = exports.embroiderSafe = exports.maybeEmbroider = void 0;
-const broccoli_plugin_1 = __importDefault(require("broccoli-plugin"));
-const child_process_1 = require("child_process");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const ourPeerDeps = require('../package.json').peerDependencies;
 const embroiderDevDeps = {
@@ -29,6 +24,10 @@ function maybeEmbroider(app, opts = {}) {
     //  - we don't want to load any of these things until they're actually needed;
     //  - we can't use `await import()` because this function needs to be synchronous to go inside ember-cli-build.js
     /* eslint-disable @typescript-eslint/no-require-imports */
+    let { Webpack } = require(require.resolve('@embroider/webpack', {
+        paths: [app.project.root],
+        // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+    }));
     let Compat = require(require.resolve('@embroider/compat', {
         paths: [app.project.root],
         // eslint-disable-next-line @typescript-eslint/consistent-type-imports
@@ -46,25 +45,9 @@ function maybeEmbroider(app, opts = {}) {
             throw new Error(`No such scenario EMBROIDER_TEST_SETUP_OPTIONS=${process.env.EMBROIDER_TEST_SETUP_OPTIONS}`);
         }
     }
-    if (process.env.EMBROIDER_PREBUILD) {
-        return Compat.prebuild(app, opts);
-    }
-    return new BuildWithVite([]);
+    return Compat.compatBuild(app, Webpack, opts);
 }
 exports.maybeEmbroider = maybeEmbroider;
-class BuildWithVite extends broccoli_plugin_1.default {
-    build() {
-        return new Promise((resolve, reject) => {
-            const child = (0, child_process_1.spawn)(`npx vite build --outDir ${this.outputPath}`, {
-                cwd: process.cwd(),
-                shell: true,
-                stdio: 'inherit',
-                env: { ...process.env },
-            });
-            child.on('exit', code => (code === 0 ? resolve() : reject(new Error('vite build failed'))));
-        });
-    }
-}
 function embroiderSafe(extension) {
     return extendScenario({
         name: 'embroider-safe',