Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ember to 3.26.1 #79

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/linux-build-job.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
nodeVersion: '8.x'
nodeVersion: '14.x'

steps:
- template: setup-node.yml
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/setup-node.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
nodeVersion: '8.x'
nodeVersion: '14.x'

steps:
- task: NodeTool@0
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/setup-project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
nodeVersion: '8.x'
nodeVersion: '14.x'
globalDependencies: ''
installCommand: yarn install --non-interactive

Expand Down
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
6 changes: 3 additions & 3 deletions .ember-cli.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

process.env.EMBER_VERSION = "OCTANE";
process.env.EMBER_VERSION = 'OCTANE';

module.exports = {
/**
Expand All @@ -9,5 +9,5 @@ module.exports = {

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
}
disableAnalytics: false,
};
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
Expand Down
24 changes: 14 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: ['eslint:recommended', 'plugin:ember/recommended'],
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
env: {
browser: true,
},
Expand All @@ -15,6 +20,7 @@ module.exports = {
'no-debugger': 0,
'no-console': 0,
'no-unused-vars': 0,
'no-self-assign': 0,
},
overrides: [
// node files
Expand All @@ -24,6 +30,7 @@ module.exports = {
'.eslintrc.js',
'prod-server.js',
'server/**/*.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
Expand All @@ -34,21 +41,18 @@ module.exports = {
excludedFiles: ['app/**'],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015,
},
env: {
browser: false,
node: true,
},
plugins: ['node'],
rules: Object.assign(
{},
// eslint-disable-next-line node/no-unpublished-require
require('eslint-plugin-node').configs.recommended.rules,
{
// add your custom rules and overrides for node files here
}
),
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',
},
},
],
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# misc
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand Down
21 changes: 21 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

7 changes: 7 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';

module.exports = {
singleQuote: true,
trailingComma: 'es5',
printWidth: 100,
};
7 changes: 3 additions & 4 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
'use strict';

module.exports = {
extends: 'recommended',
extends: 'octane',
rules: {
'no-html-comments': false,
'no-implicit-this': { allow: ['current-time'] },
'img-alt-attributes': false,
'self-closing-void-elements': false,
quotes: false
}
quotes: false,
},
};
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
language: node_js
node_js:
- "10"

dist: xenial

addons:
chrome: stable

cache:
yarn: true

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

branches:
only:
- master

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

script:
- yarn test
16 changes: 7 additions & 9 deletions app/app.js
Original file line number Diff line number Diff line change
@@ -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';
import config from 'shlack/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;
3 changes: 0 additions & 3 deletions app/resolver.js

This file was deleted.

14 changes: 6 additions & 8 deletions app/router.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import EmberRouter from '@ember/routing/router';
import config from './config/environment';
import config from 'shlack/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;
Router.map(function () {});
5 changes: 1 addition & 4 deletions app/tailwind/config/border-colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ import colors from './colors';
|
*/

export default Object.assign(
{ default: colors['grey-light'] },
colors
);
export default Object.assign({ default: colors['grey-light'] }, colors);
6 changes: 3 additions & 3 deletions app/tailwind/config/border-widths.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

export default {
default: '1px',
'0': '0',
'1': '1px',
'2': '2px',
0: '0',
1: '1px',
2: '2px',
};
9 changes: 1 addition & 8 deletions app/tailwind/config/fonts.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,5 @@ export default {
'Helvetica Neue',
'sans-serif',
],
mono: [
'Menlo',
'Monaco',
'Consolas',
'Liberation Mono',
'Courier New',
'monospace',
],
mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'],
};
28 changes: 14 additions & 14 deletions app/tailwind/config/height.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
export default {
auto: 'auto',
px: '1px',
'1': '0.25rem',
'2': '0.5rem',
'3': '0.75rem',
'4': '1rem',
'5': '1.25rem',
'6': '1.5rem',
'8': '2rem',
'10': '2.5rem',
'12': '3rem',
'16': '4rem',
'24': '6rem',
'32': '8rem',
'48': '12rem',
'64': '16rem',
1: '0.25rem',
2: '0.5rem',
3: '0.75rem',
4: '1rem',
5: '1.25rem',
6: '1.5rem',
8: '2rem',
10: '2.5rem',
12: '3rem',
16: '4rem',
24: '6rem',
32: '8rem',
48: '12rem',
64: '16rem',
full: '100%',
screen: '100vh',
};
28 changes: 14 additions & 14 deletions app/tailwind/config/margin.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
export default {
auto: 'auto',
px: '1px',
'0': '0',
'1': '0.25rem',
'2': '0.5rem',
'3': '0.75rem',
'4': '1rem',
'5': '1.25rem',
'6': '1.5rem',
'8': '2rem',
'10': '2.5rem',
'12': '3rem',
'16': '4rem',
'20': '5rem',
'24': '6rem',
'32': '8rem',
0: '0',
1: '0.25rem',
2: '0.5rem',
3: '0.75rem',
4: '1rem',
5: '1.25rem',
6: '1.5rem',
8: '2rem',
10: '2.5rem',
12: '3rem',
16: '4rem',
20: '5rem',
24: '6rem',
32: '8rem',
};
2 changes: 1 addition & 1 deletion app/tailwind/config/min-height.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

export default {
'0': '0',
0: '0',
full: '100%',
screen: '100vh',
};
2 changes: 1 addition & 1 deletion app/tailwind/config/min-width.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
*/

export default {
'0': '0',
0: '0',
full: '100%',
};
Loading