Skip to content

Commit 3aa2496

Browse files
authored
Updated ember-source to v4.4.2 (#108)
* chore: Updated development dependencies to their latest version * chore: Fixed linting errors * chore: Updated eslint to v8 * chore: Updated ember-source to v4.4.2 * refactor: Imported service directly from @ember/service Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
1 parent 8334cb7 commit 3aa2496

File tree

18 files changed

+2551
-3510
lines changed

18 files changed

+2551
-3510
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
2326

2427
# Ignore code examples for the cheat sheet
2528
/snippets/

.eslintrc.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
77
ecmaVersion: 2018,
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -50,7 +53,7 @@ module.exports = {
5053
},
5154
},
5255
{
53-
// Test files:
56+
// test files
5457
files: ['tests/**/*-test.{js,ts}'],
5558
extends: ['plugin:qunit/recommended'],
5659
rules: {

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
2226

2327
# Ignore code examples for the cheat sheet
2428
/snippets/

app/components/guide-section/subsection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Component from '@glimmer/component';
2-
import { inject as service } from '@ember/service';
2+
import { service } from '@ember/service';
33

44
export default class GuideSectionSubsectionComponent extends Component {
55
@service intl;

app/components/locale-menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { action } from '@ember/object';
2-
import { inject as service } from '@ember/service';
2+
import { service } from '@ember/service';
33
import Component from '@glimmer/component';
44

55
export default class LocaleMenuComponent extends Component {

app/services/locale.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Service, { inject as service } from '@ember/service';
1+
import Service, { service } from '@ember/service';
22

33
/*
44
To help with maintainenance, please list

app/templates/application.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{page-title "Ember.js Octane vs Classic Cheat Sheet"}}
1+
{{page-title (t "layout.application.title")}}
22

33
<header local-class="header">
44
<img

config/dependency-lint.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
allowedVersions: {
5-
'@ember/test-waiters': '3.0.0 || 2.4.3',
6-
},
4+
allowedVersions: {},
75
};

0 commit comments

Comments
 (0)