diff --git a/packages/compat/package.json b/packages/compat/package.json
index cbd6ac329..d29258b9d 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -87,7 +87,7 @@
"broccoli-node-api": "^1.7.0",
"code-equality-assertions": "^0.9.0",
"ember-engines": "^0.8.19",
- "scenario-tester": "^2.1.2",
+ "scenario-tester": "^3.0.1",
"typescript": "^5.1.6"
},
"peerDependencies": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 5b438d9c7..4e770aba3 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -49,7 +49,7 @@
"@types/semver": "^7.3.6",
"babel-plugin-ember-template-compilation": "^2.1.1",
"code-equality-assertions": "^0.9.0",
- "scenario-tester": "^2.1.2",
+ "scenario-tester": "^3.0.1",
"typescript": "^5.1.6"
},
"peerDependencies": {
diff --git a/packages/macros/tests/babel/dependency-satisfies.test.ts b/packages/macros/tests/babel/dependency-satisfies.test.ts
index 64a295792..3bba37ae9 100644
--- a/packages/macros/tests/babel/dependency-satisfies.test.ts
+++ b/packages/macros/tests/babel/dependency-satisfies.test.ts
@@ -20,7 +20,7 @@ describe(`dependencySatisfies`, function () {
allBabelVersions({
includePresetsTests: true,
babelConfig() {
- project.writeSync();
+ project.write();
let config = MacrosConfig.for({}, project.baseDir);
config.finalize();
return {
@@ -141,7 +141,7 @@ describe(`dependencySatisfies`, function () {
import { dependencySatisfies } from '@embroider/macros';
export default function() {
- return {
+ return {
// specified in dependencies
util: dependencySatisfies('@embroider/util', '*'),
diff --git a/packages/macros/tests/babel/macro-condition.test.ts b/packages/macros/tests/babel/macro-condition.test.ts
index 723b14035..1945562ef 100644
--- a/packages/macros/tests/babel/macro-condition.test.ts
+++ b/packages/macros/tests/babel/macro-condition.test.ts
@@ -12,7 +12,7 @@ describe('macroCondition', function () {
beforeAll(() => {
project = new Project('test-app');
project.addDependency('qunit', '2.0.0');
- project.writeSync();
+ project.write();
filename = join(project.baseDir, 'sample.js');
});
diff --git a/packages/macros/tests/glimmer/dependency-satisfies.test.ts b/packages/macros/tests/glimmer/dependency-satisfies.test.ts
index 0531aa520..07bf3faa5 100644
--- a/packages/macros/tests/glimmer/dependency-satisfies.test.ts
+++ b/packages/macros/tests/glimmer/dependency-satisfies.test.ts
@@ -6,11 +6,11 @@ describe('dependency satisfies', () => {
let project: Project;
let filename: string;
- beforeAll(() => {
+ beforeAll(async () => {
project = new Project('app');
project.addDependency('qunit', '2.9.1');
project.addDependency('foo', '1.1.0-beta.1');
- project.writeSync();
+ await project.write();
filename = join(project.baseDir, 'sample.js');
});
diff --git a/packages/macros/tests/glimmer/macro-condition.test.ts b/packages/macros/tests/glimmer/macro-condition.test.ts
index 27263f46d..0a9354026 100644
--- a/packages/macros/tests/glimmer/macro-condition.test.ts
+++ b/packages/macros/tests/glimmer/macro-condition.test.ts
@@ -63,10 +63,10 @@ describe(`macroCondition`, function () {
expect(code).toMatch(/\{\{my-assertion undefined\}\}/);
});
- test('macroCondition composes with other macros, true case', function () {
+ test('macroCondition composes with other macros, true case', async function () {
project = new Project('app');
project.addDependency('ember-source', '3.1.2');
- project.writeSync();
+ await project.write();
let code = transform(
`{{my-assertion (if (macroCondition (macroDependencySatisfies 'ember-source' '3.x')) 'red' 'blue') }}`,
{ filename: join(project.baseDir, 'sample.js') }
@@ -74,10 +74,10 @@ describe(`macroCondition`, function () {
expect(code).toMatch(/\{\{my-assertion ["']red["']\}\}/);
});
- test('macroCondition composes with other macros, false case', function () {
+ test('macroCondition composes with other macros, false case', async function () {
project = new Project('app');
project.addDependency('ember-source', '3.1.2');
- project.writeSync();
+ await project.write();
let code = transform(
`{{my-assertion (if (macroCondition (macroDependencySatisfies 'ember-source' '10.x')) 'red' 'blue') }}`,
{ filename: join(project.baseDir, 'sample.js') }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b7031b9b7..32feb3dda 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -348,8 +348,8 @@ importers:
specifier: ^0.8.19
version: 0.8.23(@glint/template@1.2.1)
scenario-tester:
- specifier: ^2.1.2
- version: 2.1.2
+ specifier: ^3.0.1
+ version: 3.0.1
typescript:
specifier: ^5.1.6
version: 5.2.2
@@ -575,8 +575,8 @@ importers:
specifier: ^0.9.0
version: 0.9.0(@types/jest@29.5.11)(qunit@2.20.0)
scenario-tester:
- specifier: ^2.1.2
- version: 2.1.2
+ specifier: ^3.0.1
+ version: 3.0.1
typescript:
specifier: ^5.1.6
version: 5.2.2
@@ -1577,8 +1577,8 @@ importers:
specifier: ^3.23.0
version: 3.29.4
scenario-tester:
- specifier: ^2.1.2
- version: 2.1.2
+ specifier: ^3.0.1
+ version: 3.0.1
semver:
specifier: ^7.3.8
version: 7.5.4
@@ -8155,7 +8155,6 @@ packages:
resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
dependencies:
'@types/node': 15.14.9
- dev: true
/@types/glob@7.2.0:
resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
@@ -8315,6 +8314,12 @@ packages:
'@types/glob': 8.1.0
'@types/node': 15.14.9
+ /@types/rimraf@3.0.2:
+ resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==}
+ dependencies:
+ '@types/glob': 8.1.0
+ '@types/node': 15.14.9
+
/@types/rsvp@4.0.8:
resolution: {integrity: sha512-OraQXMlBrD3nll0VuEKENY3IoR4N3eDIqElVWo5dSheMveYYMDSIUMbtcI7wOGWyUilLwfaOx9VF8U8LdrHXkg==}
dev: true
@@ -17171,16 +17176,16 @@ packages:
tmp: 0.0.33
type-fest: 0.11.0
- /fixturify-project@5.2.0:
- resolution: {integrity: sha512-7H20FpTbA8P586gS/5SuVmKYLBdOs1oPTF7R2If5lhlcmI+ht48p9atbBtD6kOIuRUPrx6W2yLxUCToBl8W22w==}
+ /fixturify-project@6.0.0:
+ resolution: {integrity: sha512-cT+rudgGhYKJ4h5DIrDj4T2HfZMzF17c+PtQ3gYGXr67hsPkptjAvm6HhmHa7TuzJ2/yHYTGBlVXh5HB3LhVhQ==}
engines: {node: '>= 14.*'}
dependencies:
bin-links: 3.0.3
deepmerge: 4.3.1
- fixturify: 2.1.1
+ fixturify: 3.0.0
resolve-package-path: 4.0.3
tmp: 0.0.33
- type-fest: 2.19.0
+ type-fest: 4.8.3
walk-sync: 3.0.0
/fixturify@0.3.4:
@@ -17211,6 +17216,17 @@ packages:
matcher-collection: 2.0.1
walk-sync: 2.2.0
+ /fixturify@3.0.0:
+ resolution: {integrity: sha512-PFOf/DT9/t2NCiVyiQ5cBMJtGZfWh3aeOV8XVqQQOPBlTv8r6l0k75/hm36JOaiJlrWFk/8aYFyOKAvOkrkjrw==}
+ engines: {node: 14.* || >= 16.*}
+ dependencies:
+ '@types/fs-extra': 9.0.13
+ '@types/minimatch': 3.0.5
+ '@types/rimraf': 3.0.2
+ fs-extra: 10.1.0
+ matcher-collection: 2.0.1
+ walk-sync: 3.0.0
+
/flat-cache@2.0.1:
resolution: {integrity: sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==}
engines: {node: '>=4'}
@@ -22276,11 +22292,11 @@ packages:
dependencies:
xmlchars: 2.2.0
- /scenario-tester@2.1.2:
- resolution: {integrity: sha512-fuwZoavM2v3CyfghIc3gCi36vFDSzIAW1mdgxjUXVQIsoR0aTG657CMnwYAagIN8Aqn1Qt9oJMuqIpggOvybQg==}
+ /scenario-tester@3.0.1:
+ resolution: {integrity: sha512-uF08VtuLdVp/B9vevM17qjWrIUggqREVjVaIro7vRXo4bYcQUoh6CSIRSkT/5uKz6WVBSU5Y1et6vimQXmGpdQ==}
hasBin: true
dependencies:
- fixturify-project: 5.2.0
+ fixturify-project: 6.0.0
fs-extra: 9.1.0
glob: 7.2.3
tmp: 0.2.1
@@ -23728,9 +23744,9 @@ packages:
engines: {node: '>=10'}
dev: true
- /type-fest@2.19.0:
- resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
- engines: {node: '>=12.20'}
+ /type-fest@4.8.3:
+ resolution: {integrity: sha512-//BaTm14Q/gHBn09xlnKNqfI8t6bmdzx2DXYfPBNofN0WUybCEUDcbCWcTa0oF09lzLjZgPphXAsvRiMK0V6Bw==}
+ engines: {node: '>=16'}
/type-is@1.6.18:
resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
@@ -23912,7 +23928,7 @@ packages:
resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
hasBin: true
peerDependencies:
- browserslist: '>= 4.21.0'
+ browserslist: ^4.14.0
dependencies:
browserslist: 4.22.2
escalade: 3.1.1
diff --git a/tests/scenarios/compat-resolver-test.ts b/tests/scenarios/compat-resolver-test.ts
index 44fb2104e..485c365da 100644
--- a/tests/scenarios/compat-resolver-test.ts
+++ b/tests/scenarios/compat-resolver-test.ts
@@ -31,7 +31,7 @@ Scenarios.fromProject(() => new Project())
app.pkg = {
name: 'my-app',
keywords: ['ember-addon'],
- 'ember-addon': appMeta,
+ 'ember-addon': appMeta as any,
};
app.mergeFiles({
'index.html': '',
@@ -527,7 +527,7 @@ Scenarios.fromProject(() => new Project())
}
);
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
import helloWorld_ from "#embroider_compat/components/hello-world";
import firstTarget_ from "#embroider_compat/components/first-target";
@@ -560,7 +560,7 @@ Scenarios.fromProject(() => new Project())
}
);
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
import helloWorld_ from "#embroider_compat/components/hello-world";
import firstTarget_ from "#embroider_compat/components/first-target";
@@ -593,7 +593,7 @@ Scenarios.fromProject(() => new Project())
}
);
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
import helloWorld_ from "#embroider_compat/ambiguous/hello-world";
import firstTarget_ from "#embroider_compat/components/first-target";
@@ -614,7 +614,7 @@ Scenarios.fromProject(() => new Project())
'templates/application.hbs': `{{(this.myHelper)}}`,
});
await configure({ staticHelpers: true });
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
export default precompileTemplate("{{(this.myHelper)}}", {
moduleName: "my-app/templates/application.hbs"
@@ -627,7 +627,7 @@ Scenarios.fromProject(() => new Project())
'templates/application.hbs': `{{(this.myHelper 42)}}`,
});
await configure({ staticHelpers: true });
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
export default precompileTemplate("{{(this.myHelper 42)}}", {
moduleName: "my-app/templates/application.hbs"
@@ -640,7 +640,7 @@ Scenarios.fromProject(() => new Project())
'templates/application.hbs': `{{#if (this.myHelper)}}{{/if}}`,
});
await configure({ staticHelpers: true });
- expectTranspiled('templates/application.hbs').equalsCode(`
+ expectTranspiled('templates/application.hbs').equalsCode(`
import { precompileTemplate } from "@ember/template-compilation";
export default precompileTemplate("{{#if (this.myHelper)}}{{/if}}", {
moduleName: "my-app/templates/application.hbs"
@@ -687,7 +687,7 @@ Scenarios.fromProject(() => new Project())
'templates/application.hbs': `