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.

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

fix: @ember/test-waiters must be a peer dependency #407

Merged
merged 4 commits into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 0 additions & 20 deletions testing/ember-app/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,24 @@ module.exports = async function () {
{
name: 'ember-release',
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
},
{
name: 'ember-beta',
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('beta'),
webpack: '^5.0.0',
},
},
},
{
name: 'ember-canary',
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('canary'),
webpack: '^5.0.0',
},
},
},
Expand All @@ -82,23 +70,15 @@ module.exports = async function () {
},
embroiderSafe({
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
}),
embroiderOptimized({
npm: {
dependencies: {
'ember-auto-import': '^2.0.0',
},
devDependencies: {
'ember-source': await getChannelURL('release'),
webpack: '^5.0.0',
},
},
}),
Expand Down
12 changes: 9 additions & 3 deletions testing/ember-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,25 @@
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test:ember": "ember test"
"test:ember": "ember test",
"embroider:start": "EMBROIDER_TEST_SETUP_FORCE=embroider EMBROIDER_TEST_SETUP_OPTIONS=optimized ember s",
"embroider:test": "EMBROIDER_TEST_SETUP_FORCE=embroider EMBROIDER_TEST_SETUP_OPTIONS=optimized ember test",
"try:embroider:start": "ember try:one embroider-optimized --- ember s",
"try:embroider:test": "ember try:one embroider-optimized"
},
"dependencies": {
"@embroider/macros": "^1.2.0",
"@ember/test-waiters": "^3.0.1",
"@embroider/macros": "^1.2.0",
"ember-concurrency": "^2.0.0",
"ember-concurrency-ts": "^0.3.1",
"ember-resources": "*"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "^1.2.0",
"@embroider/test-setup": "^1.2.0",
"@embroider/webpack": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@nullvoxpopuli/eslint-configs": "^2.1.1",
Expand Down Expand Up @@ -87,7 +93,7 @@
"ember-source": "~4.0.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^2.0.0",
"ember-try": "^1.0.0",
"ember-welcome-page": "^6.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
Expand Down
Loading