Skip to content

Commit

Permalink
⬆️ v3.13.2...v3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Apr 11, 2022
1 parent be5e76a commit 669c135
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 49 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
sourceType: "module",
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ["ember"],
extends: ["eslint:recommended", "plugin:ember/recommended"],
Expand Down
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.ember-cli.js
/.env*
/.eslintignore
/.eslintrc.js
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"broccoli-asset-rev": "^3.0.0",
"clipboard": "^2.0.2",
"ct-emberjs-bling": "^0.0.1-rc.5",
"ember-auto-import": "^1.2.15",
"ember-cli": "~3.13.2",
"ember-auto-import": "^1.5.2",
"ember-cli": "~3.14.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-bootstrap-4": "^0.13.0",
"ember-cli-dependency-checker": "^3.1.0",
Expand All @@ -80,7 +80,7 @@
"ember-qunit": "^4.5.1",
"ember-resolver": "^8.0.3",
"ember-route-action-helper": "^2.0.6",
"ember-source": "~3.13.0",
"ember-source": "~3.14.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^1.2.1",
"eslint-plugin-ember": "^7.1.0",
Expand Down
12 changes: 5 additions & 7 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

const App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
});
export default class App extends Application {
modulePrefix = config.modulePrefix;
podModulePrefix = config.podModulePrefix;
Resolver = Resolver;
}

loadInitializers(App, config.modulePrefix);

export default App;
10 changes: 4 additions & 6 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import EmberRouter from '@ember/routing/router';
import config from './config/environment';

const Router = EmberRouter.extend({
location: config.locationType,
rootURL: config.rootURL
});
export default class Router extends EmberRouter {
location = config.locationType;
rootURL = config.rootURL;
}

Router.map(function () {
this.route('acceptance', function () {
Expand All @@ -24,5 +24,3 @@ Router.map(function () {
this.route('text-area-ctrl-enter-submits');
});
});

export default Router;
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.13.2",
"version": "3.14.0",
"blueprints": [
{
"name": "addon",
Expand Down
63 changes: 32 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==

"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.3.4", "@babel/core@^7.5.5":
"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.3.4", "@babel/core@^7.6.2":
version "7.17.9"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
Expand Down Expand Up @@ -555,7 +555,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.16.7"

"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.4.4":
"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.6.0":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
Expand Down Expand Up @@ -3201,7 +3201,7 @@ broccoli-clean-css@^1.1.0:
inline-source-map-comment "^1.0.5"
json-stable-stringify "^1.0.0"

broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.3, broccoli-concat@^3.7.4:
broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.4:
version "3.7.5"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==
Expand Down Expand Up @@ -5274,7 +5274,7 @@ [email protected]:
"@glimmer/compiler" "^0.27.0"
"@glimmer/syntax" "^0.27.0"

ember-auto-import@^1.2.15:
ember-auto-import@^1.2.15, ember-auto-import@^1.5.2:
version "1.12.1"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.1.tgz#09967bd35cd56ac45f413c48deabf7cfb3a785f6"
integrity sha512-Jm0vWKNAy/wYMrdSQIrG8sRsvarIRHZ2sS/CGhMdMqVKJR48AhGU7NgPJ5SIlO/+seL2VSO+dtv7aEOEIaT6BA==
Expand Down Expand Up @@ -5341,7 +5341,7 @@ ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"

ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.0, ember-cli-babel@^7.7.3:
ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
version "7.26.11"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
Expand Down Expand Up @@ -5754,12 +5754,12 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
semver "^7.3.4"
silent-error "^1.1.1"

ember-cli@~3.13.2:
version "3.13.2"
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.13.2.tgz#f09ab452b537d038ce84f4d4402abb134fb99e71"
integrity sha512-nxbUt9znMmQ4hrlSYvxFE4FN0cfqp5nAYwuvyYQ29l8aS+wRSO2KueWbgSgaHz10o4bw0O/LexXevbKK7w+ipw==
ember-cli@~3.14.0:
version "3.14.0"
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.14.0.tgz#9a142da77aa8c95e0bc2c70acc67c9809e9e45cf"
integrity sha512-ZZEArSq8ynU6FbVAQnS2Nbx2yr73EgYsAngOHKOGoJwa6YEs3LFh4lHjYsxF26Bt245lH83WnehRcdlLssNF3w==
dependencies:
"@babel/core" "^7.5.5"
"@babel/core" "^7.6.2"
"@babel/plugin-transform-modules-amd" "^7.5.0"
amd-name-resolver "^1.3.1"
babel-plugin-module-resolver "^3.2.0"
Expand Down Expand Up @@ -5804,7 +5804,7 @@ ember-cli@~3.13.2:
execa "^1.0.0"
exit "^0.1.2"
express "^4.16.4"
filesize "^4.1.2"
filesize "^4.2.0"
find-up "^4.1.0"
find-yarn-workspace-root "^1.2.1"
fs-extra "^8.1.0"
Expand All @@ -5816,24 +5816,24 @@ ember-cli@~3.13.2:
heimdalljs-fs-monitor "^0.2.3"
heimdalljs-graph "^1.0.0"
heimdalljs-logger "^0.1.10"
http-proxy "^1.17.0"
http-proxy "^1.18.0"
inflection "^1.12.0"
is-git-url "^1.0.0"
isbinaryfile "^3.0.3"
js-yaml "^3.13.1"
json-stable-stringify "^1.0.1"
leek "0.0.24"
lodash.template "^4.5.0"
markdown-it "^9.0.1"
markdown-it "^9.1.0"
markdown-it-terminal "0.1.0"
minimatch "^3.0.4"
morgan "^1.9.1"
nopt "^3.0.6"
npm-package-arg "^6.1.0"
npm-package-arg "^6.1.1"
p-defer "^3.0.0"
portfinder "^1.0.21"
portfinder "^1.0.23"
promise-map-series "^0.2.3"
promise.prototype.finally "^3.1.0"
promise.prototype.finally "^3.1.1"
quick-temp "^0.1.8"
resolve "^1.12.0"
resolve-package-path "^1.2.7"
Expand All @@ -5847,7 +5847,7 @@ ember-cli@~3.13.2:
testem "^2.17.0"
tiny-lr "^1.1.1"
tree-sync "^2.0.0"
uuid "^3.3.2"
uuid "^3.3.3"
walk-sync "^2.0.2"
watch-detector "^1.0.0"
yam "^1.0.0"
Expand Down Expand Up @@ -5971,22 +5971,22 @@ ember-source-channel-url@^3.0.0:
dependencies:
node-fetch "^2.6.0"

ember-source@~3.13.0:
version "3.13.4"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.13.4.tgz#8c6cb1666bc0491f2df1167856937593338615c9"
integrity sha512-JsH/3QQhGQZ6+KS8LdqeuQe6QoVWGCCjM08ccBh9LdPNz1TpyleNDt0PSvwTKZwOk1sm3mUvNwSfKoBw4Hj0Pw==
ember-source@~3.14.1:
version "3.14.3"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.14.3.tgz#ae764f49d1db5a1327056d469ce07dbd53cbeaab"
integrity sha512-w4vOvUEk6qnRs61bLkgnebSzlOKwo7X+OdklFoR4gJltsahzZa6SLR8VzvyrrGc/jypu2STK923txBAQ0YG9bA==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/plugin-transform-block-scoping" "^7.4.4"
"@babel/plugin-transform-block-scoping" "^7.6.0"
"@babel/plugin-transform-object-assign" "^7.2.0"
"@ember/edition-utils" "^1.1.1"
babel-plugin-debug-macros "^0.3.3"
babel-plugin-filter-imports "^3.0.0"
broccoli-concat "^3.7.3"
broccoli-concat "^3.7.4"
broccoli-funnel "^2.0.2"
broccoli-merge-trees "^3.0.2"
chalk "^2.4.2"
ember-cli-babel "^7.7.0"
ember-cli-babel "^7.11.0"
ember-cli-get-component-path-option "^1.0.0"
ember-cli-is-package-missing "^1.0.0"
ember-cli-normalize-entity-name "^1.0.0"
Expand All @@ -5997,6 +5997,7 @@ ember-source@~3.13.0:
inflection "^1.12.0"
jquery "^3.4.1"
resolve "^1.11.1"
semver "^6.1.1"
silent-error "^1.1.1"

ember-template-lint@^1.2.0:
Expand Down Expand Up @@ -6744,7 +6745,7 @@ file-uri-to-path@2:
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==

filesize@^4.1.2:
filesize@^4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
Expand Down Expand Up @@ -7953,7 +7954,7 @@ http-proxy-agent@^5.0.0:
agent-base "6"
debug "4"

http-proxy@^1.13.1, http-proxy@^1.17.0:
http-proxy@^1.13.1, http-proxy@^1.18.0:
version "1.18.1"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
Expand Down Expand Up @@ -9486,7 +9487,7 @@ markdown-it@^8.3.1:
mdurl "^1.0.1"
uc.micro "^1.0.5"

markdown-it@^9.0.1:
markdown-it@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.1.0.tgz#df9601c168568704d554b1fff9af0c5b561168d9"
integrity sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==
Expand Down Expand Up @@ -10234,7 +10235,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
semver "^5.1.0"
validate-npm-package-name "^3.0.0"

"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
Expand Down Expand Up @@ -11073,7 +11074,7 @@ popper.js@^1.14.0:
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==

portfinder@^1.0.21:
portfinder@^1.0.23:
version "1.0.28"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
Expand Down Expand Up @@ -11179,7 +11180,7 @@ promise-retry@^2.0.1:
err-code "^2.0.2"
retry "^0.12.0"

promise.prototype.finally@^3.1.0:
promise.prototype.finally@^3.1.1:
version "3.1.3"
resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz#d3186e58fcf4df1682a150f934ccc27b7893389c"
integrity sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==
Expand Down Expand Up @@ -13782,7 +13783,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

uuid@^3.0.0, uuid@^3.3.2:
uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
Expand Down

0 comments on commit 669c135

Please sign in to comment.