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 15, 2022
1 parent d5355d2 commit 77f8659
Show file tree
Hide file tree
Showing 7 changed files with 1,276 additions and 108 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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"bootstrap": "^3.4.1",
"bootstrap-sass": "^3.4.1",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.2",
"ember-auto-import": "^1.5.2",
"ember-cli": "~3.14.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -55,7 +56,7 @@
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^4.5.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.13.0",
"ember-source": "~3.14.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"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 loadInitializers from 'ember-load-initializers';
import config from './config/environment';
import Resolver from './resolver';

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,14 +1,12 @@
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('twbs-clearfix');
this.route('viewport-demo');
});

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
Loading

0 comments on commit 77f8659

Please sign in to comment.