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

Allow Embroider v1 deps; Drop node v10 #74

Merged
merged 2 commits into from
Feb 1, 2022
Merged

Allow Embroider v1 deps; Drop node v10 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0ffd5
Allow Embroider v1 deps; Drop node v10
josemarluedke Jan 31, 2022
eb0c729
Add ember-source as peer dep because dependencySatisfies needs it
josemarluedke Feb 1, 2022
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
13 changes: 8 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"test:all": "ember try:each"
},
"dependencies": {
"@embroider/util": "^0.39.1 || ^0.40.0 || ^0.41.0",
"@embroider/util": "^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0",
"ember-cli-babel": "^7.17.2",
"ember-cli-htmlbars": "^5.1.0"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@embroider/macros": "^0.39.1 || ^0.40.0 || ^0.41.0",
"@embroider/test-setup": "^0.39.1 || ^0.40.0 || ^0.41.0",
"@embroider/macros": "^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0",
"@embroider/test-setup": "^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "^10.0.3",
Expand Down Expand Up @@ -57,8 +57,11 @@
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0"
},
"peerDependencies": {
"ember-source": "^3.8 || 4"
},
"engines": {
"node": "10.* || >= 12"
"node": "12.* || 14.* || >= 16"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -88,7 +91,7 @@
}
},
"volta": {
"node": "10.20.1",
"node": "12.22.9",
"yarn": "1.22.4"
}
}
4 changes: 2 additions & 2 deletions tests/integration/helpers/element-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ module('Integration | Helper | element', function(hooks) {
// Before the EMBER_GLIMMER_ANGLE_BRACKET_BUILT_INS feature was enabled
// in 3.10, the "dash rule" short-circuited this assertion by accident,
// so this was just a no-op but no error was thrown.
if (macroCondition(dependencySatisfies('ember-source', '>=3.25.0-beta.0'))) {
if (macroCondition(dependencySatisfies('ember-source', '>= 3.25.0-beta.0'))) {
expectEmberError(new Error('Attempted to resolve `element`, which was expected to be a component, but nothing was found.'));
} else if (macroCondition(dependencySatisfies('ember-source', '>=3.10.0-beta.0'))) {
} else if (macroCondition(dependencySatisfies('ember-source', '>= 3.10.0-beta.0'))) {
expectEmberError(new Error('Assertion Failed: Helpers may not be used in the block form, for example {{#element}}{{/element}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (element)}}{{/if}}.'));
}

Expand Down
Loading