Skip to content

Support ember-source (ESM) -- without addon vendor paths#10971

Closed
NullVoxPopuli wants to merge 1 commit intomasterfrom
NullVoxPopuli-patch-7
Closed

Support ember-source (ESM) -- without addon vendor paths#10971
NullVoxPopuli wants to merge 1 commit intomasterfrom
NullVoxPopuli-patch-7

Conversation

@NullVoxPopuli
Copy link
Copy Markdown
Contributor

No description provided.

@NullVoxPopuli NullVoxPopuli force-pushed the NullVoxPopuli-patch-7 branch from b374f91 to 3980222 Compare March 28, 2026 04:07
NullVoxPopuli-ai-agent pushed a commit to NullVoxPopuli-ai-agent/ember.js that referenced this pull request Mar 28, 2026
Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
NullVoxPopuli-ai-agent pushed a commit to NullVoxPopuli-ai-agent/ember.js that referenced this pull request Mar 28, 2026
Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
@kategengler
Copy link
Copy Markdown
Member

Is this something that could be safely backported? If so you should target #release

NullVoxPopuli added a commit that referenced this pull request Mar 28, 2026
NullVoxPopuli added a commit to emberjs/ember.js that referenced this pull request Mar 28, 2026
Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
@NullVoxPopuli
Copy link
Copy Markdown
Contributor Author

released in 6.11.1

@NullVoxPopuli NullVoxPopuli deleted the NullVoxPopuli-patch-7 branch March 29, 2026 00:22
NullVoxPopuli added a commit to emberjs/ember.js that referenced this pull request Mar 29, 2026
Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
NullVoxPopuli added a commit to emberjs/ember.js that referenced this pull request Mar 29, 2026
Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
NullVoxPopuli added a commit to emberjs/ember.js that referenced this pull request Mar 29, 2026
Add pnpm patches for ember-cli and @embroider/compat paths fix

Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Add ember-cli-htmlbars patch, fix sourcemap test

- Patch [email protected] to handle missing absolutePaths in
  v7 ember-source, falling back to the ESM template compiler path.
- Update sourcemap-test.js for v7's ESM-only dist structure
  (dist/ember.debug.js no longer exists).
- Include template-compiler-test.js fix for ESM imports.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Fix ember-cli-htmlbars patch: use dist/dev/ path for v7

The v7 build outputs to dist/dev/packages/ and dist/prod/packages/,
not dist/packages/. The template compiler fallback path must use the
dev directory.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Patch ember-auto-import to handle missing absolutePaths

ember-auto-import also accesses emberSource.absolutePaths.templateCompiler
for babel template compilation config. Add the same fallback to the
dist/dev/ ESM template compiler path for v7.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Use require.resolve instead of hardcoded dist path in patches

Replace hardcoded `dist/dev/packages/ember-template-compiler/index.js`
with `require.resolve('ember-source/ember-template-compiler/index.js')`
which resolves through the package exports map, making the patches
resilient to dist layout changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Remove pnpm patches for ember-cli-htmlbars, ember-auto-import, @embroider/compat

These patches were temporary shims for v7 compatibility. The upstream
PRs have landed:
- ember-cli-htmlbars: ember-cli/ember-cli-htmlbars#793
- ember-auto-import: embroider-build/ember-auto-import#708
- @embroider/compat: embroider-build/embroider#2695

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
NullVoxPopuli added a commit to emberjs/ember.js that referenced this pull request Mar 29, 2026
Add pnpm patches for ember-cli and @embroider/compat paths fix

Patches [email protected] (ember-cli/ember-cli#10971) and
@embroider/[email protected] (embroider-build/embroider#2695) to handle
ember-source no longer exporting `paths` in v7.

- ember-cli: guard `_initVendorFiles` against missing `paths`
- @embroider/compat: skip legacy vendor file creation when `paths` absent

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Add ember-cli-htmlbars patch, fix sourcemap test

- Patch [email protected] to handle missing absolutePaths in
  v7 ember-source, falling back to the ESM template compiler path.
- Update sourcemap-test.js for v7's ESM-only dist structure
  (dist/ember.debug.js no longer exists).
- Include template-compiler-test.js fix for ESM imports.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Fix ember-cli-htmlbars patch: use dist/dev/ path for v7

The v7 build outputs to dist/dev/packages/ and dist/prod/packages/,
not dist/packages/. The template compiler fallback path must use the
dev directory.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Patch ember-auto-import to handle missing absolutePaths

ember-auto-import also accesses emberSource.absolutePaths.templateCompiler
for babel template compilation config. Add the same fallback to the
dist/dev/ ESM template compiler path for v7.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Use require.resolve instead of hardcoded dist path in patches

Replace hardcoded `dist/dev/packages/ember-template-compiler/index.js`
with `require.resolve('ember-source/ember-template-compiler/index.js')`
which resolves through the package exports map, making the patches
resilient to dist layout changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Remove pnpm patches for ember-cli-htmlbars, ember-auto-import, @embroider/compat

These patches were temporary shims for v7 compatibility. The upstream
PRs have landed:
- ember-cli-htmlbars: ember-cli/ember-cli-htmlbars#793
- ember-auto-import: embroider-build/ember-auto-import#708
- @embroider/compat: embroider-build/embroider#2695

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Lockfile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants