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 #2030

Merged
merged 28 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
760a202
Add just the necessary files to rollup watch mode
vstefanovic97 Jun 26, 2024
c9a9be3
Add rollup as a peerDep to @embroider/addon-dev
vstefanovic97 Jun 26, 2024
9c22cab
Merge pull request #2007 from vstefanovic97/watch-only-necessary-files
mansona Jun 27, 2024
f916896
Prepare Release using 'release-plan'
mansona Jun 27, 2024
c1c13d6
Merge pull request #2009 from embroider-build/release-preview-stable
mansona Jun 27, 2024
14fdcb0
fix(empty package): when generating an empty rewritten-package, add t…
BlueCutOfficial Jul 3, 2024
6c91dca
Merge pull request #2012 from embroider-build/fix-empty-packages
mansona Jul 3, 2024
5da0fe8
Prepare Release using 'release-plan'
mansona Jul 3, 2024
4a41698
update scenario-tester
mansona May 20, 2024
98aa0b5
fix(scenarios deps): add the version of popper.js required by bootstr…
BlueCutOfficial Jul 3, 2024
ecc205b
Merge pull request #2013 from embroider-build/release-preview-stable
mansona Jul 3, 2024
a11010d
tests(fix timeout): tests projects should not try to import a testem …
BlueCutOfficial Jul 3, 2024
a8c9dfe
Merge pull request #1931 from embroider-build/scenario-tester
mansona Jul 3, 2024
804cb02
create a smoke test for the widest possible matrix
mansona May 20, 2024
2489f4b
pin ember-data to avoid audit issues
mansona Jul 4, 2024
7edc668
update github actions
mansona Jul 4, 2024
3882c9a
Merge pull request #2015 from embroider-build/update-github-actions
mansona Jul 4, 2024
6c60e6d
work around bug in fixturify-project
mansona Jul 4, 2024
bc84f8b
make sure that we have babel/core at the top level when using ember-c…
mansona Jul 4, 2024
22e9631
Merge pull request #1930 from embroider-build/update-canary-stable
ef4 Jul 4, 2024
2bde936
Merge branch 'stable' into merge-stable
ef4 Jul 6, 2024
2f11c88
fix test-helpers-3 requirement
ef4 Jul 7, 2024
336bdcd
make sure macro tests still have ember-cli-babel in dependencies and …
mansona Jul 8, 2024
de106e6
add popper.js back from bad stable-merge conflict
mansona Jul 8, 2024
86688d6
skip old ember versions
mansona Jul 8, 2024
675a01d
fix test-helpers for util tests
mansona Jul 8, 2024
9c6a0e5
use D drive for windows temp to speed things up
mansona Jun 21, 2024
9e64c75
temporarily skip some failing windows tests
mansona Jul 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
use_lockfile: false
- name: Work around windows short path alias # https://github.com/actions/runner-images/issues/712
if: runner.os == 'Windows'
run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
run: new-item D:\temp -ItemType Directory; echo "TEMP=D:\temp" >> $env:GITHUB_ENV
- name: suite
run: ${{ matrix.command }}
working-directory: ${{ matrix.dir }}
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Embroider Changelog

## Release (2024-07-03)

@embroider/compat 3.5.6 (patch)

#### :bug: Bug Fix
* `@embroider/compat`
* [#2012](https://github.com/embroider-build/embroider/pull/2012) Empty packages as valid v2 addons ([@BlueCutOfficial](https://github.com/BlueCutOfficial))

#### Committers: 1
- Marine Dunstetter ([@BlueCutOfficial](https://github.com/BlueCutOfficial))

## Release (2024-06-27)

@embroider/addon-dev 5.0.0 (major)

#### :boom: Breaking Change
* `@embroider/addon-dev`
* [#2007](https://github.com/embroider-build/embroider/pull/2007) Add just the necessary files to rollup watch mode ([@vstefanovic97](https://github.com/vstefanovic97))

#### Committers: 1
- Vuk ([@vstefanovic97](https://github.com/vstefanovic97))

## Release (2024-06-24)

@embroider/compat 3.5.5 (patch)
Expand Down
10 changes: 9 additions & 1 deletion packages/addon-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@embroider/addon-dev",
"version": "4.3.1",
"version": "5.0.0",
"description": "Utilities for addon authors",
"repository": {
"type": "git",
Expand All @@ -25,6 +25,14 @@
"scripts": {
"test": "jest"
},
"peerDependencies": {
"rollup": "^4.6.0"
},
"peerDependenciesMeta": {
"rollup": {
"optional": true
}
},
"dependencies": {
"@embroider/core": "workspace:^",
"@rollup/pluginutils": "^4.1.1",
Expand Down
8 changes: 2 additions & 6 deletions packages/addon-dev/src/rollup-keep-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ export default function keepAssets({
return {
name: 'copy-assets',

// Prior to https://github.com/rollup/rollup/pull/5270, we cannot call this
// from within `generateBundle`
buildStart() {
this.addWatchFile(from);
},

// imports of assets should be left alone in the source code. This can cover
// the case of .css as defined in the embroider v2 addon spec.
async resolveId(source, importer, options) {
Expand All @@ -44,6 +38,8 @@ export default function keepAssets({
globs: include,
directories: false,
})) {
this.addWatchFile(join(from, name));

this.emitFile({
type: 'asset',
fileName: name,
Expand Down
4 changes: 2 additions & 2 deletions packages/addon-dev/src/rollup-public-entrypoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ export default function publicEntrypoints(args: {
return {
name: 'addon-modules',
async buildStart() {
this.addWatchFile(args.srcDir);

let matches = walkSync(args.srcDir, {
globs: [...args.include, '**/*.hbs', '**/*.ts', '**/*.gts', '**/*.gjs'],
ignore: args.exclude,
});

for (let name of matches) {
this.addWatchFile(path.join(args.srcDir, name));

// the matched file, but with the extension swapped with .js
let normalizedName = normalizeFileExt(name);

Expand Down
2 changes: 1 addition & 1 deletion packages/compat/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@embroider/compat",
"version": "3.5.5",
"version": "3.5.6",
"private": false,
"description": "Backward compatibility layer for the Embroider build system.",
"repository": {
Expand Down
6 changes: 6 additions & 0 deletions packages/compat/src/empty-package-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ export default class extends Plugin {
writeJSONSync(join(this.outputPath, 'package.json'), {
name: this.originalPackage.name,
version: this.originalPackage.version,
keywords: ['ember-addon'],
'ember-addon': {
version: 2,
type: 'addon',
'auto-upgraded': true,
},
'//': 'This empty package was created by embroider. See https://github.com/embroider-build/embroider/blob/main/docs/empty-package-output.md',
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.9.1",
"@ember/test-helpers": "^3.0.3",
"@embroider/compat": "workspace:*",
"@embroider/core": "workspace:*",
"@embroider/test-setup": "workspace:*",
Expand Down
24 changes: 22 additions & 2 deletions packages/util/testem.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,22 @@
const { testemConfig } = require('@embroider/test-support/testem-config');
module.exports = testemConfig();
module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_start_timeout: 90,
browser_args: {
Chrome: {
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900',
`--crash-dumps-dir=${process.env.TMPDIR}`,
].filter(Boolean),
},
},
};
Loading
Loading