Skip to content

Commit

Permalink
Merge branch 'development' into dependabot/npm_and_yarn/ember-data-3.…
Browse files Browse the repository at this point in the history
…16.0
  • Loading branch information
iamareebjamal authored Feb 1, 2020
2 parents f3b90fd + 2e5870c commit 3e06de9
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 56 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ember-cli-autoprefixer": "0.8.1",
"ember-cli-babel": "^7.14.1",
"ember-cli-cjs-transform": "^2.0.0",
"ember-cli-clipboard": "^0.11.1",
"ember-cli-clipboard": "^0.14.0",
"ember-cli-code-coverage": "^1.0.0-beta.8",
"ember-cli-content-security-policy": "^1.1.1",
"ember-cli-dependency-checker": "^3.1.0",
Expand Down Expand Up @@ -67,7 +67,7 @@
"ember-cli-scss-lint": "^2.4.1",
"ember-cli-sentry": "^4.1.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-string-helpers": "^2.0.0",
"ember-cli-string-helpers": "^4.0.6",
"ember-cli-stripe": "^3.0.0",
"ember-cli-template-lint": "^2.0.0",
"ember-cli-uglify": "^3.0.0",
Expand All @@ -78,7 +78,7 @@
"ember-data-has-many-query": "^0.3.0",
"ember-data-storefront": "^0.17.2",
"ember-decorators": "^6.1.1",
"ember-drag-drop": "^0.6.3",
"ember-drag-drop": "^0.7.0",
"ember-exam": "^4.0.9",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "7.0.0",
Expand Down
76 changes: 23 additions & 53 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
ember-cli-babel "^6.16.0"
ember-compatibility-helpers "^1.1.1"

"@ember/render-modifiers@^1.0.2":
"@ember/render-modifiers@^1.0.1", "@ember/render-modifiers@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
Expand Down Expand Up @@ -2555,7 +2555,7 @@ babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"

babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.5.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
version "2.12.0"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75"
integrity sha512-ZQU4quX0TJ1yYyosPy5PFigKdCFEVHJ6H0b3hwjxekIP9CDwzk0OhQuKhCOPti+d52VWjjCjxu2BrXEih29mFw==
Expand Down Expand Up @@ -3391,7 +3391,7 @@ broccoli-babel-transpiler@^6.5.0:
rsvp "^4.8.2"
workerpool "^2.3.0"

broccoli-babel-transpiler@^7.1.0, broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.4.0:
broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.4.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
Expand Down Expand Up @@ -5715,27 +5715,6 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"

ember-cli-babel@7.1.3:
version "7.1.3"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.3.tgz#a2a7374adb525369a3a205cedd54d8e0c3de3309"
dependencies:
"@babel/core" "^7.0.0"
"@babel/plugin-transform-modules-amd" "^7.0.0"
"@babel/polyfill" "^7.0.0"
"@babel/preset-env" "^7.0.0"
amd-name-resolver "1.2.0"
babel-plugin-debug-macros "^0.2.0-beta.6"
babel-plugin-ember-modules-api-polyfill "^2.5.0"
babel-plugin-module-resolver "^3.1.1"
broccoli-babel-transpiler "^7.1.0"
broccoli-debug "^0.6.4"
broccoli-funnel "^2.0.1"
broccoli-source "^1.1.0"
clone "^2.1.2"
ember-cli-version-checker "^2.1.2"
ensure-posix-path "^1.0.2"
semver "^5.5.0"

ember-cli-babel@^5.2.4:
version "5.2.8"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876"
Expand Down Expand Up @@ -5846,15 +5825,17 @@ ember-cli-cjs-transform@^2.0.0:
sync-disk-cache "^1.3.3"
username "^4.0.0"

ember-cli-clipboard@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.11.1.tgz#caa6aaae498f12922102555d6825ad81ad843d2a"
ember-cli-clipboard@^0.14.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.14.0.tgz#5c6c9590543c417497d7d6f1a3df9a7c9b5e608f"
integrity sha512-cMde6B5xFbnhSDH+OdSKPaA0gRscyBMCUCXIORf/zCN6gz7rfLvS+MJ2izILqxyqgiRGpfi15BqjTa7Kyz8cCQ==
dependencies:
"@ember/render-modifiers" "^1.0.1"
broccoli-funnel "^1.1.0"
clipboard "^2.0.0"
ember-cli-babel "^7.1.2"
ember-cli-htmlbars "^2.0.2"
fastboot-transform "0.1.1"
ember-cli-babel "^7.13.0"
ember-cli-htmlbars "^4.2.0"
fastboot-transform "^0.1.3"

ember-cli-code-coverage@^1.0.0-beta.8:
version "1.0.0-beta.8"
Expand Down Expand Up @@ -6076,7 +6057,7 @@ ember-cli-htmlbars@^1.1.1:
json-stable-stringify "^1.0.0"
strip-bom "^2.0.0"

ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.2, ember-cli-htmlbars@^2.0.3:
ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.3.tgz#e116e1500dba12f29c94b05b9ec90f52cb8bb042"
dependencies:
Expand Down Expand Up @@ -6308,12 +6289,13 @@ ember-cli-shims@^1.2.0:
ember-rfc176-data "^0.3.1"
silent-error "^1.0.1"

ember-cli-string-helpers@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-2.0.0.tgz#80167028a8540edb1bedb516cd889169324553ab"
ember-cli-string-helpers@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-4.0.6.tgz#2f38538bfb6b8226624077cfe3ce335b8269c05c"
integrity sha512-ge7ri4EU9rNwE4Z8HbACvuJeFyTi7113dRLzs205RvX9vf7kEaHIKijeroqVPUioPH62JdlojCDC2h0dCw2R7g==
dependencies:
broccoli-funnel "^1.0.1"
ember-cli-babel "^6.16.0"
broccoli-funnel "^2.0.2"
ember-cli-babel "^7.7.3"

ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -6635,12 +6617,12 @@ ember-decorators@^6.1.1:
"@ember-decorators/object" "^6.1.1"
ember-cli-babel "^7.7.3"

ember-drag-drop@^0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/ember-drag-drop/-/ember-drag-drop-0.6.3.tgz#65e2adfffd427875a0fb2e9f15f470dcad2e5d3d"
ember-drag-drop@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/ember-drag-drop/-/ember-drag-drop-0.7.0.tgz#d9c3669d10927bab84ed7031e91b447f303ef30c"
integrity sha512-Yhv7md9g99AyKPrIFt8oVlDhTwSgv4e9Ers5HggMBprBOM5gY97EwdgDo7jvYuyqriqMKocni0dINELBF2dpyg==
dependencies:
ember-cli-babel "7.1.3"
ember-jquery-legacy "^1.0.0"
ember-cli-babel "^7.1.3"

ember-exam@^4.0.9:
version "4.0.9"
Expand Down Expand Up @@ -6783,12 +6765,6 @@ ember-invoke-action@^1.4.0, ember-invoke-action@^1.5.1:
dependencies:
ember-cli-babel "^6.6.0"

ember-jquery-legacy@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-jquery-legacy/-/ember-jquery-legacy-1.0.0.tgz#2a2a29109385dfabe4c626a3ac8d1dd3c6a4b9a3"
dependencies:
ember-cli-babel "^6.6.0"

ember-l10n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.0.0.tgz#c1bc495115e8d691f19ea14101f4588445f47d63"
Expand Down Expand Up @@ -8097,12 +8073,6 @@ fastboot-express-middleware@^2.0.0:
fastboot "^2.0.1"
request "^2.81.0"

fastboot-transform@0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.1.tgz#de55550d85644ec94cb11264c2ba883e3ea3b255"
dependencies:
broccoli-stew "^1.5.0"

fastboot-transform@^0.1.2, fastboot-transform@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
Expand Down

0 comments on commit 3e06de9

Please sign in to comment.