Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable into main #2227

Merged
merged 32 commits into from
Jan 14, 2025
Merged

Merge stable into main #2227

merged 32 commits into from
Jan 14, 2025

Conversation

mansona
Copy link
Member

@mansona mansona commented Jan 8, 2025

No description provided.

simonihmig and others added 30 commits December 9, 2024 19:59
Stable is broken when running pnpm without the lockfile:

```
packages/macros/tests/babel/helpers.ts:85:15 - error TS2454: Variable 'mode' is used before being assigned.
```

Applying same fix as on `main`: 31ed2c2
This invokes glint as a rollup plugin, and contains a workaround for broken gts imports, see typed-ember/glint#628
Deprecate staticHelpers, staticModifiers, and staticComponents in favour of staticInvokables
# Conflicts:
#	.release-plan.json
#	packages/compat/src/compat-app-builder.ts
#	packages/compat/src/options.ts
#	packages/compat/src/template-tag-codemod.ts
#	pnpm-lock.yaml
#	tests/scenarios/compat-resolver-test.ts
#	tests/scenarios/compat-stage2-test.ts
#	tests/scenarios/scenarios.ts
#	tests/scenarios/template-tag-codemod-test.ts
#	tests/ts-app-template-classic/config/environment.js
@ef4 ef4 merged commit f779011 into main Jan 14, 2025
213 checks passed
@ef4 ef4 deleted the merge-stable branch January 14, 2025 14:59
@github-actions github-actions bot mentioned this pull request Jan 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants