From a5accdaa13a6b4250936c2121da2e930f9f45b40 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:22:28 +0000 Subject: [PATCH 1/4] Initial plan From b022eec0fa393edb74519e2950a76392277b70ec Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:25:58 +0000 Subject: [PATCH 2/4] Remove addon-shim from ember-repl Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/ember-repl/config/addon-main.cjs | 7 ------- packages/ember-repl/package.json | 11 +++-------- pnpm-lock.yaml | 3 --- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 packages/ember-repl/config/addon-main.cjs diff --git a/packages/ember-repl/config/addon-main.cjs b/packages/ember-repl/config/addon-main.cjs deleted file mode 100644 index 6953fa362..000000000 --- a/packages/ember-repl/config/addon-main.cjs +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const { join } = require('path'); - -const { addonV1Shim } = require('@embroider/addon-shim'); - -module.exports = addonV1Shim(join(__dirname, '..')); diff --git a/packages/ember-repl/package.json b/packages/ember-repl/package.json index 9a5c046a3..7e4eb54e3 100644 --- a/packages/ember-repl/package.json +++ b/packages/ember-repl/package.json @@ -14,11 +14,9 @@ "license": "MIT", "author": "NullVoxPopuli", "files": [ - "addon-main.cjs", "declarations", "dist", - "src", - "config" + "src" ], "scripts": { ":vite": "vite --config ./config/vite.config.mjs", @@ -43,7 +41,6 @@ "dependencies": { "@ember/test-helpers": "^5.4.1", "@ember/test-waiters": "^4.1.0", - "@embroider/addon-shim": "^1.10.2", "codemirror": "^6.0.2", "content-tag": "^4.0.0", "decorator-transforms": "2.3.1", @@ -129,8 +126,7 @@ }, "ember-addon": { "version": 2, - "type": "addon", - "main": "config/addon-main.cjs" + "type": "addon" }, "imports": { "#src/*": "./src/*", @@ -144,8 +140,7 @@ "./test-support": { "types": "./declarations/test-support.d.ts", "default": "./dist/test-support.js" - }, - "./addon-main.js": "./config/addon-main.cjs" + } }, "typesVersions": { "*": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1e59091a..7d5ebcab0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -900,9 +900,6 @@ importers: '@ember/test-waiters': specifier: ^4.1.0 version: 4.1.1(@glint/template@1.7.4) - '@embroider/addon-shim': - specifier: ^1.10.2 - version: 1.10.2 codemirror: specifier: ^6.0.2 version: 6.0.2 From e2cefc5df53a1f5d5cfc35561636f9746fd12bbb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:27:26 +0000 Subject: [PATCH 3/4] Format code with prettier Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/ember-repl/babel.config.cjs | 9 ++++- packages/ember-repl/config/.try.mjs | 38 +++++++++---------- packages/ember-repl/config/rollup.config.mjs | 33 ++++++++-------- packages/ember-repl/config/vite.config.mjs | 20 +++++----- packages/ember-repl/src/compile/Compiled.ts | 16 ++++++-- packages/ember-repl/src/compile/compile.ts | 6 ++- .../tests/rendering/compile-markdown-test.gts | 35 +++++++++-------- packages/ember-repl/tests/unit/utils-test.ts | 8 +++- packages/ember-repl/tsconfig.json | 7 +++- 9 files changed, 102 insertions(+), 70 deletions(-) diff --git a/packages/ember-repl/babel.config.cjs b/packages/ember-repl/babel.config.cjs index fbd8e6234..fe72f41b2 100644 --- a/packages/ember-repl/babel.config.cjs +++ b/packages/ember-repl/babel.config.cjs @@ -5,7 +5,10 @@ */ const { buildMacros } = require('@embroider/macros/babel'); -const { babelCompatSupport, templateCompatSupport } = require('@embroider/compat/babel'); +const { + babelCompatSupport, + templateCompatSupport, +} = require('@embroider/compat/babel'); const macros = buildMacros(); @@ -25,7 +28,9 @@ module.exports = { [ 'babel-plugin-ember-template-compilation', { - transforms: [...(isCompat ? templateCompatSupport() : macros.templateMacros)], + transforms: [ + ...(isCompat ? templateCompatSupport() : macros.templateMacros), + ], }, ], [ diff --git a/packages/ember-repl/config/.try.mjs b/packages/ember-repl/config/.try.mjs index 997704901..40bf32cc3 100644 --- a/packages/ember-repl/config/.try.mjs +++ b/packages/ember-repl/config/.try.mjs @@ -1,35 +1,35 @@ // When building your addon for older Ember versions you need to have the required files const compatFiles = { - "ember-cli-build.js": `const EmberApp = require('ember-cli/lib/broccoli/ember-app'); + 'ember-cli-build.js': `const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const { compatBuild } = require('@embroider/compat'); module.exports = async function (defaults) { const { buildOnce } = await import('@embroider/vite'); let app = new EmberApp(defaults); return compatBuild(app, buildOnce); };`, - "config/optional-features.json": JSON.stringify({ - "application-template-wrapper": false, - "default-async-observers": true, - "jquery-integration": false, - "template-only-glimmer-components": true, - "no-implicit-route-model": true, + 'config/optional-features.json': JSON.stringify({ + 'application-template-wrapper': false, + 'default-async-observers': true, + 'jquery-integration': false, + 'template-only-glimmer-components': true, + 'no-implicit-route-model': true, }), }; const compatDeps = { - "@embroider/compat": "^4.0.3", - "ember-cli": "^5.12.0", - "ember-auto-import": "^2.10.0", - "@ember/optional-features": "^2.2.0", + '@embroider/compat': '^4.0.3', + 'ember-cli': '^5.12.0', + 'ember-auto-import': '^2.10.0', + '@ember/optional-features': '^2.2.0', }; export default { scenarios: [ { - name: "ember-lts-5.8", + name: 'ember-lts-5.8', npm: { devDependencies: { - "ember-source": "~5.8.0", + 'ember-source': '~5.8.0', ...compatDeps, }, }, @@ -39,10 +39,10 @@ export default { files: compatFiles, }, { - name: "ember-lts-5.12", + name: 'ember-lts-5.12', npm: { devDependencies: { - "ember-source": "~5.12.0", + 'ember-source': '~5.12.0', ...compatDeps, }, }, @@ -55,7 +55,7 @@ export default { name: `ember-lts-6.4`, npm: { devDependencies: { - "ember-source": `npm:ember-source@~6.4.0`, + 'ember-source': `npm:ember-source@~6.4.0`, }, }, }, @@ -63,7 +63,7 @@ export default { name: `ember-latest`, npm: { devDependencies: { - "ember-source": `npm:ember-source@latest`, + 'ember-source': `npm:ember-source@latest`, }, }, }, @@ -71,7 +71,7 @@ export default { name: `ember-beta`, npm: { devDependencies: { - "ember-source": `npm:ember-source@beta`, + 'ember-source': `npm:ember-source@beta`, }, }, }, @@ -79,7 +79,7 @@ export default { name: `ember-alpha`, npm: { devDependencies: { - "ember-source": `npm:ember-source@alpha`, + 'ember-source': `npm:ember-source@alpha`, }, }, }, diff --git a/packages/ember-repl/config/rollup.config.mjs b/packages/ember-repl/config/rollup.config.mjs index b6df4a959..300e66d36 100644 --- a/packages/ember-repl/config/rollup.config.mjs +++ b/packages/ember-repl/config/rollup.config.mjs @@ -1,34 +1,34 @@ -import { Addon } from "@embroider/addon-dev/rollup"; -import { resolve } from "node:path"; +import { Addon } from '@embroider/addon-dev/rollup'; +import { resolve } from 'node:path'; -import { babel } from "@rollup/plugin-babel"; -import cjs from "@rollup/plugin-commonjs"; -import { nodeResolve } from "@rollup/plugin-node-resolve"; -import nodePolyfills from "rollup-plugin-node-polyfills"; +import { babel } from '@rollup/plugin-babel'; +import cjs from '@rollup/plugin-commonjs'; +import { nodeResolve } from '@rollup/plugin-node-resolve'; +import nodePolyfills from 'rollup-plugin-node-polyfills'; const addon = new Addon({ - srcDir: "src", - destDir: "dist", + srcDir: 'src', + destDir: 'dist', }); -const babelConfig = resolve(import.meta.dirname, "./babel.publish.config.cjs"); -const tsConfig = resolve(import.meta.dirname, "./tsconfig.publish.json"); +const babelConfig = resolve(import.meta.dirname, './babel.publish.config.cjs'); +const tsConfig = resolve(import.meta.dirname, './tsconfig.publish.json'); export default { output: addon.output(), plugins: [ - addon.publicEntrypoints(["**/*.js"]), + addon.publicEntrypoints(['**/*.js']), addon.dependencies(), babel({ - extensions: [".js", ".gjs", ".ts", ".gts"], - babelHelpers: "bundled", + extensions: ['.js', '.gjs', '.ts', '.gts'], + babelHelpers: 'bundled', configFile: babelConfig, }), nodeResolve({ browser: true, preferBuiltins: false, // Defaults for this plugin are for node... - exportConditions: ["browser", "module", "default"], + exportConditions: ['browser', 'module', 'default'], }), // This is needed because babel doesn't ship a proper browser bundle... nodePolyfills(), @@ -36,7 +36,10 @@ export default { cjs(), // Emit .d.ts declaration files - addon.declarations("declarations", `pnpm ember-tsc --declaration --project ${tsConfig}`), + addon.declarations( + 'declarations', + `pnpm ember-tsc --declaration --project ${tsConfig}` + ), // Remove leftover build artifacts when starting a new build. addon.clean(), diff --git a/packages/ember-repl/config/vite.config.mjs b/packages/ember-repl/config/vite.config.mjs index edf354e0e..70b8aa85a 100644 --- a/packages/ember-repl/config/vite.config.mjs +++ b/packages/ember-repl/config/vite.config.mjs @@ -1,35 +1,35 @@ -import { ember, extensions } from "@embroider/vite"; -import { join } from "node:path"; +import { ember, extensions } from '@embroider/vite'; +import { join } from 'node:path'; -import { babel } from "@rollup/plugin-babel"; -import { defineConfig } from "vite"; -import mkcert from "vite-plugin-mkcert"; +import { babel } from '@rollup/plugin-babel'; +import { defineConfig } from 'vite'; +import mkcert from 'vite-plugin-mkcert'; export default defineConfig({ build: { - target: ["esnext"], + target: ['esnext'], }, resolve: { alias: [ { - find: "ember-repl", + find: 'ember-repl', replacement: join(import.meta.dirname, `../src`), }, ], }, optimizeDeps: { // a wasm-providing dependency - exclude: ["content-tag"], + exclude: ['content-tag'], // for top-level-await, etc esbuildOptions: { - target: "esnext", + target: 'esnext', }, }, plugins: [ mkcert(), ember(), babel({ - babelHelpers: "inline", + babelHelpers: 'inline', extensions, }), ], diff --git a/packages/ember-repl/src/compile/Compiled.ts b/packages/ember-repl/src/compile/Compiled.ts index 4cbeace00..2e3c355b9 100644 --- a/packages/ember-repl/src/compile/Compiled.ts +++ b/packages/ember-repl/src/compile/Compiled.ts @@ -12,7 +12,10 @@ export function Compiled( format?: Format, flavor?: string ): CompileState; -export function Compiled(markdownText: Input | (() => Input), format: () => Format): CompileState; +export function Compiled( + markdownText: Input | (() => Input), + format: () => Format +): CompileState; export function Compiled( markdownText: Input | (() => Input), format: () => Format, @@ -29,9 +32,14 @@ export function Compiled( maybeFlavor?: string | (() => string) ): CompileState { return resource(({ owner }) => { - const input = typeof markdownText === 'function' ? markdownText() : markdownText; - const format = typeof maybeFormat === 'function' ? maybeFormat() : maybeFormat || 'glimdown'; - const flavor = typeof maybeFlavor === 'function' ? maybeFlavor() : maybeFlavor; + const input = + typeof markdownText === 'function' ? markdownText() : markdownText; + const format = + typeof maybeFormat === 'function' + ? maybeFormat() + : maybeFormat || 'glimdown'; + const flavor = + typeof maybeFlavor === 'function' ? maybeFlavor() : maybeFlavor; const compiler = getCompiler(owner); diff --git a/packages/ember-repl/src/compile/compile.ts b/packages/ember-repl/src/compile/compile.ts index 229ff30b8..f9d9c897e 100644 --- a/packages/ember-repl/src/compile/compile.ts +++ b/packages/ember-repl/src/compile/compile.ts @@ -17,7 +17,11 @@ interface Options { onCompileStart?: () => Promise | unknown; } -export function compile(service: CompilerService, text: Input, options: Options): CompileState { +export function compile( + service: CompilerService, + text: Input, + options: Options +): CompileState { const data = { format: options.format }; if (!text) { diff --git a/packages/ember-repl/tests/rendering/compile-markdown-test.gts b/packages/ember-repl/tests/rendering/compile-markdown-test.gts index 63e0369d4..935c04e71 100644 --- a/packages/ember-repl/tests/rendering/compile-markdown-test.gts +++ b/packages/ember-repl/tests/rendering/compile-markdown-test.gts @@ -114,7 +114,7 @@ module('Rendering | compile()', function (hooks) { parent.children[index] = { type: 'html', - + // @ts-ignore value: `

${node.value}

`, }; @@ -144,21 +144,24 @@ module('Rendering | compile()', function (hooks) { }); }); - module('with the plugin (configured for just this render)', function () { - // https://github.com/typed-ember/glint/issues/617 - test('no pre renders', async function (assert) { - let component: ComponentLike | undefined; + module( + 'with the plugin (configured for just this render)', + function () { + // https://github.com/typed-ember/glint/issues/617 + test('no pre renders', async function (assert) { + let component: ComponentLike | undefined; - await makeComponent(this, (comp) => (component = comp), { - remarkPlugins: [removePre], - }); - debugAssert(`[BUG] component`, component); + await makeComponent(this, (comp) => (component = comp), { + remarkPlugins: [removePre], + }); + debugAssert(`[BUG] component`, component); - await render(component); - // await this.pauseTest(); - assert.dom('pre').doesNotExist(); - }); - }); + await render(component); + // await this.pauseTest(); + assert.dom('pre').doesNotExist(); + }); + } + ); }); }); }); @@ -187,7 +190,7 @@ module('Rendering | compile()', function (hooks) { onCompileStart: () => { /* not used */ }, - + // @ts-ignore scope: { LocalComponent, @@ -231,7 +234,7 @@ module('Rendering | compile()', function (hooks) { onCompileStart: () => { /* not used */ }, - + // @ts-ignore scope: { LocalComponent, diff --git a/packages/ember-repl/tests/unit/utils-test.ts b/packages/ember-repl/tests/unit/utils-test.ts index 30ba59c4b..6a3c105eb 100644 --- a/packages/ember-repl/tests/unit/utils-test.ts +++ b/packages/ember-repl/tests/unit/utils-test.ts @@ -12,7 +12,8 @@ module('nameFor()', function () { const length = randomInRange(0, 10000); let result = ''; - const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + const characters = + 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const charactersLength = characters.length; for (let i = 0; i < length; i++) { @@ -35,7 +36,10 @@ module('invocationOf()', function (hooks) { setupTest(hooks); test('it works', function (assert) { - assert.throws(() => invocationOf(''), /You must pass a name to invocationOf. Received: ``/); + assert.throws( + () => invocationOf(''), + /You must pass a name to invocationOf. Received: ``/ + ); assert.strictEqual(invocationOf('a'), ''); assert.strictEqual(invocationOf('a-1'), ''); assert.strictEqual(invocationOf('ab-1'), ''); diff --git a/packages/ember-repl/tsconfig.json b/packages/ember-repl/tsconfig.json index 87e012035..ef0c5abe2 100644 --- a/packages/ember-repl/tsconfig.json +++ b/packages/ember-repl/tsconfig.json @@ -8,6 +8,11 @@ "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"], "compilerOptions": { "rootDir": ".", - "types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"] + "types": [ + "ember-source/types", + "vite/client", + "@embroider/core/virtual", + "@glint/ember-tsc/types" + ] } } From 1fcbc0a4cb5263df0ca1417765f7691c9762b689 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:33:58 +0000 Subject: [PATCH 4/4] Revert formatting changes Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/ember-repl/babel.config.cjs | 9 +---- packages/ember-repl/config/.try.mjs | 38 +++++++++---------- packages/ember-repl/config/rollup.config.mjs | 33 ++++++++-------- packages/ember-repl/config/vite.config.mjs | 20 +++++----- packages/ember-repl/src/compile/Compiled.ts | 16 ++------ packages/ember-repl/src/compile/compile.ts | 6 +-- .../tests/rendering/compile-markdown-test.gts | 35 ++++++++--------- packages/ember-repl/tests/unit/utils-test.ts | 8 +--- packages/ember-repl/tsconfig.json | 7 +--- 9 files changed, 70 insertions(+), 102 deletions(-) diff --git a/packages/ember-repl/babel.config.cjs b/packages/ember-repl/babel.config.cjs index fe72f41b2..fbd8e6234 100644 --- a/packages/ember-repl/babel.config.cjs +++ b/packages/ember-repl/babel.config.cjs @@ -5,10 +5,7 @@ */ const { buildMacros } = require('@embroider/macros/babel'); -const { - babelCompatSupport, - templateCompatSupport, -} = require('@embroider/compat/babel'); +const { babelCompatSupport, templateCompatSupport } = require('@embroider/compat/babel'); const macros = buildMacros(); @@ -28,9 +25,7 @@ module.exports = { [ 'babel-plugin-ember-template-compilation', { - transforms: [ - ...(isCompat ? templateCompatSupport() : macros.templateMacros), - ], + transforms: [...(isCompat ? templateCompatSupport() : macros.templateMacros)], }, ], [ diff --git a/packages/ember-repl/config/.try.mjs b/packages/ember-repl/config/.try.mjs index 40bf32cc3..997704901 100644 --- a/packages/ember-repl/config/.try.mjs +++ b/packages/ember-repl/config/.try.mjs @@ -1,35 +1,35 @@ // When building your addon for older Ember versions you need to have the required files const compatFiles = { - 'ember-cli-build.js': `const EmberApp = require('ember-cli/lib/broccoli/ember-app'); + "ember-cli-build.js": `const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const { compatBuild } = require('@embroider/compat'); module.exports = async function (defaults) { const { buildOnce } = await import('@embroider/vite'); let app = new EmberApp(defaults); return compatBuild(app, buildOnce); };`, - 'config/optional-features.json': JSON.stringify({ - 'application-template-wrapper': false, - 'default-async-observers': true, - 'jquery-integration': false, - 'template-only-glimmer-components': true, - 'no-implicit-route-model': true, + "config/optional-features.json": JSON.stringify({ + "application-template-wrapper": false, + "default-async-observers": true, + "jquery-integration": false, + "template-only-glimmer-components": true, + "no-implicit-route-model": true, }), }; const compatDeps = { - '@embroider/compat': '^4.0.3', - 'ember-cli': '^5.12.0', - 'ember-auto-import': '^2.10.0', - '@ember/optional-features': '^2.2.0', + "@embroider/compat": "^4.0.3", + "ember-cli": "^5.12.0", + "ember-auto-import": "^2.10.0", + "@ember/optional-features": "^2.2.0", }; export default { scenarios: [ { - name: 'ember-lts-5.8', + name: "ember-lts-5.8", npm: { devDependencies: { - 'ember-source': '~5.8.0', + "ember-source": "~5.8.0", ...compatDeps, }, }, @@ -39,10 +39,10 @@ export default { files: compatFiles, }, { - name: 'ember-lts-5.12', + name: "ember-lts-5.12", npm: { devDependencies: { - 'ember-source': '~5.12.0', + "ember-source": "~5.12.0", ...compatDeps, }, }, @@ -55,7 +55,7 @@ export default { name: `ember-lts-6.4`, npm: { devDependencies: { - 'ember-source': `npm:ember-source@~6.4.0`, + "ember-source": `npm:ember-source@~6.4.0`, }, }, }, @@ -63,7 +63,7 @@ export default { name: `ember-latest`, npm: { devDependencies: { - 'ember-source': `npm:ember-source@latest`, + "ember-source": `npm:ember-source@latest`, }, }, }, @@ -71,7 +71,7 @@ export default { name: `ember-beta`, npm: { devDependencies: { - 'ember-source': `npm:ember-source@beta`, + "ember-source": `npm:ember-source@beta`, }, }, }, @@ -79,7 +79,7 @@ export default { name: `ember-alpha`, npm: { devDependencies: { - 'ember-source': `npm:ember-source@alpha`, + "ember-source": `npm:ember-source@alpha`, }, }, }, diff --git a/packages/ember-repl/config/rollup.config.mjs b/packages/ember-repl/config/rollup.config.mjs index 300e66d36..b6df4a959 100644 --- a/packages/ember-repl/config/rollup.config.mjs +++ b/packages/ember-repl/config/rollup.config.mjs @@ -1,34 +1,34 @@ -import { Addon } from '@embroider/addon-dev/rollup'; -import { resolve } from 'node:path'; +import { Addon } from "@embroider/addon-dev/rollup"; +import { resolve } from "node:path"; -import { babel } from '@rollup/plugin-babel'; -import cjs from '@rollup/plugin-commonjs'; -import { nodeResolve } from '@rollup/plugin-node-resolve'; -import nodePolyfills from 'rollup-plugin-node-polyfills'; +import { babel } from "@rollup/plugin-babel"; +import cjs from "@rollup/plugin-commonjs"; +import { nodeResolve } from "@rollup/plugin-node-resolve"; +import nodePolyfills from "rollup-plugin-node-polyfills"; const addon = new Addon({ - srcDir: 'src', - destDir: 'dist', + srcDir: "src", + destDir: "dist", }); -const babelConfig = resolve(import.meta.dirname, './babel.publish.config.cjs'); -const tsConfig = resolve(import.meta.dirname, './tsconfig.publish.json'); +const babelConfig = resolve(import.meta.dirname, "./babel.publish.config.cjs"); +const tsConfig = resolve(import.meta.dirname, "./tsconfig.publish.json"); export default { output: addon.output(), plugins: [ - addon.publicEntrypoints(['**/*.js']), + addon.publicEntrypoints(["**/*.js"]), addon.dependencies(), babel({ - extensions: ['.js', '.gjs', '.ts', '.gts'], - babelHelpers: 'bundled', + extensions: [".js", ".gjs", ".ts", ".gts"], + babelHelpers: "bundled", configFile: babelConfig, }), nodeResolve({ browser: true, preferBuiltins: false, // Defaults for this plugin are for node... - exportConditions: ['browser', 'module', 'default'], + exportConditions: ["browser", "module", "default"], }), // This is needed because babel doesn't ship a proper browser bundle... nodePolyfills(), @@ -36,10 +36,7 @@ export default { cjs(), // Emit .d.ts declaration files - addon.declarations( - 'declarations', - `pnpm ember-tsc --declaration --project ${tsConfig}` - ), + addon.declarations("declarations", `pnpm ember-tsc --declaration --project ${tsConfig}`), // Remove leftover build artifacts when starting a new build. addon.clean(), diff --git a/packages/ember-repl/config/vite.config.mjs b/packages/ember-repl/config/vite.config.mjs index 70b8aa85a..edf354e0e 100644 --- a/packages/ember-repl/config/vite.config.mjs +++ b/packages/ember-repl/config/vite.config.mjs @@ -1,35 +1,35 @@ -import { ember, extensions } from '@embroider/vite'; -import { join } from 'node:path'; +import { ember, extensions } from "@embroider/vite"; +import { join } from "node:path"; -import { babel } from '@rollup/plugin-babel'; -import { defineConfig } from 'vite'; -import mkcert from 'vite-plugin-mkcert'; +import { babel } from "@rollup/plugin-babel"; +import { defineConfig } from "vite"; +import mkcert from "vite-plugin-mkcert"; export default defineConfig({ build: { - target: ['esnext'], + target: ["esnext"], }, resolve: { alias: [ { - find: 'ember-repl', + find: "ember-repl", replacement: join(import.meta.dirname, `../src`), }, ], }, optimizeDeps: { // a wasm-providing dependency - exclude: ['content-tag'], + exclude: ["content-tag"], // for top-level-await, etc esbuildOptions: { - target: 'esnext', + target: "esnext", }, }, plugins: [ mkcert(), ember(), babel({ - babelHelpers: 'inline', + babelHelpers: "inline", extensions, }), ], diff --git a/packages/ember-repl/src/compile/Compiled.ts b/packages/ember-repl/src/compile/Compiled.ts index 2e3c355b9..4cbeace00 100644 --- a/packages/ember-repl/src/compile/Compiled.ts +++ b/packages/ember-repl/src/compile/Compiled.ts @@ -12,10 +12,7 @@ export function Compiled( format?: Format, flavor?: string ): CompileState; -export function Compiled( - markdownText: Input | (() => Input), - format: () => Format -): CompileState; +export function Compiled(markdownText: Input | (() => Input), format: () => Format): CompileState; export function Compiled( markdownText: Input | (() => Input), format: () => Format, @@ -32,14 +29,9 @@ export function Compiled( maybeFlavor?: string | (() => string) ): CompileState { return resource(({ owner }) => { - const input = - typeof markdownText === 'function' ? markdownText() : markdownText; - const format = - typeof maybeFormat === 'function' - ? maybeFormat() - : maybeFormat || 'glimdown'; - const flavor = - typeof maybeFlavor === 'function' ? maybeFlavor() : maybeFlavor; + const input = typeof markdownText === 'function' ? markdownText() : markdownText; + const format = typeof maybeFormat === 'function' ? maybeFormat() : maybeFormat || 'glimdown'; + const flavor = typeof maybeFlavor === 'function' ? maybeFlavor() : maybeFlavor; const compiler = getCompiler(owner); diff --git a/packages/ember-repl/src/compile/compile.ts b/packages/ember-repl/src/compile/compile.ts index f9d9c897e..229ff30b8 100644 --- a/packages/ember-repl/src/compile/compile.ts +++ b/packages/ember-repl/src/compile/compile.ts @@ -17,11 +17,7 @@ interface Options { onCompileStart?: () => Promise | unknown; } -export function compile( - service: CompilerService, - text: Input, - options: Options -): CompileState { +export function compile(service: CompilerService, text: Input, options: Options): CompileState { const data = { format: options.format }; if (!text) { diff --git a/packages/ember-repl/tests/rendering/compile-markdown-test.gts b/packages/ember-repl/tests/rendering/compile-markdown-test.gts index 935c04e71..63e0369d4 100644 --- a/packages/ember-repl/tests/rendering/compile-markdown-test.gts +++ b/packages/ember-repl/tests/rendering/compile-markdown-test.gts @@ -114,7 +114,7 @@ module('Rendering | compile()', function (hooks) { parent.children[index] = { type: 'html', - + // @ts-ignore value: `

${node.value}

`, }; @@ -144,24 +144,21 @@ module('Rendering | compile()', function (hooks) { }); }); - module( - 'with the plugin (configured for just this render)', - function () { - // https://github.com/typed-ember/glint/issues/617 - test('no pre renders', async function (assert) { - let component: ComponentLike | undefined; - - await makeComponent(this, (comp) => (component = comp), { - remarkPlugins: [removePre], - }); - debugAssert(`[BUG] component`, component); + module('with the plugin (configured for just this render)', function () { + // https://github.com/typed-ember/glint/issues/617 + test('no pre renders', async function (assert) { + let component: ComponentLike | undefined; - await render(component); - // await this.pauseTest(); - assert.dom('pre').doesNotExist(); + await makeComponent(this, (comp) => (component = comp), { + remarkPlugins: [removePre], }); - } - ); + debugAssert(`[BUG] component`, component); + + await render(component); + // await this.pauseTest(); + assert.dom('pre').doesNotExist(); + }); + }); }); }); }); @@ -190,7 +187,7 @@ module('Rendering | compile()', function (hooks) { onCompileStart: () => { /* not used */ }, - + // @ts-ignore scope: { LocalComponent, @@ -234,7 +231,7 @@ module('Rendering | compile()', function (hooks) { onCompileStart: () => { /* not used */ }, - + // @ts-ignore scope: { LocalComponent, diff --git a/packages/ember-repl/tests/unit/utils-test.ts b/packages/ember-repl/tests/unit/utils-test.ts index 6a3c105eb..30ba59c4b 100644 --- a/packages/ember-repl/tests/unit/utils-test.ts +++ b/packages/ember-repl/tests/unit/utils-test.ts @@ -12,8 +12,7 @@ module('nameFor()', function () { const length = randomInRange(0, 10000); let result = ''; - const characters = - 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const charactersLength = characters.length; for (let i = 0; i < length; i++) { @@ -36,10 +35,7 @@ module('invocationOf()', function (hooks) { setupTest(hooks); test('it works', function (assert) { - assert.throws( - () => invocationOf(''), - /You must pass a name to invocationOf. Received: ``/ - ); + assert.throws(() => invocationOf(''), /You must pass a name to invocationOf. Received: ``/); assert.strictEqual(invocationOf('a'), '
'); assert.strictEqual(invocationOf('a-1'), ''); assert.strictEqual(invocationOf('ab-1'), ''); diff --git a/packages/ember-repl/tsconfig.json b/packages/ember-repl/tsconfig.json index ef0c5abe2..87e012035 100644 --- a/packages/ember-repl/tsconfig.json +++ b/packages/ember-repl/tsconfig.json @@ -8,11 +8,6 @@ "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"], "compilerOptions": { "rootDir": ".", - "types": [ - "ember-source/types", - "vite/client", - "@embroider/core/virtual", - "@glint/ember-tsc/types" - ] + "types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"] } }