Skip to content
Snippets Groups Projects
Commit 30e43645 authored by Marcel Mernitz's avatar Marcel Mernitz
Browse files

updated week05

parent e464e106
No related branches found
No related tags found
No related merge requests found
Showing
with 65 additions and 38 deletions
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
root = true root = true
[*] [*]
end_of_line = lf end_of_line = lf
charset = utf-8 charset = utf-8
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
# dependencies # dependencies
/bower_components/ /bower_components/
/node_modules/
# misc # misc
/coverage/ /coverage/
......
'use strict';
module.exports = { module.exports = {
root: true, root: true,
parser: 'babel-eslint',
parserOptions: { parserOptions: {
ecmaVersion: 2017, ecmaVersion: 2018,
sourceType: 'module' sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
}, },
plugins: [ plugins: [
'ember' 'ember'
...@@ -14,26 +20,33 @@ module.exports = { ...@@ -14,26 +20,33 @@ module.exports = {
env: { env: {
browser: true browser: true
}, },
rules: { rules: {},
},
overrides: [ overrides: [
// node files // node files
{ {
files: [ files: [
'.eslintrc.js',
'.template-lintrc.js', '.template-lintrc.js',
'ember-cli-build.js', 'ember-cli-build.js',
'testem.js', 'testem.js',
'blueprints/*/index.js', 'blueprints/*/index.js',
'config/**/*.js', 'config/**/*.js',
'lib/*/index.js' 'lib/*/index.js',
'server/**/*.js'
], ],
parserOptions: { parserOptions: {
sourceType: 'script', sourceType: 'script'
ecmaVersion: 2015
}, },
env: { env: {
browser: false, browser: false,
node: true node: true
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off'
} }
} }
] ]
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
/node_modules/ /node_modules/
# misc # misc
/.env*
/.pnp*
/.sass-cache /.sass-cache
/connect.lock /connect.lock
/coverage/ /coverage/
......
'use strict'; 'use strict';
module.exports = { module.exports = {
extends: 'recommended' extends: 'octane'
}; };
--- ---
language: node_js language: node_js
node_js: node_js:
- "6" - "10"
sudo: false dist: xenial
dist: trusty
addons: addons:
chrome: stable chrome: stable
...@@ -18,10 +17,9 @@ env: ...@@ -18,10 +17,9 @@ env:
# See https://git.io/vdao3 for details. # See https://git.io/vdao3 for details.
- JOBS=1 - JOBS=1
before_install: branches:
- npm config set spin false only:
- master
script: script:
- npm run lint:hbs
- npm run lint:js
- npm test - npm test
import Application from '@ember/application'; import Application from '@ember/application';
import Resolver from './resolver'; import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers'; import loadInitializers from 'ember-load-initializers';
import config from './config/environment'; import config from 'week05/config/environment';
const App = Application.extend({ export default class App extends Application {
modulePrefix: config.modulePrefix, modulePrefix = config.modulePrefix;
podModulePrefix: config.podModulePrefix, podModulePrefix = config.podModulePrefix;
Resolver Resolver = Resolver;
}); }
loadInitializers(App, config.modulePrefix); loadInitializers(App, config.modulePrefix);
export default App;
import Resolver from 'ember-resolver';
export default Resolver;
import EmberRouter from '@ember/routing/router'; import EmberRouter from '@ember/routing/router';
import config from './config/environment'; import config from 'week05/config/environment';
const Router = EmberRouter.extend({ export default class Router extends EmberRouter {
location: config.locationType, location = config.locationType;
rootURL: config.rootURL rootURL = config.rootURL;
}); }
Router.map(function() { Router.map(function() {
}); });
export default Router;
{{!-- The following component displays Ember's default welcome message. --}} {{!-- The following component displays Ember's default welcome message. --}}
{{welcome-page}} <WelcomePage />
{{!-- Feel free to remove this! --}} {{!-- Feel free to remove this! --}}
{{outlet}} {{outlet}}
\ No newline at end of file
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.23.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": []
}
]
}
]
}
...@@ -9,7 +9,7 @@ module.exports = function(environment) { ...@@ -9,7 +9,7 @@ module.exports = function(environment) {
EmberENV: { EmberENV: {
FEATURES: { FEATURES: {
// Here you can enable experimental features on an ember canary build // Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
}, },
EXTEND_PROTOTYPES: { EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse. // Prevent Ember Data from overriding Date.parse.
......
{ {
"jquery-integration": true "application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": false,
"template-only-glimmer-components": true
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment