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.

Sign up for GitHub

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

Jump to bottom

Upgrade @embroider/* packages to 1.0.0 #840

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Upgrade @embroider/* packages to 1.0.0 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
]
},
"dependencies": {
"@embroider/macros": "^0.48.1",
"@embroider/macros": "^1.0.0",
"chalk": "^4.1.1",
"cli-table3": "^0.6.0",
"debug": "^4.2.0",
Expand All @@ -56,7 +56,7 @@
"devDependencies": {
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.6.0",
"@embroider/test-setup": "0.48.1",
"@embroider/test-setup": "^1.0.0",
"auto-dist-tag": "2.1.1",
"babel-eslint": "10.1.0",
"codeclimate-test-reporter": "0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{{content-for "body"}}
{{content-for "test-body"}}

<script src="/testem.js" integrity=""></script>
<script src="/testem.js" integrity="" data-embroider-ignore></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/dummy.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/async-iterator-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume previous versions of @embroider/macro happily "swallowed" qunit not being an ES module but now we need to be explicit.

I assume this has changed in embroider-build/embroider#1076 ad should be way to move forward in such scenarios.

@ef4 would appreciate you can confirm

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're correct. It was a bug that we allowed this to work before with .default.


module('Unit | Qunit | async-iterator', {
beforeEach() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/filter-test-modules-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;
let { setupTest } = importSync('ember-qunit');

module('Unit | Qunit | filter-test-modules', function () {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/multiple-edge-cases-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;

module('Qunit | #3: Module With Multiple Edge Case Tests');

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/multiple-ember-tests-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;
let { setupTest } = importSync('ember-qunit');

module('Qunit | #1: Module-For With Multiple Tests', function (hooks) {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/multiple-tests-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;

module('Qunit | #2: Module With Multiple Tests');

Expand Down
7 changes: 1 addition & 6 deletions tests/unit/qunit/test-loader-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let QUnit;
if (dependencySatisfies('ember-qunit', '>=5')) {
QUnit = importSync('qunit');
} else {
QUnit = importSync('qunit').default;
}
let QUnit = importSync('qunit').default;

let { module, test } = QUnit;

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/testem-output-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;

module('Unit | Qunit | patch-testem-output', () => {
test('add partition number to test name when `split` is passed', function (assert) {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/qunit/weight-test-modules-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from '@embroider/macros';

if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
let { module, test } = importSync('qunit');
let { module, test } = importSync('qunit').default;

module('Unit | Qunit | weight-test-modules', () => {
test('should sort a list of file paths by weight', function (assert) {
Expand Down
39 changes: 6 additions & 33 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,19 +1263,6 @@
resolve "^1.20.0"
semver "^7.3.2"

"@embroider/macros@^0.48.1":
version "0.48.1"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.48.1.tgz#fc1fd10857d40e80a20c0d366a1a8007aa424e83"
integrity sha512-JtcOL3pSxI8prstQomzNNHPBqG1K5JwrIuZwH+Q9TK4nONIH2F4z0Z0pd0SZmTEjF17E4gZN3g1J3vSX4zKuww==
dependencies:
"@embroider/shared-internals" "0.48.1"
assert-never "^1.2.1"
ember-cli-babel "^7.26.6"
find-up "^5.0.0"
lodash "^4.17.21"
resolve "^1.20.0"
semver "^7.3.2"

"@embroider/shared-internals@0.43.5":
version "0.43.5"
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.43.5.tgz#4269208095452c23bfa4f08554fd8f7ed7b83a83"
Expand All @@ -1301,19 +1288,6 @@
semver "^7.3.5"
typescript-memoize "^1.0.1"

"@embroider/shared-internals@0.48.1":
version "0.48.1"
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.48.1.tgz#4f0dcde8dba2fa47c862746898a1846a31e27f80"
integrity sha512-6Q73QXGUQianIb3xRpMNl8VMECSatA1NhjXxeIyYzwKraWhhMBpXvysLpbJ8ib1rQe1ajmkoDdXgT5pAnVMXrg==
dependencies:
babel-import-util "^0.2.0"
ember-rfc176-data "^0.3.17"
fs-extra "^9.1.0"
lodash "^4.17.21"
resolve-package-path "^4.0.1"
semver "^7.3.5"
typescript-memoize "^1.0.1"

"@embroider/shared-internals@1.0.0", "@embroider/shared-internals@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.0.0.tgz#b081708ac79e4582f17ba0f3e3796e6612a8976c"
Expand All @@ -1327,10 +1301,10 @@
semver "^7.3.5"
typescript-memoize "^1.0.1"

"@embroider/test-setup@0.48.1":
version "0.48.1"
resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.48.1.tgz#f64da84f8241433d0ba92154fa1eb3137ecd4df8"
integrity sha512-MmYTgQMDVDrZPvxeT27LTUD/BOum21ip1tEYv5H/StSeTZyZQ861Q+8HXQUFTVF/HFjGAB1c/BAgnw+8hO1ueA==
"@embroider/test-setup@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-1.0.0.tgz#f0841345326bcb55eee8437be37f3a8207146b37"
integrity sha512-jnrzNyL0mUZ+DTY59s4Yr/V+NgECpwKxuxdKJOr0hNCxC6Kpo5Dagjz22tEyiMOkZhuDdZ4qAqmTUpeu8taLnQ==
dependencies:
lodash "^4.17.21"
resolve "^1.20.0"
Expand Down Expand Up @@ -6352,7 +6326,7 @@ ember-cli-addon-docs@4.2.1:
ember-fetch "^8.1.1"
ember-get-config "^0.5.0"
ember-keyboard "^7.0.0-beta.0"
ember-modal-dialog "github:yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71"
ember-modal-dialog yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71
ember-responsive "^4.0.2"
ember-router-generator "^2.0.0"
ember-router-scroll "^4.1.2"
Expand Down Expand Up @@ -7019,9 +6993,8 @@ ember-load-initializers@2.1.2:
ember-cli-babel "^7.13.0"
ember-cli-typescript "^2.0.2"

"ember-modal-dialog@github:yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71":
ember-modal-dialog@yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71:
version "4.0.0-alpha.1"
uid "76b74f1c4b791fed5b084836c3b1c8c54836ac71"
resolved "https://codeload.github.com/yapplabs/ember-modal-dialog/tar.gz/76b74f1c4b791fed5b084836c3b1c8c54836ac71"
dependencies:
"@embroider/macros" "^0.43.5"
Expand Down