Skip to content

Commit

Permalink
Fix a few things that were broken on the error recovery branch
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Nov 22, 2023
1 parent c6f163d commit 3f62a88
Show file tree
Hide file tree
Showing 5 changed files with 521 additions and 283 deletions.
3 changes: 3 additions & 0 deletions packages/@glimmer-workspace/build/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export function tsconfig(updates) {
declaration: true,
declarationMap: true,
verbatimModuleSyntax: true,
isolatedModules: true,
module: ModuleKind.NodeNext,
moduleResolution: ModuleResolutionKind.NodeNext,
...updates,
Expand Down Expand Up @@ -254,6 +255,8 @@ export class Package {
* @property {boolean} [ esm ] enabled by default
* @property {boolean} [ cjs ] enabled by default until eslint-plugin-ember and ember-source no longer need it
*
* @param {Formats} [formats]
*
* @returns {import("rollup").RollupOptions[] | import("rollup").RollupOptions}
*/
config(formats = {}) {
Expand Down
2 changes: 2 additions & 0 deletions packages/@glimmer-workspace/build/lib/replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ export function createReplacePlugin(test, replacements, sourcemap) {
/** @type {TransformResult} */
const result = { code: s.toString() };
if (sourcemap) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
result.map = s.generateMap({ hires: true });
}
return result;
Expand Down
4 changes: 2 additions & 2 deletions packages/@glimmer/runtime/lib/vm/low-level.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export interface Externs {
debug: VM;
}

export interface VmDebugState {
export interface LowLevelVmDebugState {
readonly registers: Registers;
readonly currentPc: number;
readonly stack: DebugStack;
Expand Down Expand Up @@ -292,7 +292,7 @@ export class LowLevelVM {
/**
* @mutable
*/
get debug(): VmDebugState {
get debug(): LowLevelVmDebugState {
return {
currentPc: this.#registers.pc - this.#currentOpSize,
registers: this.#registers,
Expand Down
Loading

0 comments on commit 3f62a88

Please sign in to comment.