Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit bcebe35

Browse files
authored
Merge pull request #435 from Turbo87/ember-3.8
Update Ember.js to v3.8
2 parents a52533b + 2617549 commit bcebe35

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"ember-maybe-import-regenerator": "^0.1.6",
8282
"ember-mocha": "0.14.0",
8383
"ember-resolver": "4.5.6",
84-
"ember-source": "~3.2.0",
84+
"ember-source": "~3.8.0",
8585
"ember-source-channel-url": "^1.1.0",
8686
"ember-try": "^0.2.23",
8787
"eslint": "^4.19.1",

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4202,7 +4202,7 @@ ember-cli-babel@^6.7.2:
42024202
ember-cli-version-checker "^2.1.2"
42034203
semver "^5.5.0"
42044204

4205-
ember-cli-babel@^7.5.0:
4205+
ember-cli-babel@^7.2.0, ember-cli-babel@^7.5.0:
42064206
version "7.5.0"
42074207
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.5.0.tgz#af654dcef23630391d2efe85aaa3bdf8b6ca17b7"
42084208
integrity sha512-wWXqPPQNRxCtEHvYaLBNiIVgCVCy8YqZ0tM8Dpql1D5nGnPDbaK073sS1vlOYBP7xe5Ab2nXhvQkFwUxFacJ2g==
@@ -4788,25 +4788,25 @@ ember-source-channel-url@^1.1.0:
47884788
dependencies:
47894789
got "^8.0.1"
47904790

4791-
ember-source@~3.2.0:
4792-
version "3.2.2"
4793-
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.2.2.tgz#f1b899beeb838b0866a66cd327d22e567abd8a79"
4794-
integrity sha512-mnzfA/XaCPEblGGOIgS0UDirbo/cR2xsSYxiPCtvX2gOymX4/6JQ/cjh/7P8z+ylveMOR6BG5CHb3SLm4IdXJw==
4791+
ember-source@~3.8.0:
4792+
version "3.8.0"
4793+
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.8.0.tgz#b84ba995d5049514a146c6df20c2fe20de08f211"
4794+
integrity sha512-iar9EL0AglbwgsLl8jeh++2mnnpBL2u/JUttP6jjkN/pItHfBGlgBtQ3GH0xyG37DH2SbP5bsj3pBM3xm7rTdA==
47954795
dependencies:
47964796
broccoli-funnel "^2.0.1"
4797-
broccoli-merge-trees "^2.0.0"
4797+
broccoli-merge-trees "^3.0.2"
47984798
chalk "^2.3.0"
4799+
ember-cli-babel "^7.2.0"
47994800
ember-cli-get-component-path-option "^1.0.0"
48004801
ember-cli-is-package-missing "^1.0.0"
48014802
ember-cli-normalize-entity-name "^1.0.0"
48024803
ember-cli-path-utils "^1.0.0"
48034804
ember-cli-string-utils "^1.1.0"
4804-
ember-cli-valid-component-name "^1.0.0"
48054805
ember-cli-version-checker "^2.1.0"
48064806
ember-router-generator "^1.2.3"
48074807
inflection "^1.12.0"
48084808
jquery "^3.3.1"
4809-
resolve "^1.6.0"
4809+
resolve "^1.9.0"
48104810

48114811
ember-try-config@^2.2.0:
48124812
version "2.2.0"
@@ -10476,7 +10476,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.0, resolve@^1.3.3,
1047610476
dependencies:
1047710477
path-parse "^1.0.5"
1047810478

10479-
resolve@^1.3.2, resolve@^1.6.0, resolve@^1.8.1:
10479+
resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0:
1048010480
version "1.10.0"
1048110481
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
1048210482
integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==

0 commit comments

Comments
 (0)