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 @@
root = true
[*]
end_of_line = lf
charset = utf-8
......
......@@ -8,6 +8,7 @@
# dependencies
/bower_components/
/node_modules/
# misc
/coverage/
......
'use strict';
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'
......@@ -14,26 +20,33 @@ module.exports = {
env: {
browser: true
},
rules: {
},
rules: {},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
'lib/*/index.js',
'server/**/*.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
sourceType: 'script'
},
env: {
browser: false,
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 @@
/node_modules/
# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
......
'use strict';
module.exports = {
extends: 'recommended'
extends: 'octane'
};
---
language: node_js
node_js:
- "6"
- "10"
sudo: false
dist: trusty
dist: xenial
addons:
chrome: stable
......@@ -18,10 +17,9 @@ env:
# See https://git.io/vdao3 for details.
- JOBS=1
before_install:
- npm config set spin false
branches:
only:
- master
script:
- npm run lint:hbs
- npm run lint:js
- npm test
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';
import config from 'week05/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;
import Resolver from 'ember-resolver';
export default Resolver;
import EmberRouter from '@ember/routing/router';
import config from './config/environment';
import config from 'week05/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() {
});
export default Router;
{{!-- The following component displays Ember's default welcome message. --}}
{{welcome-page}}
<WelcomePage />
{{!-- Feel free to remove this! --}}
{{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) {
EmberENV: {
FEATURES: {
// 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: {
// 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