Merge pull request #1123 from embroider-build/rev-yarn-lock

Regenerate yarn.lock

.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v1
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - run: yarn --frozen-lockfile
+      - run: yarn --no-lockfile
       - name: suite
         run: ${{ matrix.command }}
         working-directory: ${{ matrix.dir }}

package.json

@@ -37,7 +37,6 @@
   },
   "resolutions": {
     "**/browserslist": "^4.14.0",
-    "**/fastboot": "^3.1.0",
     "**/qunit": "^2.14.1"
   },
   "devDependencies": {

packages/macros/tests/glimmer/macro-maybe-attrs.test.ts

@@ -23,9 +23,9 @@ describe(`macroMaybeAttrs`, function () {
 
     test('macroMaybeAttrs leaves other modifiers alone', function () {
       let code = transform(
-        `<div data-test-target {{action doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
+        `<div data-test-target {{action this.doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
       );
-      expect(code).toMatch(/<div data-test-target {{action doThing}}/);
+      expect(code).toMatch(/<div data-test-target {{action this.doThing}}/);
     });
   });
 });

tests/app-template/package.json

@@ -51,7 +51,7 @@
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.26",
+    "ember-source": "~3.28",
     "ember-template-lint": "^3.2.0",
     "eslint": "^7.23.0",
     "eslint-config-prettier": "^8.1.0",

tests/fixtures/macro-test/tests/integration/components/macro-if-test.js

@@ -89,7 +89,7 @@ module('Integration | Macro | macroCondition', function (hooks) {
       assert.ok(true, 'it ran');
     };
     await render(
-      hbs`<div data-test-target {{action doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
+      hbs`<div data-test-target {{action this.doThing}} {{macroMaybeAttrs false data-optional data-flavor="vanilla" }} ></div>`
     );
     let target = this.element.querySelector('[data-test-target]');
     await click(target);
@@ -104,7 +104,7 @@ module('Integration | Macro | macroCondition', function (hooks) {
       })
     );
     await render(
-      hbs`{{my-assertion (if (macroCondition (macroDependencySatisfies 'ember-source' '3.x')) 'red' 'blue') }}`
+      hbs`{{my-assertion (if (macroCondition (macroDependencySatisfies 'ember-source' '3.x || 4.x')) 'red' 'blue') }}`
     );
   });
 

tests/scenarios/engines-test.ts

@@ -31,6 +31,7 @@ function emberEngines(): Project {
 }
 
 appScenarios
+  .skip('release') // ember-engines doesn't have an ember 4.0 compatible release yet.
   .map('engines', project => {
     let eagerEngine = baseAddon();
     let lazyEngine = baseAddon();

tests/scenarios/package.json

@@ -28,27 +28,27 @@
     "broccoli-funnel": "^3.0.5",
     "broccoli-merge-trees": "^3.0.2",
     "broccoli-persistent-filter": "^3.1.2",
-    "ember-bootstrap": "^4.6.3",
+    "ember-bootstrap": "^5.0.0",
     "ember-cli-3.16": "npm:ember-cli@~3.16.0",
     "ember-cli-3.24": "npm:ember-cli@~3.24.0",
-    "ember-cli-3.28": "npm:ember-cli@~3.28.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-beta": "npm:ember-cli@beta",
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
     "ember-cli-latest": "npm:ember-cli@latest",
-    "ember-cli-fastboot": "^2.2.3",
+    "ember-cli-fastboot": "^3.2.0",
     "ember-composable-helpers": "^4.4.1",
     "ember-data-3.16": "npm:ember-data@~3.16.0",
     "ember-data-3.24": "npm:ember-data@~3.24.0",
-    "ember-data-3.28": "npm:ember-data@~3.28.0",
+    "ember-data": "~3.28.0",
     "ember-data-latest": "npm:ember-data@latest",
     "ember-engines": "^0.8.17",
     "ember-inline-svg": "^0.2.1",
     "ember-source-latest": "npm:ember-source@latest",
     "ember-source-beta": "npm:ember-source@beta",
     "ember-source-3.16": "npm:ember-source@~3.16.0",
     "ember-source-3.24": "npm:ember-source@~3.24.0",
-    "ember-source-3.28": "npm:ember-source@~3.28.0",
+    "ember-source": "~3.28.0",
     "ember-truth-helpers": "^3.0.0"
   },
   "volta": {

tests/scenarios/scenarios.ts

@@ -34,9 +34,9 @@ async function lts_3_24(project: Project) {
 }
 
 async function lts_3_28(project: Project) {
-  project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-3.28' });
-  project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-3.28' });
-  project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-3.28' });
+  project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source' });
+  project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli' });
+  project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data' });
 }
 
 async function release(project: Project) {

tests/scenarios/static-app-test.ts

@@ -1,13 +1,14 @@
 import { appScenarios } from './scenarios';
-import { PreparedApp } from 'scenario-tester';
+import { PreparedApp, Project } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
+import { dirname } from 'path';
 const { module: Qmodule, test } = QUnit;
 
 appScenarios
   .map('static-app', project => {
     project.linkDevDependency('bootstrap', { baseDir: __dirname });
-    project.linkDevDependency('ember-bootstrap', { baseDir: __dirname });
+    project.addDevDependency(emberBootstrap());
     project.linkDevDependency('@embroider/macros', { baseDir: __dirname });
     project.linkDevDependency('ember-composable-helpers', { baseDir: __dirname });
 
@@ -369,3 +370,12 @@ appScenarios
       });
     });
   });
+
+function emberBootstrap() {
+  // https://github.com/kaliber5/ember-bootstrap/pull/1750
+  let modifiers = Project.fromDir(dirname(require.resolve('@ember/render-modifiers')), { linkDeps: true });
+  modifiers.removeDependency('ember-source');
+  let eb = Project.fromDir(dirname(require.resolve('ember-bootstrap')), { linkDeps: true });
+  eb.addDependency(modifiers);
+  return eb;
+}