@embroider/test-setup 4.0.0 → 4.0.1-unstable.01e21e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/test-setup",
-  "version": "4.0.0",
+  "version": "4.0.1-unstable.01e21e6",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
@@ -12,19 +12,20 @@
     "src/index.js"
   ],
   "dependencies": {
+    "broccoli-plugin": "^4.0.7",
     "lodash": "^4.17.21",
     "resolve": "^1.20.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.170",
-    "@embroider/compat": "^3.4.8",
-    "@embroider/core": "^3.4.8",
-    "@embroider/webpack": "^4.0.0"
+    "@embroider/compat": "^3.7.1-unstable.01e21e6",
+    "@embroider/webpack": "^4.0.9-unstable.01e21e6",
+    "@embroider/core": "^3.4.20-unstable.01e21e6"
   },
   "peerDependencies": {
-    "@embroider/core": "^3.4.8",
-    "@embroider/compat": "^3.4.8",
-    "@embroider/webpack": "^4.0.0"
+    "@embroider/compat": "^3.7.1-unstable.01e21e6",
+    "@embroider/webpack": "^4.0.9-unstable.01e21e6",
+    "@embroider/core": "^3.4.20-unstable.01e21e6"
   },
   "peerDependenciesMeta": {
     "@embroider/compat": {

package/src/index.js

@@ -1,6 +1,13 @@
 "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;
+exports.maybeEmbroider = maybeEmbroider;
+exports.embroiderSafe = embroiderSafe;
+exports.embroiderOptimized = embroiderOptimized;
+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 = {
@@ -18,16 +25,12 @@ const embroiderDevDeps = {
 */
 function maybeEmbroider(app, opts = {}) {
     if (!shouldUseEmbroider(app)) {
-        return app.toTree(opts === null || opts === void 0 ? void 0 : opts.extraPublicTrees);
+        return app.toTree();
     }
     // we're using `require` here on purpose because
     //  - 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
@@ -45,9 +48,24 @@ function maybeEmbroider(app, opts = {}) {
             throw new Error(`No such scenario EMBROIDER_TEST_SETUP_OPTIONS=${process.env.EMBROIDER_TEST_SETUP_OPTIONS}`);
         }
     }
-    return Compat.compatBuild(app, Webpack, opts);
+    if (process.env.EMBROIDER_PREBUILD) {
+        return Compat.prebuild(app, opts);
+    }
+    return new BuildWithVite([]);
+}
+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'))));
+        });
+    }
 }
-exports.maybeEmbroider = maybeEmbroider;
 function embroiderSafe(extension) {
     return extendScenario({
         name: 'embroider-safe',
@@ -59,7 +77,6 @@ function embroiderSafe(extension) {
         },
     }, extension);
 }
-exports.embroiderSafe = embroiderSafe;
 function embroiderOptimized(extension) {
     return extendScenario({
         name: 'embroider-optimized',
@@ -71,7 +88,6 @@ function embroiderOptimized(extension) {
         },
     }, extension);
 }
-exports.embroiderOptimized = embroiderOptimized;
 function extendScenario(scenario, extension) {
     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/consistent-type-imports
     let mergeWith = require('lodash/mergeWith');