Merge pull request #1623 from lolmaus/optimize-deps

Implement the optimizeDeps() helper

.eslintignore

@@ -28,8 +28,8 @@
 /tests/vite-app/
 /packages/vite/index.mjs
 /packages/vite/index.d.ts
-/packages/vite/src/**/*.js
-/packages/vite/src/**/*.d.ts
+/packages/vite/**/*.js
+/packages/vite/**/*.d.ts
 
 
 # unconventional js

.prettierignore

@@ -1,5 +1,5 @@
 # No need to run prettier here
-*.md 
+*.md
 *.yml
 *.yaml
 *.html
@@ -35,10 +35,8 @@
 /packages/addon-dev/**/*.d.ts
 /tests/fixtures/
 /packages/vite/index.mjs
-/packages/vite/index.d.ts
-/packages/vite/src/**/*.js
-/packages/vite/src/**/*.d.ts
-
+/packages/vite/**/*.js
+/packages/vite/**/*.d.ts
 
 # unconventional js
 /blueprints/*/files/

packages/vite/.gitignore

@@ -2,6 +2,6 @@
 /src/**/*.js
 /src/**/*.d.ts
 /src/**/*.map
-/*/tests/**/*.js
-/*/tests/**/*.d.ts
-/*/tests/**/*.map
+/tests/**/*.js
+/tests/**/*.d.ts
+/tests/**/*.map

packages/vite/index.d.ts

@@ -2,4 +2,5 @@ export * from './src/resolver.js';
 export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
-export * from './src/addons.js';
+export * from './src/addons.js';
+export * from './src/optimize-deps.js';

packages/vite/index.mjs

@@ -2,4 +2,5 @@ export * from './src/resolver.js';
 export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
-export * from './src/addons.js';
+export * from './src/addons.js';
+export * from './src/optimize-deps.js';

packages/vite/jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  testEnvironment: 'node',
+  testMatch: ['<rootDir>/tests/**/*.test.js'],
+};

packages/vite/package.json

@@ -6,6 +6,9 @@
     "@embroider/core": "workspace:^",
     "vite": "^4.3.9"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@rollup/pluginutils": "^4.1.1",
     "assert-never": "^1.2.1",

packages/vite/src/optimize-deps.ts

@@ -0,0 +1,10 @@
+export interface OptimizeDeps {
+  exclude?: string[];
+  [key: string]: unknown;
+}
+
+export function optimizeDeps(): OptimizeDeps {
+  return {
+    exclude: ['@embroider/macros'],
+  };
+}

packages/vite/tests/optimize-deps.test.ts

@@ -0,0 +1,13 @@
+import { optimizeDeps } from '../src/optimize-deps';
+
+describe('optimizeDeps', function () {
+  test('should produce default output when invoked without arguments', function () {
+    const actual = optimizeDeps();
+
+    const expected = {
+      exclude: ['@embroider/macros'],
+    };
+
+    expect(actual).toEqual(expected);
+  });
+});

tests/vite-app/vite.config.mts

@@ -1,5 +1,12 @@
 import { defineConfig } from "vite";
-import { resolver, hbs, scripts, templateTag, addons } from "@embroider/vite";
+import {
+  resolver,
+  hbs,
+  scripts,
+  templateTag,
+  addons,
+  optimizeDeps,
+} from "@embroider/vite";
 import { resolve } from "path";
 import { babel } from "@rollup/plugin-babel";
 
@@ -23,9 +30,7 @@ export default defineConfig({
       extensions: [".gjs", ".js", ".hbs"],
     }),
   ],
-  optimizeDeps: {
-    exclude: addons(__dirname),
-  },
+  optimizeDeps: optimizeDeps(),
   server: {
     watch: {
       ignored: ["!**/node_modules/.embroider/rewritten-app/**"],