Finish refactor

Author: NullVoxPopuli

package.json

@@ -42,7 +42,9 @@
       "@nullvoxpopuli/eslint-configs": "^3.2.2",
       "@embroider/addon-shim": "1.8.7",
       "ember-element-helper": "^0.8.5",
-      "ember-auto-import": "^2.7.0"
+      "ember-auto-import": "^2.7.0",
+      "ember-source": ">= 5.5.0",
+      "webpack": "5.90.3"
     },
     "allowedDeprecatedVersions": {
       "source-map-url": "^0.3.0",

packages/ember-repl/addon/package.json

@@ -31,9 +31,17 @@
       "types": "./declarations/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./markdown/parse": {
-      "types": "./declarations/compile/markdown-to-ember.d.ts",
-      "default": "./dist/compile/markdown-to-ember.js"
+    "./formats/markdown": {
+      "types": "./declarations/compile/formats/markdown.d.ts",
+      "default": "./dist/compile/formats/markdown.js"
+    },
+    "./formats/hbs": {
+      "types": "./declarations/compile/formats/hbs.d.ts",
+      "default": "./dist/compile/formats/hbs.js"
+    },
+    "./formats/gjs": {
+      "types": "./declarations/compile/formats/gjs/index.d.ts",
+      "default": "./dist/compile/formats/gjs/index.js"
     },
     "./test-support": {
       "types": "./declarations/test-support/index.d.ts",
@@ -66,6 +74,7 @@
     "lint:prettier": "pnpm -w exec lint prettier"
   },
   "dependencies": {
+    "ember-resources": ">= 6.4.2",
     "@babel/helper-plugin-utils": "^7.22.5",
     "@babel/standalone": "^7.23.10",
     "@embroider/addon-shim": "1.8.7",
@@ -155,8 +164,13 @@
   },
   "peerDependencies": {
     "@glint/template": ">= 1.3.0",
-    "ember-resources": ">= 6.4.2",
-    "ember-source": ">= 5.5.0"
+    "@glimmer/compiler": ">= 0.86.0",
+    "@glimmer/syntax": ">= 0.86.0"
+  },
+  "peerDependenciesMeta": {
+    "@glint/template": { "optional": true },
+    "@glimmer/compiler": { "optional": true },
+    "@glimmer/syntax": { "optional": true }
   },
   "engines": {
     "node": ">= v16",

packages/ember-repl/addon/rollup.config.mjs

@@ -14,7 +14,7 @@ export default defineConfig({
   output: addon.output(),
   external: ["@glimmer/compiler", "@glimmer/syntax"],
   plugins: [
-    addon.publicEntrypoints(["browser/**/*.js", "test-support/*.js"]),
+    addon.publicEntrypoints(["**/*.js"]),
     addon.appReexports([]),
     babel({
       extensions: [".js", ".gjs", ".ts", ".gts"],
@@ -29,6 +29,7 @@ export default defineConfig({
     {
       async closeBundle() {
         await execaCommand("tsc --emitDeclarationOnly --noEmit false", { stdio: "inherit" });
+        console.info("Declarations built successfully");
       },
     },
   ],

packages/ember-repl/addon/src/compile/formats/gjs/babel.ts

@@ -5,4 +5,3 @@ export interface Babel {
   availablePresets: typeof availablePresets;
   transform: typeof transform;
 }
-

packages/ember-repl/addon/src/compile/formats/gjs/eval.ts

@@ -20,7 +20,6 @@ export function evalSnippet(
     return preConfigured || window.require(moduleName);
   }
 
-  // https://github.com/glimmerjs/glimmer-experimental/blob/master/packages/examples/playground/src/utils/eval-snippet.ts
   eval(compiled);
 
   return Object.assign(exports, { require }) as {

packages/ember-repl/addon/src/compile/formats/gjs/index.ts

@@ -5,7 +5,7 @@ import babelPluginEmberTemplateCompilation from 'babel-plugin-ember-template-com
 import { nameFor } from '../../utils.ts';
 import { evalSnippet } from './eval.ts';
 
-import type { CompileResult, ExtraModules } from '../../types.ts';
+import type { CompileResult } from '../../types.ts';
 import type { ComponentLike } from '@glint/template';
 
 export interface Info {
@@ -30,7 +30,10 @@ export interface Info {
  *  are not provided by extraModules will be searched on npm to see if a package
  *  needs to be downloaded before running the `code` / invoking the component
  */
-export async function compileJS(code: string, extraModules?: ExtraModules): Promise<CompileResult> {
+export async function compileJS(
+  code: string,
+  extraModules?: Record<string, unknown>
+): Promise<CompileResult> {
   let name = nameFor(code);
   let component: undefined | ComponentLike;
   let error: undefined | Error;

packages/ember-repl/addon/src/compile/formats/hbs.ts

@@ -79,8 +79,10 @@ function compileTemplate(source: string, { moduleName, scope = {} }: CompileTemp
     let value = localScope[key];
 
     if (!value) {
-      throw new Error(`Attempt to use ${key} in compiled hbs, but it was not available in scope. `
-        +`Available scope includes: ${Object.keys(localScope)}`);
+      throw new Error(
+        `Attempt to use ${key} in compiled hbs, but it was not available in scope. ` +
+          `Available scope includes: ${Object.keys(localScope)}`
+      );
     }
 
     return value;

packages/ember-repl/addon/src/compile/index.ts

@@ -7,7 +7,7 @@ import {
 } from './formats.ts';
 import { nameFor } from './utils.ts';
 
-import type { CompileResult,UnifiedPlugin } from './types.ts';
+import type { CompileResult, UnifiedPlugin } from './types.ts';
 import type { EvalImportMap, ScopeMap } from './types.ts';
 import type { ComponentLike } from '@glint/template';
 type Format = 'glimdown' | 'gjs' | 'hbs';

packages/ember-repl/addon/src/compile/types.ts

@@ -11,7 +11,6 @@ export interface ScopeMap {
 
 export type UnifiedPlugin = Plugin; // Parameters<ReturnType<typeof unified>['use']>[0];
 
-
 export interface CompileResult {
   component?: ComponentLike;
   error?: Error;
@@ -25,4 +24,3 @@ export type Options = {
    */
   skypack?: boolean;
 };
-

packages/ember-repl/test-app/package.json

@@ -31,11 +31,6 @@
     "ember-resources": "^7.0.0",
     "unist-util-visit": "^5.0.0"
   },
-  "dependenciesMeta": {
-    "ember-repl": {
-      "injected": true
-    }
-  },
   "devDependencies": {
     "@babel/core": "^7.23.9",
     "@babel/plugin-proposal-decorators": "^7.23.9",

packages/ember-repl/test-app/tests/rendering/compile-hbs-test.gts

@@ -2,7 +2,7 @@ import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 
-import { compileHBS } from 'ember-repl';
+import { compileHBS } from 'ember-repl/formats/hbs';
 
 import { Await } from '../helpers/await';
 

packages/ember-repl/test-app/tests/rendering/compile-js-test.gts

@@ -2,7 +2,7 @@ import { click, render } from '@ember/test-helpers';
 import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 
-import { compileJS } from 'ember-repl';
+import { compileJS } from 'ember-repl/formats/gjs';
 // import this so we don't tree-shake it away
 import ExampleComponent from 'test-app/components/example-component';
 

packages/ember-repl/test-app/tests/unit/markdown-test.ts

@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 
 import { stripIndent } from 'common-tags';
 import { invocationOf, nameFor } from 'ember-repl';
-import { parseMarkdown } from 'ember-repl/markdown/parse';
+import { parseMarkdown } from 'ember-repl/formats/markdown';
 
 /**
  * NOTE: there is a problem(?) with remark-hbs where all extra newlines and