Skip to content

Commit 4a563f6

Browse files
try a
patch only win fix fix fix fix fix try fix skip Update scenarios.ts fix Update scenarios.ts Update scenarios.ts fix fix log Update scenarios.ts fix Update scenarios.ts Update scenarios.ts retry fix fix too long fix use Powershell Update scenarios.ts log Update scenarios.ts Update scenarios.ts Update scenarios.ts Update scenarios.ts Update scenarios.ts Update scenarios.ts fix Update scenarios.ts logs Update scenarios.ts Update scenarios.ts log Update scenarios.ts fix Update .eslintignore
1 parent b470496 commit 4a563f6

File tree

237 files changed

+10223
-14130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+10223
-14130
lines changed

.eslintignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
/packages/webpack/**/*.d.ts
1515
/packages/hbs-loader/**/*.js
1616
/packages/hbs-loader/**/*.d.ts
17-
/packages/broccoli-side-watch/**/*.js
18-
/packages/broccoli-side-watch/**/*.d.ts
1917
/test-packages/support/**/*.js
2018
/test-packages/**/*.d.ts
2119
/test-packages/release/src/*.js
@@ -64,3 +62,5 @@ package.json.ember-try
6462
#types added
6563
/types/**
6664

65+
66+
twsr

.github/workflows/ci.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
push:
99
branches:
1010
- main
11-
pull_request: {}
11+
pull_request:
12+
branches: [main]
1213

1314
concurrency:
1415
group: ci-${{ github.head_ref || github.ref }}
@@ -45,14 +46,12 @@ jobs:
4546

4647
steps:
4748
- uses: actions/checkout@v4
49+
- name: Work around windows short path alias # https://github.com/actions/runner-images/issues/712
50+
if: runner.os == 'Windows'
51+
run: new-item D:\temp -ItemType Directory; new-item D:\.pnpm -ItemType Directory; echo "TEMP=D:\temp" >> $env:GITHUB_ENV; echo "PNPM_HOME=D:\.pnpm" >> $env:GITHUB_ENV
4852
- uses: ./.github/actions/setup
4953
with:
5054
use_lockfile: false
51-
- name: Work around windows short path alias # https://github.com/actions/runner-images/issues/712
52-
if: runner.os == 'Windows'
53-
run: new-item D:\temp -ItemType Directory; echo "TEMP=D:\temp" >> $env:GITHUB_ENV
5455
- name: suite
5556
run: ${{ matrix.command }}
5657
working-directory: ${{ matrix.dir }}
57-
env:
58-
NODE_OPTIONS: "--max-old-space-size=8192"

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,3 @@ tests/scenarios/output/
6969
# Sys files
7070
.DS_Store
7171
*.swp
72-
73-
/tsconfig.tsbuildinfo

.prettierignore

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
/packages/webpack/**/*.d.ts
2424
/packages/hbs-loader/**/*.js
2525
/packages/hbs-loader/**/*.d.ts
26-
/packages/broccoli-side-watch/**/*.js
27-
/packages/broccoli-side-watch/**/*.d.ts
2826
/test-packages/support/**/*.js
2927
/test-packages/**/*.d.ts
3028
/test-packages/release/src/*.js

CHANGELOG.md

-248
Original file line numberDiff line numberDiff line change
@@ -1,253 +1,5 @@
11
# Embroider Changelog
22

3-
## Release (2024-11-11)
4-
5-
@embroider/addon-dev 7.0.0 (major)
6-
7-
#### :boom: Breaking Change
8-
* `@embroider/addon-dev`
9-
* [#2166](https://github.com/embroider-build/embroider/pull/2166) Fix gjs/gts sourcemaps -- we accidentally unlocked really good DX ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
10-
11-
#### Committers: 1
12-
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
13-
14-
## Release (2024-11-05)
15-
16-
@embroider/compat 3.7.0 (minor)
17-
18-
#### :rocket: Enhancement
19-
* `@embroider/compat`
20-
* [#2164](https://github.com/embroider-build/embroider/pull/2164) Support v2 ember-source ([@ef4](https://github.com/ef4))
21-
22-
#### Committers: 1
23-
- Edward Faulkner ([@ef4](https://github.com/ef4))
24-
25-
## Release (2024-10-31)
26-
27-
@embroider/addon-shim 1.9.0 (minor)
28-
29-
#### :rocket: Enhancement
30-
* `@embroider/addon-shim`
31-
* [#2158](https://github.com/embroider-build/embroider/pull/2158) Add a new option for addon-shim to pass config to ember-auto-import ([@ef4](https://github.com/ef4))
32-
33-
#### :house: Internal
34-
* `@embroider/test-scenarios`, `ts-app-template`
35-
* [#2159](https://github.com/embroider-build/embroider/pull/2159) pinning @types/qunit to fix ci ([@ef4](https://github.com/ef4))
36-
37-
#### Committers: 1
38-
- Edward Faulkner ([@ef4](https://github.com/ef4))
39-
40-
## Release (2024-10-09)
41-
42-
@embroider/compat 3.6.5 (patch)
43-
@embroider/core 3.4.19 (patch)
44-
@embroider/macros 1.16.9 (patch)
45-
@embroider/shared-internals 2.8.1 (patch)
46-
@embroider/webpack 4.0.8 (patch)
47-
48-
#### :bug: Bug Fix
49-
* `@embroider/shared-internals`
50-
* [#2151](https://github.com/embroider-build/embroider/pull/2151) Fix hbs plugin not resolving .hbs due to broken Regex ([@simonihmig](https://github.com/simonihmig))
51-
52-
#### Committers: 1
53-
- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
54-
55-
## Release (2024-10-09)
56-
57-
@embroider/broccoli-side-watch 1.0.1 (patch)
58-
59-
#### :bug: Bug Fix
60-
* `@embroider/broccoli-side-watch`
61-
* [#2148](https://github.com/embroider-build/embroider/pull/2148) Fix broken default export when required from CJS ([@simonihmig](https://github.com/simonihmig))
62-
63-
#### Committers: 1
64-
- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
65-
66-
## Release (2024-10-09)
67-
68-
@embroider/addon-dev 6.0.1 (patch)
69-
@embroider/broccoli-side-watch 1.0.0 (major)
70-
@embroider/compat 3.6.4 (patch)
71-
@embroider/core 3.4.18 (patch)
72-
@embroider/macros 1.16.8 (patch)
73-
@embroider/shared-internals 2.8.0 (minor)
74-
@embroider/webpack 4.0.7 (patch)
75-
76-
#### :boom: Breaking Change
77-
* `@embroider/broccoli-side-watch`
78-
* [#2146](https://github.com/embroider-build/embroider/pull/2146) Fix broccoli-side-watch so release-plan will release as 1.0.0 ([@simonihmig](https://github.com/simonihmig))
79-
80-
#### :rocket: Enhancement
81-
* `@embroider/broccoli-side-watch`, `@embroider/shared-internals`
82-
* [#2141](https://github.com/embroider-build/embroider/pull/2141) Add better broccoli-side-watch package ([@simonihmig](https://github.com/simonihmig))
83-
84-
#### :bug: Bug Fix
85-
* `@embroider/addon-dev`, `@embroider/test-scenarios`
86-
* [#2136](https://github.com/embroider-build/embroider/pull/2136) Enforce correct plugin order in addon-dev ([@simonihmig](https://github.com/simonihmig))
87-
88-
#### Committers: 1
89-
- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
90-
91-
## Release (2024-10-08)
92-
93-
@embroider/compat 3.6.3 (patch)
94-
95-
#### :bug: Bug Fix
96-
* `@embroider/compat`, `@embroider/test-scenarios`
97-
* [#2133](https://github.com/embroider-build/embroider/pull/2133) fix typescript support for codemod and add option for renaming elements ([@void-mAlex](https://github.com/void-mAlex))
98-
* [#2120](https://github.com/embroider-build/embroider/pull/2120) fix gts in v1 addons ([@patricklx](https://github.com/patricklx))
99-
100-
#### :house: Internal
101-
* `@embroider/test-scenarios`
102-
* [#2142](https://github.com/embroider-build/embroider/pull/2142) fixing test suite for ember >= 6 ([@ef4](https://github.com/ef4))
103-
104-
#### Committers: 3
105-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
106-
- Edward Faulkner ([@ef4](https://github.com/ef4))
107-
- Patrick Pircher ([@patricklx](https://github.com/patricklx))
108-
109-
## Release (2024-10-01)
110-
111-
@embroider/addon-dev 6.0.0 (major)
112-
@embroider/compat 3.6.2 (patch)
113-
@embroider/core 3.4.17 (patch)
114-
@embroider/macros 1.16.7 (patch)
115-
@embroider/shared-internals 2.7.0 (minor)
116-
@embroider/vite 0.2.1 (patch)
117-
@embroider/webpack 4.0.6 (patch)
118-
119-
#### :boom: Breaking Change
120-
* `@embroider/addon-dev`, `@embroider/test-scenarios`
121-
* [#2082](https://github.com/embroider-build/embroider/pull/2082) Hide base path from public URL of rollup-public-assets ([@simonihmig](https://github.com/simonihmig))
122-
123-
#### :rocket: Enhancement
124-
* `@embroider/addon-dev`, `@embroider/shared-internals`, `@embroider/test-scenarios`
125-
* [#2121](https://github.com/embroider-build/embroider/pull/2121) backport #1855 addon-dev: incremental updates to output ([@patricklx](https://github.com/patricklx))
126-
127-
#### :bug: Bug Fix
128-
* `@embroider/compat`, `@embroider/core`, `@embroider/vite`, `@embroider/webpack`, `@embroider/test-scenarios`
129-
* [#2127](https://github.com/embroider-build/embroider/pull/2127) Bump jsdom to fix punycode deprecation messages from tr46, psl, and whatwg-url ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
130-
* `@embroider/shared-internals`, `@embroider/test-scenarios`
131-
* [#2122](https://github.com/embroider-build/embroider/pull/2122) speedup windows ci on stable ([@patricklx](https://github.com/patricklx))
132-
133-
#### Committers: 3
134-
- Patrick Pircher ([@patricklx](https://github.com/patricklx))
135-
- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
136-
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
137-
138-
## Release (2024-09-20)
139-
140-
@embroider/core 3.4.16 (patch)
141-
142-
#### :bug: Bug Fix
143-
* `@embroider/core`, `@embroider/test-scenarios`
144-
* [#2088](https://github.com/embroider-build/embroider/pull/2088) Implement ember's component-template-resolving deprecation ([@ef4](https://github.com/ef4))
145-
146-
#### Committers: 1
147-
- Edward Faulkner ([@ef4](https://github.com/ef4))
148-
149-
## Release (2024-08-30)
150-
151-
@embroider/compat 3.6.1 (patch)
152-
@embroider/core 3.4.15 (patch)
153-
@embroider/macros 1.16.6 (patch)
154-
@embroider/shared-internals 2.6.3 (patch)
155-
@embroider/webpack 4.0.5 (patch)
156-
157-
#### :bug: Bug Fix
158-
* `@embroider/shared-internals`
159-
* [#2075](https://github.com/embroider-build/embroider/pull/2075) Update ember standard modules to include @ember/renderer and @ember/-internals and ember-testing ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
160-
* `@embroider/compat`
161-
* [#2067](https://github.com/embroider-build/embroider/pull/2067) codemod fixes ([@void-mAlex](https://github.com/void-mAlex))
162-
163-
#### :memo: Documentation
164-
* [#2055](https://github.com/embroider-build/embroider/pull/2055) document templateTagCodemod usage ([@void-mAlex](https://github.com/void-mAlex))
165-
166-
#### :house: Internal
167-
* `@embroider/webpack`
168-
* [#2076](https://github.com/embroider-build/embroider/pull/2076) [Stable]: Follow upstream type change from webpack ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
169-
* Other
170-
* [#2058](https://github.com/embroider-build/embroider/pull/2058) Set the packageManager field ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
171-
172-
#### Committers: 2
173-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
174-
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
175-
176-
## Release (2024-07-18)
177-
178-
@embroider/compat 3.6.0 (minor)
179-
180-
#### :rocket: Enhancement
181-
* `@embroider/compat`, `@embroider/test-scenarios`
182-
* [#1842](https://github.com/embroider-build/embroider/pull/1842) [beta] template-tag code mod ([@void-mAlex](https://github.com/void-mAlex))
183-
184-
#### Committers: 1
185-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
186-
187-
## Release (2024-07-16)
188-
189-
@embroider/compat 3.5.7 (patch)
190-
@embroider/util 1.13.2 (patch)
191-
192-
#### :bug: Bug Fix
193-
* `@embroider/compat`
194-
* [#2033](https://github.com/embroider-build/embroider/pull/2033) Remove deprecations warnings in resolver transform ([@mkszepp](https://github.com/mkszepp))
195-
* [#2047](https://github.com/embroider-build/embroider/pull/2047) Add semver to power select with create ([@mkszepp](https://github.com/mkszepp))
196-
197-
#### :house: Internal
198-
* `@embroider/test-scenarios`
199-
* [#1930](https://github.com/embroider-build/embroider/pull/1930) create a smoke test for the widest possible matrix ([@mansona](https://github.com/mansona))
200-
* Other
201-
* [#2015](https://github.com/embroider-build/embroider/pull/2015) update github actions ([@mansona](https://github.com/mansona))
202-
* `@embroider/util`, `@embroider/sample-transforms`, `@embroider/test-support`, `@embroider/test-scenarios`
203-
* [#1931](https://github.com/embroider-build/embroider/pull/1931) update scenario-tester ([@mansona](https://github.com/mansona))
204-
205-
#### Committers: 2
206-
- Chris Manson ([@mansona](https://github.com/mansona))
207-
- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
208-
209-
## Release (2024-07-03)
210-
211-
@embroider/compat 3.5.6 (patch)
212-
213-
#### :bug: Bug Fix
214-
* `@embroider/compat`
215-
* [#2012](https://github.com/embroider-build/embroider/pull/2012) Empty packages as valid v2 addons ([@BlueCutOfficial](https://github.com/BlueCutOfficial))
216-
217-
#### Committers: 1
218-
- Marine Dunstetter ([@BlueCutOfficial](https://github.com/BlueCutOfficial))
219-
220-
## Release (2024-06-27)
221-
222-
@embroider/addon-dev 5.0.0 (major)
223-
224-
#### :boom: Breaking Change
225-
* `@embroider/addon-dev`
226-
* [#2007](https://github.com/embroider-build/embroider/pull/2007) Add just the necessary files to rollup watch mode ([@vstefanovic97](https://github.com/vstefanovic97))
227-
228-
#### Committers: 1
229-
- Vuk ([@vstefanovic97](https://github.com/vstefanovic97))
230-
231-
## Release (2024-06-24)
232-
233-
@embroider/compat 3.5.5 (patch)
234-
@embroider/core 3.4.14 (patch)
235-
@embroider/macros 1.16.5 (patch)
236-
@embroider/shared-internals 2.6.2 (patch)
237-
@embroider/webpack 4.0.4 (patch)
238-
239-
#### :bug: Bug Fix
240-
* `@embroider/compat`, `@embroider/test-scenarios`
241-
* [#2005](https://github.com/embroider-build/embroider/pull/2005) unique-id helper import based on ember-source version ([@void-mAlex](https://github.com/void-mAlex))
242-
243-
#### :house: Internal
244-
* `@embroider/shared-internals`
245-
* [#2000](https://github.com/embroider-build/embroider/pull/2000) Update typescript and fix issues with Typescript 5.5 ([@mansona](https://github.com/mansona))
246-
247-
#### Committers: 2
248-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
249-
- Chris Manson ([@mansona](https://github.com/mansona))
250-
2513
## Release (2024-06-20)
2524

2535
@embroider/compat 3.5.4 (patch)

README.md

-27
Original file line numberDiff line numberDiff line change
@@ -117,33 +117,6 @@ return require('@embroider/compat').compatBuild(app, Webpack, {
117117
});
118118
```
119119

120-
## Template Tag Codemod
121-
122-
Edit `ember-cli-build.js`:
123-
```js
124-
return require('@embroider/compat').templateTagCodemod(app, {
125-
shouldTransformPath: (path) => { return true; },
126-
nameHint: (path) => {
127-
// example path: shared/my-button
128-
return path;
129-
},
130-
dryRun: true,
131-
});
132-
```
133-
Run a normal ember build to transform your hbs templates into template tag single file components.
134-
Requires optimized build (static* flags to be turned on)
135-
136-
### Options
137-
138-
* `shouldTransformPath` - allows users to filter the templates that the code mod would run on
139-
* `nameHint` - optional function control the import name and template replacement values - valid JS identifier required or it will be coerced into one
140-
* `dryRun` - option can be used to obtain a summary of the changed the build would perform and which files it would act upon
141-
142-
### Limitations
143-
144-
* App templates only
145-
* `@embroider/compat` >= 3.6.0
146-
147120
## Compatibility
148121

149122
### Ember version

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"publishConfig": {
5959
"registry": "https://registry.npmjs.org"
6060
},
61-
"packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e",
6261
"changelog": {
6362
"__comment__": "Our release infrastructure relies on these exact labels. Be careful changing them.",
6463
"labels": {
@@ -70,5 +69,6 @@
7069
"unlabeled": ":question: Unlabeled"
7170
},
7271
"wildcardLabel": "unlabeled"
73-
}
72+
},
73+
"packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e"
7474
}

packages/addon-dev/README.md

-20
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,6 @@ For a guide on porting a V1 addon to V2, see https://github.com/embroider-build/
2222

2323
A rollup plugin to expose a folder of assets. `path` is a required to define which folder to expose. `options.include` is a glob pattern passed to `walkSync.include` to pick files. `options.exlude` is a glob pattern passed to `walkSync.ignore` to exclude files. `options.namespace` is the namespace to expose files, defaults to the package name + the path that you provided e.g. if you call `addon.publicAssets('public')` in a v2 addon named `super-addon` then your namespace will default to `super-addon/public`.
2424

25-
### addon.keepAssets(patterns: string[], exports?: 'default' | '*')
26-
27-
A rollup plugin to preserve imports of non-Javascript assets unchanged in your published package. For example, the v2-addon-blueprint uses:
28-
29-
```js
30-
addon.keepAssets(['**/*.css'])
31-
```
32-
33-
so that the line `import "./my.css"` in your addon will be preserved and the corresponding CSS file will get included at the right path.
34-
35-
`keepAssets` is intended to compose correctly with other plugins that synthesize CSS imports, like `glimmer-scoped-css`. It will capture their output and produce real CSS files in your published package.
36-
37-
The `exports` option defaults to `undefined` which means the assets are used for side-effect only and don't export any values. This is the supported way to use CSS in v2 addons. But you can also preserve assets that present themselves as having default exports with the value `"default"` or arbitrary named exports with the value `"*"`. For example:
38-
39-
```js
40-
addon.keepAssets(["**/*.png"], "default")
41-
```
42-
43-
lets you say `import imageURL from './my-image.png'`. Not that this pattern is **not** automatically supported in V2 addons and you would need to tell apps that consume your addon to handle it in a custom way.
44-
4525
## addon-dev command
4626

4727
The `addon-dev` command helps with common tasks in v2 addons.

0 commit comments

Comments
 (0)