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

More dependencies upgrade #1058

Merged
merged 1 commit into from
Nov 5, 2019
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
8 changes: 4 additions & 4 deletions lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"ember-addon"
],
"dependencies": {
"ember-cli-babel": "^7.1.2",
Copy link
Member

Choose a reason for hiding this comment

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

Do we even need this package.json? If we omit it, would it use the deps from the root package.json?

Copy link
Member Author

Choose a reason for hiding this comment

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

We need it for the ember-addon stuff but I switched the deps to * so it just uses whatever is at the root

"ember-cli-htmlbars": "^4.0.8",
"ember-cli-sass": "^7.1.7",
"ember-svg-jar": "^1.2.2"
"ember-cli-babel": "*",
"ember-cli-htmlbars": "*",
"ember-cli-sass": "*",
"ember-svg-jar": "*"
}
}
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@ember/edition-utils": "^1.1.1",
"@ember/optional-features": "^1.1.0",
"@ember/render-modifiers": "^1.0.1",
"@glimmer/component": "^0.14.0-alpha.12",
"@glimmer/component": "^1.0.0-beta.1",
"@html-next/vertical-collection": "^1.0.0",
"amd-name-resolver": "^1.2.1",
"aws-sdk": "^2.533.0",
Expand All @@ -53,7 +53,7 @@
"codeclimate-test-reporter": "^0.5.1",
"compare-versions": "^3.5.0",
"del": "^5.1.0",
"ember-auto-import": "^1.2.20",
"ember-auto-import": "^1.5.2",
"ember-cli": "~3.13.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.11.1",
Expand All @@ -63,10 +63,10 @@
"ember-cli-htmlbars": "^4.0.8",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-pretender": "^3.1.1",
"ember-cli-sass": "^10.0.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-showdown": "^4.4.4",
"ember-cli-sri": "^2.1.1",
"ember-cli-stylelint": "^3.0.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-uglify": "^3.0.0",
Expand Down Expand Up @@ -96,6 +96,7 @@
"js-string-escape": "^1.0.0",
"loader.js": "^4.7.0",
"mkdirp": "^0.5.1",
"pretender": "^3.0.4",
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to switch any imports with the switch from ember-cli-pretender to pretender?

Copy link
Member

Choose a reason for hiding this comment

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

No, ember-cli-pretender made import Pretender from 'pretender' work

Copy link
Member Author

Choose a reason for hiding this comment

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

"qunit-dom": "^0.9.0",
"rimraf": "^3.0.0",
"sass": "^1.22.10",
Expand Down
Loading