Merge pull request #1731 from embroider-build/vite-fixes

Vite fixes
embroider-build · Dec 18, 2023 · ecb0185 · ecb0185
2 parents b4add32 + ecfeb1a
commit ecb0185
Show file tree

Hide file tree

Showing 7 changed files with 455 additions and 294 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/vite-app/app/adapters/post.js b/tests/vite-app/app/adapters/post.js
@@ -1,2 +1,6 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-export default class extends JSONAPIAdapter {}
+export default class extends JSONAPIAdapter {
+  urlForFindRecord(/* id, modelName */) {
+    return `${super.urlForFindRecord(...arguments)}.json`;
+  }
+}
diff --git a/tests/vite-app/app/app.js b/tests/vite-app/app/app.js
@@ -3,6 +3,14 @@ import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'vite-app/config/environment';
 
+// this is needed because of an issue with the dependency discovery in vite
+// where it is not picking up the dependencies of the gjs file because vite
+// never even asks the dependency discovery code to load this file. We
+// suspect that it has got something to do with the fact that the rewritten
+// app is in node_modules so we will revisit this once we have killed the
+// need for a rewritten_app
+import 'vite-app/components/fancy.gjs';
+
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;

diff --git a/tests/vite-app/babel.config.js b/tests/vite-app/babel.config.js
@@ -1,12 +1,4 @@
 // eslint-disable-next-line n/no-missing-require
 let config = require('./node_modules/.embroider/rewritten-app/_babel_config_');
 
-let macrosPlugin = config.plugins.find(
-  (p) => Array.isArray(p) && p[0].endsWith('macros-babel-plugin.js')
-);
-if (macrosPlugin?.[1].importSyncImplementation !== 'cjs') {
-  throw new Error('expected to find macrosPlugin');
-}
-macrosPlugin[1].importSyncImplementation = 'eager';
-
 module.exports = config;
diff --git a/tests/vite-app/package.json b/tests/vite-app/package.json
@@ -51,7 +51,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.1.0",
+    "ember-data": "~5.3.0",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
@@ -75,7 +75,7 @@
     "stylelint-prettier": "^3.0.0",
     "tracked-built-ins": "^3.1.1",
     "typescript": "^5.1.6",
-    "vite": "^4.3.9"
+    "vite": "^5.0.9"
   },
   "engines": {
     "node": "16.* || >= 18"

diff --git a/tests/vite-app/public/posts/1 → tests/vite-app/public/posts/1.json b/tests/vite-app/public/posts/1 → tests/vite-app/public/posts/1.json
diff --git a/tests/vite-app/vite.config.mts → tests/vite-app/vite.config.mjs b/tests/vite-app/vite.config.mts → tests/vite-app/vite.config.mjs
@@ -4,7 +4,6 @@ import {
   hbs,
   scripts,
   templateTag,
-  addons,
   optimizeDeps,
 } from "@embroider/vite";
 import { resolve } from "path";
@@ -32,6 +31,8 @@ export default defineConfig({
   ],
   optimizeDeps: optimizeDeps(),
   server: {
+    hmr: false,
+    port: 4200,
     watch: {
       ignored: ["!**/node_modules/.embroider/rewritten-app/**"],
     },