Upgrade Ember to 3.15 and other deps (#338)

This commit is contained in:
Jeldrik Hanschke 2020-01-08 15:57:46 +01:00 committed by GitHub
parent efdc208772
commit 7e784434b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 844 additions and 1306 deletions

View file

@ -11,6 +11,7 @@
/node_modules/
# misc
/api
/coverage/
!.*

View file

@ -3,7 +3,10 @@ module.exports = {
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'

View file

@ -46,6 +46,10 @@ before_script:
# create a browser stack tunnel for cross-browser testing
- if [ $TEST = "BROWSER" ]; then node_modules/ember-cli/bin/ember browserstack:connect; fi
branches:
only:
- master
script:
# run frontend and integration tests
- if [ $TEST = "EMBER" ]; then yarn run lint:hbs; fi

View file

@ -1,14 +1,12 @@
import Application from '@ember/application';
import Resolver from './resolver';
import Resolver from 'ember-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;

View file

@ -1,3 +0,0 @@
import Resolver from 'ember-resolver';
export default Resolver;

View file

@ -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('poll', { path: '/poll/:poll_id' }, function() {
@ -19,5 +19,3 @@ Router.map(function() {
});
this.route('404');
});
export default Router;

View file

@ -4,12 +4,12 @@ module.exports = {
app: {
javascript: {
pattern: 'assets/*.js',
limit: '401KB',
limit: '410KB',
compression: 'gzip'
},
css: {
pattern: 'assets/*.css',
limit: '15.3KB',
limit: '16KB',
compression: 'gzip'
}
}

View file

@ -1,4 +1,5 @@
{
"application-template-wrapper": false,
"jquery-integration": false,
"template-only-glimmer-components": true
}

View file

@ -19,29 +19,30 @@
"test:bundlesize": "ember bundlesize:test"
},
"devDependencies": {
"@ember/optional-features": "^1.0.0",
"@ember/optional-features": "^1.1.0",
"@glimmer/component": "^1.0.0",
"babel-eslint": "^10.0.3",
"bootstrap": "^4.3.1",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.3.0",
"ember-auto-import": "^1.5.3",
"ember-awesome-macros": "^5.0.0",
"ember-bootstrap": "^3.0.0",
"ember-bootstrap-cp-validations": "^1.0.0",
"ember-cli": "~3.13.1",
"ember-cli": "~3.15.1",
"ember-cli-acceptance-test-helpers": "^1.0.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.11.1",
"ember-cli-babel": "^7.13.0",
"ember-cli-browser-navigation-button-test-helper": "^0.2.0",
"ember-cli-browserstack": "^1.0.0",
"ember-cli-bundlesize": "^0.2.0",
"ember-cli-chart": "^3.3.1",
"ember-cli-clipboard": "^0.13.0",
"ember-cli-content-security-policy": "^1.0.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deprecation-workflow": "^1.0.1",
"ember-cli-eslint": "^5.1.0",
"ember-cli-flash": "^1.4.0",
"ember-cli-htmlbars": "^4.0.0",
"ember-cli-htmlbars": "^4.2.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-mirage": "^1.0.0-beta.1",
"ember-cli-moment-shim": "^3.7.1",
@ -54,29 +55,30 @@
"ember-cp-validations": "^4.0.0-beta.8",
"ember-data": "~3.12.0",
"ember-data-model-fragments": "^4.0.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^7.0.0",
"ember-i18n": "^5.0.2",
"ember-i18n-cp-validations": "^3.0.2",
"ember-load-initializers": "^2.1.0",
"ember-load-initializers": "^2.1.1",
"ember-math-helpers": "^2.8.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-moment": "^8.0.0",
"ember-page-title": "^5.0.0",
"ember-power-calendar": "^0.14.0",
"ember-power-calendar-moment": "^0.1.4",
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.3.0",
"ember-source": "~3.13.0",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-source": "~3.15.0",
"ember-test-selectors": "^3.0.0",
"ember-transition-helper": "^1.0.0",
"ember-truth-helpers": "^2.1.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-ember": "^7.7.1",
"eslint-plugin-node": "^11.0.0",
"fs-extra": "^8.0.0",
"lerna-changelog": "^1.0.0",
"loader.js": "^4.7.0",
"open-iconic": "^1.1.1",
"qunit-dom": "^0.9.0",
"qunit-dom": "^0.9.2",
"release-it": "^12.4.3",
"release-it-lerna-changelog": "^1.0.3",
"sass": "^1.19.0",
@ -85,9 +87,11 @@
"engines": {
"node": "8.* || >= 10.*"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"paths": [
"lib/ember-cli-tar",
"lib/include-api-in-build",
"lib/inject-app-version-in-meta-tag"
]

2078
yarn.lock

File diff suppressed because it is too large Load diff