Skip to content

Commit 1d5abe7

Browse files
committed
Undo changes accidentally created for some reason
1 parent e0db8f5 commit 1d5abe7

File tree

6 files changed

+78
-63
lines changed

6 files changed

+78
-63
lines changed

packages/ember-repl/config/.try.mjs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
// When building your addon for older Ember versions you need to have the required files
22
const compatFiles = {
3-
"ember-cli-build.js": `const EmberApp = require('ember-cli/lib/broccoli/ember-app');
3+
'ember-cli-build.js': `const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44
const { compatBuild } = require('@embroider/compat');
55
module.exports = async function (defaults) {
66
const { buildOnce } = await import('@embroider/vite');
77
let app = new EmberApp(defaults);
88
return compatBuild(app, buildOnce);
99
};`,
10-
"config/optional-features.json": JSON.stringify({
11-
"application-template-wrapper": false,
12-
"default-async-observers": true,
13-
"jquery-integration": false,
14-
"template-only-glimmer-components": true,
15-
"no-implicit-route-model": true,
10+
'config/optional-features.json': JSON.stringify({
11+
'application-template-wrapper': false,
12+
'default-async-observers': true,
13+
'jquery-integration': false,
14+
'template-only-glimmer-components': true,
15+
'no-implicit-route-model': true,
1616
}),
1717
};
1818

1919
const compatDeps = {
20-
"@embroider/compat": "^4.0.3",
21-
"ember-cli": "^5.12.0",
22-
"ember-auto-import": "^2.10.0",
23-
"@ember/optional-features": "^2.2.0",
20+
'@embroider/compat': '^4.0.3',
21+
'ember-cli': '^5.12.0',
22+
'ember-auto-import': '^2.10.0',
23+
'@ember/optional-features': '^2.2.0',
2424
};
2525

2626
export default {
2727
scenarios: [
2828
{
29-
name: "ember-lts-5.8",
29+
name: 'ember-lts-5.8',
3030
npm: {
3131
devDependencies: {
32-
"ember-source": "~5.8.0",
32+
'ember-source': '~5.8.0',
3333
...compatDeps,
3434
},
3535
},
@@ -39,10 +39,10 @@ export default {
3939
files: compatFiles,
4040
},
4141
{
42-
name: "ember-lts-5.12",
42+
name: 'ember-lts-5.12',
4343
npm: {
4444
devDependencies: {
45-
"ember-source": "~5.12.0",
45+
'ember-source': '~5.12.0',
4646
...compatDeps,
4747
},
4848
},
@@ -55,31 +55,31 @@ export default {
5555
name: `ember-lts-6.4`,
5656
npm: {
5757
devDependencies: {
58-
"ember-source": `npm:ember-source@~6.4.0`,
58+
'ember-source': `npm:ember-source@~6.4.0`,
5959
},
6060
},
6161
},
6262
{
6363
name: `ember-latest`,
6464
npm: {
6565
devDependencies: {
66-
"ember-source": `npm:ember-source@latest`,
66+
'ember-source': `npm:ember-source@latest`,
6767
},
6868
},
6969
},
7070
{
7171
name: `ember-beta`,
7272
npm: {
7373
devDependencies: {
74-
"ember-source": `npm:ember-source@beta`,
74+
'ember-source': `npm:ember-source@beta`,
7575
},
7676
},
7777
},
7878
{
7979
name: `ember-alpha`,
8080
npm: {
8181
devDependencies: {
82-
"ember-source": `npm:ember-source@alpha`,
82+
'ember-source': `npm:ember-source@alpha`,
8383
},
8484
},
8585
},

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
1-
import { Addon } from "@embroider/addon-dev/rollup";
2-
import { resolve } from "node:path";
1+
import { Addon } from '@embroider/addon-dev/rollup';
2+
import { resolve } from 'node:path';
33

4-
import { babel } from "@rollup/plugin-babel";
5-
import cjs from "@rollup/plugin-commonjs";
6-
import { nodeResolve } from "@rollup/plugin-node-resolve";
7-
import nodePolyfills from "rollup-plugin-node-polyfills";
4+
import { babel } from '@rollup/plugin-babel';
5+
import cjs from '@rollup/plugin-commonjs';
6+
import { nodeResolve } from '@rollup/plugin-node-resolve';
7+
import nodePolyfills from 'rollup-plugin-node-polyfills';
88

99
const addon = new Addon({
10-
srcDir: "src",
11-
destDir: "dist",
10+
srcDir: 'src',
11+
destDir: 'dist',
1212
});
1313

14-
const babelConfig = resolve(import.meta.dirname, "./babel.publish.config.cjs");
15-
const tsConfig = resolve(import.meta.dirname, "./tsconfig.publish.json");
14+
const babelConfig = resolve(import.meta.dirname, './babel.publish.config.cjs');
15+
const tsConfig = resolve(import.meta.dirname, './tsconfig.publish.json');
1616

1717
export default {
1818
output: addon.output(),
1919
plugins: [
20-
addon.publicEntrypoints(["**/*.js"]),
20+
addon.publicEntrypoints(['**/*.js']),
2121
addon.dependencies(),
2222
babel({
23-
extensions: [".js", ".gjs", ".ts", ".gts"],
24-
babelHelpers: "bundled",
23+
extensions: ['.js', '.gjs', '.ts', '.gts'],
24+
babelHelpers: 'bundled',
2525
configFile: babelConfig,
2626
}),
2727
nodeResolve({
2828
browser: true,
2929
preferBuiltins: false,
3030
// Defaults for this plugin are for node...
31-
exportConditions: ["browser", "module", "default"],
31+
exportConditions: ['browser', 'module', 'default'],
3232
}),
3333
// This is needed because babel doesn't ship a proper browser bundle...
3434
nodePolyfills(),
3535
// line-column, unified (extend)...
3636
cjs(),
3737

3838
// Emit .d.ts declaration files
39-
addon.declarations("declarations", `pnpm ember-tsc --declaration --project ${tsConfig}`),
39+
addon.declarations(
40+
'declarations',
41+
`pnpm ember-tsc --declaration --project ${tsConfig}`
42+
),
4043

4144
// Remove leftover build artifacts when starting a new build.
4245
addon.clean(),

packages/ember-repl/config/vite.config.mjs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
import { ember, extensions } from "@embroider/vite";
2-
import { join } from "node:path";
1+
import { ember, extensions } from '@embroider/vite';
2+
import { join } from 'node:path';
33

4-
import { babel } from "@rollup/plugin-babel";
5-
import { defineConfig } from "vite";
6-
import mkcert from "vite-plugin-mkcert";
4+
import { babel } from '@rollup/plugin-babel';
5+
import { defineConfig } from 'vite';
6+
import mkcert from 'vite-plugin-mkcert';
77

88
export default defineConfig({
99
build: {
10-
target: ["esnext"],
10+
target: ['esnext'],
1111
},
1212
resolve: {
1313
alias: [
1414
{
15-
find: "ember-repl",
15+
find: 'ember-repl',
1616
replacement: join(import.meta.dirname, `../src`),
1717
},
1818
],
1919
},
2020
optimizeDeps: {
2121
// a wasm-providing dependency
22-
exclude: ["content-tag"],
22+
exclude: ['content-tag'],
2323
// for top-level-await, etc
2424
esbuildOptions: {
25-
target: "esnext",
25+
target: 'esnext',
2626
},
2727
},
2828
plugins: [
2929
mkcert(),
3030
ember(),
3131
babel({
32-
babelHelpers: "inline",
32+
babelHelpers: 'inline',
3333
extensions,
3434
}),
3535
],

packages/ember-repl/tests/rendering/compile-markdown-test.gts

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ module('Rendering | compile()', function (hooks) {
114114

115115
parent.children[index] = {
116116
type: 'html',
117-
117+
118118
// @ts-ignore
119119
value: `<p>${node.value}</p>`,
120120
};
@@ -144,21 +144,24 @@ module('Rendering | compile()', function (hooks) {
144144
});
145145
});
146146

147-
module('with the plugin (configured for just this render)', function () {
148-
// https://github.com/typed-ember/glint/issues/617
149-
test('no pre renders', async function (assert) {
150-
let component: ComponentLike | undefined;
147+
module(
148+
'with the plugin (configured for just this render)',
149+
function () {
150+
// https://github.com/typed-ember/glint/issues/617
151+
test('no pre renders', async function (assert) {
152+
let component: ComponentLike | undefined;
151153

152-
await makeComponent(this, (comp) => (component = comp), {
153-
remarkPlugins: [removePre],
154-
});
155-
debugAssert(`[BUG] component`, component);
154+
await makeComponent(this, (comp) => (component = comp), {
155+
remarkPlugins: [removePre],
156+
});
157+
debugAssert(`[BUG] component`, component);
156158

157-
await render(component);
158-
// await this.pauseTest();
159-
assert.dom('pre').doesNotExist();
160-
});
161-
});
159+
await render(component);
160+
// await this.pauseTest();
161+
assert.dom('pre').doesNotExist();
162+
});
163+
}
164+
);
162165
});
163166
});
164167
});
@@ -187,7 +190,7 @@ module('Rendering | compile()', function (hooks) {
187190
onCompileStart: () => {
188191
/* not used */
189192
},
190-
193+
191194
// @ts-ignore
192195
scope: {
193196
LocalComponent,
@@ -231,7 +234,7 @@ module('Rendering | compile()', function (hooks) {
231234
onCompileStart: () => {
232235
/* not used */
233236
},
234-
237+
235238
// @ts-ignore
236239
scope: {
237240
LocalComponent,

packages/ember-repl/tests/unit/utils-test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ module('nameFor()', function () {
1212
const length = randomInRange(0, 10000);
1313

1414
let result = '';
15-
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
15+
const characters =
16+
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
1617
const charactersLength = characters.length;
1718

1819
for (let i = 0; i < length; i++) {
@@ -35,7 +36,10 @@ module('invocationOf()', function (hooks) {
3536
setupTest(hooks);
3637

3738
test('it works', function (assert) {
38-
assert.throws(() => invocationOf(''), /You must pass a name to invocationOf. Received: ``/);
39+
assert.throws(
40+
() => invocationOf(''),
41+
/You must pass a name to invocationOf. Received: ``/
42+
);
3943
assert.strictEqual(invocationOf('a'), '<A />');
4044
assert.strictEqual(invocationOf('a-1'), '<A1 />');
4145
assert.strictEqual(invocationOf('ab-1'), '<Ab1 />');

packages/ember-repl/tsconfig.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"],
99
"compilerOptions": {
1010
"rootDir": ".",
11-
"types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"]
11+
"types": [
12+
"ember-source/types",
13+
"vite/client",
14+
"@embroider/core/virtual",
15+
"@glint/ember-tsc/types"
16+
]
1217
}
1318
}

0 commit comments

Comments
 (0)