Delete @embroider/virtual, require /// <reference for @embroider/core…

… types Remove unneeded types-inclusion
embroider-build · Oct 2, 2024 · 701da5c · 701da5c
1 parent ac242d3
commit 701da5c
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 210 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -11,10 +11,16 @@
   "license": "MIT",
   "author": "Edward Faulkner",
   "main": "src/index.js",
+  "typesVersions": {
+    "*": {
+      "virtual": ["types/virtual"]
+    }
+  },
   "files": [
     "src/**/*.js",
     "src/**/*.d.ts",
-    "src/**/*.js.map"
+    "src/**/*.js.map",
+    "types"
   ],
   "scripts": {
     "test": "jest"

diff --git a/packages/core/types/virtual/index.d.ts b/packages/core/types/virtual/index.d.ts
@@ -0,0 +1,9 @@
+declare module '@embroider/virtual/compat-modules' {
+  interface UnknownModule {
+    [exportName: string]: unknown;
+  }
+
+  const compatModules: Record<string, UnknownModule>;
+
+  export default compatModules;
+}
diff --git a/packages/virtual/src/not-used.js → packages/core/types/virtual/index.js b/packages/virtual/src/not-used.js → packages/core/types/virtual/index.js
diff --git a/packages/virtual/.editorconfig b/packages/virtual/.editorconfig
diff --git a/packages/virtual/.eslintignore b/packages/virtual/.eslintignore
diff --git a/packages/virtual/.eslintrc.js b/packages/virtual/.eslintrc.js
diff --git a/packages/virtual/.prettierignore b/packages/virtual/.prettierignore
diff --git a/packages/virtual/.prettierrc.js b/packages/virtual/.prettierrc.js
diff --git a/packages/virtual/package.json b/packages/virtual/package.json
diff --git a/packages/virtual/src/compat-modules.d.ts b/packages/virtual/src/compat-modules.d.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
@@ -39,7 +39,6 @@
     "@embroider/compat": "workspace:*",
     "@embroider/core": "workspace:*",
     "@embroider/test-setup": "workspace:*",
-    "@embroider/virtual": "workspace:*",
     "@embroider/vite": "workspace:*",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",

diff --git a/tests/app-template/package.json b/tests/app-template/package.json
@@ -41,7 +41,6 @@
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",
-    "@embroider/virtual": "workspace:*",
     "@embroider/vite": "workspace:*",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",

diff --git a/tests/ts-app-template-classic/package.json b/tests/ts-app-template-classic/package.json
@@ -36,7 +36,6 @@
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",
-    "@embroider/virtual": "workspace:*",
     "@embroider/vite": "workspace:*",
     "@glimmer/component": "^1.1.2",
     "@glimmer/interfaces": "^0.84.2",

diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
@@ -40,7 +40,6 @@
     "@embroider/core": "workspace:*",
     "@embroider/router": "workspace:*",
     "@embroider/test-setup": "workspace:*",
-    "@embroider/virtual": "workspace:*",
     "@embroider/vite": "workspace:*",
     "@glimmer/component": "^1.1.2",
     "@glimmer/interfaces": "^0.84.2",

diff --git a/tests/ts-app-template/types/ts-app-template/index.d.ts b/tests/ts-app-template/types/ts-app-template/index.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="@embroider/core/virtual" />
 import 'ember-source/types';
 
 export {};