Merge pull request #2030 from embroider-build/merge-stable

Merge stable

Author: mansona

.github/workflows/ci.yml

@@ -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 }}

CHANGELOG.md

@@ -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)

packages/addon-dev/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-dev",
-  "version": "4.3.1",
+  "version": "5.0.0",
   "description": "Utilities for addon authors",
   "repository": {
     "type": "git",
@@ -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",

packages/addon-dev/src/rollup-keep-assets.ts

@@ -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) {
@@ -44,6 +38,8 @@ export default function keepAssets({
         globs: include,
         directories: false,
       })) {
+        this.addWatchFile(join(from, name));
+
         this.emitFile({
           type: 'asset',
           fileName: name,

packages/addon-dev/src/rollup-public-entrypoints.ts

@@ -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);
 

packages/compat/package.json

@@ -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": {

packages/compat/src/empty-package-tree.ts

@@ -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',
       });
     }

packages/util/package.json

@@ -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:*",

packages/util/testem.js

@@ -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),
+    },
+  },
+};