Skip to content

Commit 076b37a

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
1 parent c51ca2b commit 076b37a

File tree

191 files changed

+7191
-196687
lines changed

Some content is hidden

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

191 files changed

+7191
-196687
lines changed

.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

CHANGELOG.md

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

3-
## Release (2024-08-30)
4-
5-
@embroider/compat 3.6.1 (patch)
6-
@embroider/core 3.4.15 (patch)
7-
@embroider/macros 1.16.6 (patch)
8-
@embroider/shared-internals 2.6.3 (patch)
9-
@embroider/webpack 4.0.5 (patch)
10-
11-
#### :bug: Bug Fix
12-
* `@embroider/shared-internals`
13-
* [#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))
14-
* `@embroider/compat`
15-
* [#2067](https://github.com/embroider-build/embroider/pull/2067) codemod fixes ([@void-mAlex](https://github.com/void-mAlex))
16-
17-
#### :memo: Documentation
18-
* [#2055](https://github.com/embroider-build/embroider/pull/2055) document templateTagCodemod usage ([@void-mAlex](https://github.com/void-mAlex))
19-
20-
#### :house: Internal
21-
* `@embroider/webpack`
22-
* [#2076](https://github.com/embroider-build/embroider/pull/2076) [Stable]: Follow upstream type change from webpack ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
23-
* Other
24-
* [#2058](https://github.com/embroider-build/embroider/pull/2058) Set the packageManager field ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
25-
26-
#### Committers: 2
27-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
28-
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
29-
30-
## Release (2024-07-18)
31-
32-
@embroider/compat 3.6.0 (minor)
33-
34-
#### :rocket: Enhancement
35-
* `@embroider/compat`, `@embroider/test-scenarios`
36-
* [#1842](https://github.com/embroider-build/embroider/pull/1842) [beta] template-tag code mod ([@void-mAlex](https://github.com/void-mAlex))
37-
38-
#### Committers: 1
39-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
40-
41-
## Release (2024-07-16)
42-
43-
@embroider/compat 3.5.7 (patch)
44-
@embroider/util 1.13.2 (patch)
45-
46-
#### :bug: Bug Fix
47-
* `@embroider/compat`
48-
* [#2033](https://github.com/embroider-build/embroider/pull/2033) Remove deprecations warnings in resolver transform ([@mkszepp](https://github.com/mkszepp))
49-
* [#2047](https://github.com/embroider-build/embroider/pull/2047) Add semver to power select with create ([@mkszepp](https://github.com/mkszepp))
50-
51-
#### :house: Internal
52-
* `@embroider/test-scenarios`
53-
* [#1930](https://github.com/embroider-build/embroider/pull/1930) create a smoke test for the widest possible matrix ([@mansona](https://github.com/mansona))
54-
* Other
55-
* [#2015](https://github.com/embroider-build/embroider/pull/2015) update github actions ([@mansona](https://github.com/mansona))
56-
* `@embroider/util`, `@embroider/sample-transforms`, `@embroider/test-support`, `@embroider/test-scenarios`
57-
* [#1931](https://github.com/embroider-build/embroider/pull/1931) update scenario-tester ([@mansona](https://github.com/mansona))
58-
59-
#### Committers: 2
60-
- Chris Manson ([@mansona](https://github.com/mansona))
61-
- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
62-
63-
## Release (2024-07-03)
64-
65-
@embroider/compat 3.5.6 (patch)
66-
67-
#### :bug: Bug Fix
68-
* `@embroider/compat`
69-
* [#2012](https://github.com/embroider-build/embroider/pull/2012) Empty packages as valid v2 addons ([@BlueCutOfficial](https://github.com/BlueCutOfficial))
70-
71-
#### Committers: 1
72-
- Marine Dunstetter ([@BlueCutOfficial](https://github.com/BlueCutOfficial))
73-
74-
## Release (2024-06-27)
75-
76-
@embroider/addon-dev 5.0.0 (major)
77-
78-
#### :boom: Breaking Change
79-
* `@embroider/addon-dev`
80-
* [#2007](https://github.com/embroider-build/embroider/pull/2007) Add just the necessary files to rollup watch mode ([@vstefanovic97](https://github.com/vstefanovic97))
81-
82-
#### Committers: 1
83-
- Vuk ([@vstefanovic97](https://github.com/vstefanovic97))
84-
85-
## Release (2024-06-24)
86-
87-
@embroider/compat 3.5.5 (patch)
88-
@embroider/core 3.4.14 (patch)
89-
@embroider/macros 1.16.5 (patch)
90-
@embroider/shared-internals 2.6.2 (patch)
91-
@embroider/webpack 4.0.4 (patch)
92-
93-
#### :bug: Bug Fix
94-
* `@embroider/compat`, `@embroider/test-scenarios`
95-
* [#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))
96-
97-
#### :house: Internal
98-
* `@embroider/shared-internals`
99-
* [#2000](https://github.com/embroider-build/embroider/pull/2000) Update typescript and fix issues with Typescript 5.5 ([@mansona](https://github.com/mansona))
100-
101-
#### Committers: 2
102-
- Alex ([@void-mAlex](https://github.com/void-mAlex))
103-
- Chris Manson ([@mansona](https://github.com/mansona))
104-
1053
## Release (2024-06-20)
1064

1075
@embroider/compat 3.5.4 (patch)

README.md

-22
Original file line numberDiff line numberDiff line change
@@ -117,28 +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-
dryRun: true,
127-
});
128-
```
129-
Run a normal ember build to transform your hbs templates into template tag single file components.
130-
Requires optimized build (static* flags to be turned on)
131-
132-
### Options
133-
134-
* `shouldTransformPath` - allows users to filter the templates that the code mod would run on
135-
* `dryRun` - option can be used to obtain a summary of the changed the build would perform and which files it would act upon
136-
137-
### Limitations
138-
139-
* App templates only
140-
* `@embroider/compat` >= 3.6.0
141-
142120
## Compatibility
143121

144122
### Ember version

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
"babel-plugin-module-resolver@5.0.1": "5.0.0"
3838
},
3939
"patchedDependencies": {
40-
"ember-source@5.8.0": "patches/ember-source@5.8.0.patch",
41-
"ember-source@5.11.0": "patches/ember-source@5.11.0.patch"
40+
"ember-source@5.8.0": "patches/ember-source@5.8.0.patch"
4241
}
4342
},
4443
"devDependencies": {
@@ -59,7 +58,6 @@
5958
"publishConfig": {
6059
"registry": "https://registry.npmjs.org"
6160
},
62-
"packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e",
6361
"changelog": {
6462
"__comment__": "Our release infrastructure relies on these exact labels. Be careful changing them.",
6563
"labels": {
@@ -71,5 +69,6 @@
7169
"unlabeled": ":question: Unlabeled"
7270
},
7371
"wildcardLabel": "unlabeled"
74-
}
72+
},
73+
"packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e"
7574
}

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.

packages/addon-dev/package.json

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@embroider/addon-dev",
3-
"version": "5.0.0",
3+
"version": "4.3.1",
44
"description": "Utilities for addon authors",
55
"repository": {
66
"type": "git",
@@ -25,21 +25,14 @@
2525
"scripts": {
2626
"test": "jest"
2727
},
28-
"peerDependencies": {
29-
"rollup": "^4.6.0"
30-
},
31-
"peerDependenciesMeta": {
32-
"rollup": {
33-
"optional": true
34-
}
35-
},
3628
"dependencies": {
3729
"@embroider/core": "workspace:^",
38-
"@rollup/pluginutils": "^5.1.0",
39-
"content-tag": "^2.0.2",
30+
"@rollup/pluginutils": "^4.1.1",
31+
"content-tag": "^2.0.1",
4032
"fs-extra": "^10.0.0",
4133
"minimatch": "^3.0.4",
4234
"rollup-plugin-copy-assets": "^2.0.3",
35+
"rollup-plugin-delete": "^2.0.0",
4336
"walk-sync": "^3.0.0",
4437
"yargs": "^17.0.1"
4538
},

packages/addon-dev/src/rollup-gjs-plugin.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createFilter } from '@rollup/pluginutils';
22
import type { Plugin } from 'rollup';
3+
import { readFileSync } from 'fs';
34
import { Preprocessor } from 'content-tag';
45

56
const PLUGIN_NAME = 'rollup-gjs-plugin';
@@ -13,10 +14,11 @@ export default function rollupGjsPlugin(
1314
return {
1415
name: PLUGIN_NAME,
1516

16-
transform(input: string, id: string) {
17+
load(id: string) {
1718
if (!gjsFilter(id)) {
1819
return null;
1920
}
21+
let input = readFileSync(id, 'utf8');
2022
let code = processor.process(input, {
2123
filename: id,
2224
inline_source_map,

0 commit comments

Comments
 (0)