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 <[email protected]>
1 parent 8334cb7 commit 3aa2496

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
};

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.28.4",
6+
"version": "4.4.0",
77
"blueprints": [
88
{
99
"name": "app",

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (environment) {
55
modulePrefix: 'ember-octane-vs-classic-cheat-sheet',
66
environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'history',
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build

config/targets.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ const browsers = [
66
'last 1 Safari versions',
77
];
88

9-
// Ember's browser support policy is changing, and IE11 support will end in
10-
// v4.0 onwards.
11-
//
12-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13-
//
14-
// If you need IE11 support on a version of Ember that still offers support
15-
// for it, uncomment the code block below.
16-
//
17-
// const isCI = Boolean(process.env.CI);
18-
// const isProduction = process.env.EMBER_ENV === 'production';
19-
//
20-
// if (isCI || isProduction) {
21-
// browsers.push('ie 11');
22-
// }
23-
249
module.exports = {
2510
browsers,
2611
node: 'current',

package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,57 +27,57 @@
2727
"test": "ember test"
2828
},
2929
"devDependencies": {
30+
"@babel/eslint-parser": "^7.18.2",
31+
"@babel/plugin-proposal-decorators": "^7.18.2",
3032
"@ember/optional-features": "^2.0.0",
31-
"@ember/test-helpers": "^2.6.0",
32-
"@glimmer/component": "^1.0.4",
33-
"@glimmer/tracking": "^1.0.4",
34-
"@percy/cli": "^1.0.0-beta.71",
33+
"@ember/test-helpers": "^2.8.1",
34+
"@glimmer/component": "^1.1.2",
35+
"@glimmer/tracking": "^1.1.2",
36+
"@percy/cli": "^1.3.1",
3537
"@percy/ember": "^3.0.0",
36-
"babel-eslint": "^10.1.0",
3738
"broccoli-asset-rev": "^3.0.0",
38-
"ember-a11y-testing": "^4.3.0",
39-
"ember-auto-import": "^2.2.4",
40-
"ember-cli": "~3.28.4",
39+
"ember-a11y-testing": "^5.0.0",
40+
"ember-auto-import": "^2.4.2",
41+
"ember-cli": "~4.4.0",
4142
"ember-cli-app-version": "^5.0.0",
42-
"ember-cli-babel": "^7.26.6",
43-
"ember-cli-dependency-checker": "^3.2.0",
43+
"ember-cli-babel": "^7.26.11",
44+
"ember-cli-dependency-checker": "^3.3.1",
4445
"ember-cli-dependency-lint": "^2.0.1",
4546
"ember-cli-deploy": "^1.0.2",
4647
"ember-cli-deploy-build": "^2.0.0",
4748
"ember-cli-deploy-git": "^1.3.4",
48-
"ember-cli-fastboot": "^2.2.1",
49+
"ember-cli-fastboot": "^3.3.1",
4950
"ember-cli-htmlbars": "^6.0.1",
5051
"ember-cli-inject-live-reload": "^2.1.0",
5152
"ember-cli-sri": "^2.1.1",
5253
"ember-cli-terser": "^4.0.2",
5354
"ember-code-snippet": "^3.0.0",
54-
"ember-container-query": "^2.0.0-alpha.0",
55-
"ember-css-modules": "^2.0.0",
55+
"ember-container-query": "^2.1.0",
56+
"ember-css-modules": "^2.0.1",
5657
"ember-export-application-global": "^2.0.1",
5758
"ember-fetch": "^8.1.1",
58-
"ember-intl": "^5.7.0",
59+
"ember-intl": "^5.7.2",
5960
"ember-load-initializers": "^2.1.2",
60-
"ember-maybe-import-regenerator": "^1.0.0",
6161
"ember-page-title": "^7.0.0",
6262
"ember-prism": "^0.12.0",
6363
"ember-qunit": "^5.1.5",
6464
"ember-resolver": "^8.0.3",
65-
"ember-source": "~3.28.8",
66-
"ember-template-lint": "^3.14.0",
65+
"ember-source": "~4.4.0",
66+
"ember-template-lint": "^4.10.0",
6767
"ember-test-selectors": "^6.0.0",
68-
"eslint": "^7.32.0",
69-
"eslint-config-prettier": "^8.3.0",
70-
"eslint-plugin-ember": "^10.5.8",
68+
"eslint": "^8.17.0",
69+
"eslint-config-prettier": "^8.5.0",
70+
"eslint-plugin-ember": "^10.6.1",
7171
"eslint-plugin-node": "^11.1.0",
7272
"eslint-plugin-prettier": "^4.0.0",
73-
"eslint-plugin-qunit": "^7.1.0",
73+
"eslint-plugin-qunit": "^7.3.0",
7474
"loader.js": "^4.7.0",
7575
"npm-run-all": "^4.1.5",
76-
"prember": "^1.0.5",
77-
"prettier": "^2.5.1",
78-
"qunit": "^2.17.2",
76+
"prember": "^1.1.0",
77+
"prettier": "^2.7.1",
78+
"qunit": "^2.19.1",
7979
"qunit-dom": "^2.0.0",
80-
"webpack": "^5.65.0"
80+
"webpack": "^5.73.0"
8181
},
8282
"engines": {
8383
"node": "12.* || 14.* || >= 16"

tests/helpers/.gitkeep

Whitespace-only changes.

tests/helpers/index.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {
2+
setupApplicationTest as upstreamSetupApplicationTest,
3+
setupRenderingTest as upstreamSetupRenderingTest,
4+
setupTest as upstreamSetupTest,
5+
} from 'ember-qunit';
6+
7+
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
8+
// test setup functions. This way, you can easily extend the setup that is
9+
// needed per test type.
10+
11+
function setupApplicationTest(hooks, options) {
12+
upstreamSetupApplicationTest(hooks, options);
13+
14+
// Additional setup for application tests can be done here.
15+
//
16+
// For example, if you need an authenticated session for each
17+
// application test, you could do:
18+
//
19+
// hooks.beforeEach(async function () {
20+
// await authenticateSession(); // ember-simple-auth
21+
// });
22+
//
23+
// This is also a good place to call test setup functions coming
24+
// from other addons:
25+
//
26+
// setupIntl(hooks); // ember-intl
27+
// setupMirage(hooks); // ember-cli-mirage
28+
}
29+
30+
function setupRenderingTest(hooks, options) {
31+
upstreamSetupRenderingTest(hooks, options);
32+
33+
// Additional setup for rendering tests can be done here.
34+
}
35+
36+
function setupTest(hooks, options) {
37+
upstreamSetupTest(hooks, options);
38+
39+
// Additional setup for unit tests can be done here.
40+
}
41+
42+
export { setupApplicationTest, setupRenderingTest, setupTest };

tests/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
65
<title>Ember.js Octane vs Classic Cheat Sheet Tests</title>
76
<meta name="description" content="See side-by-side examples of Ember Octane and Ember Classic">
87
<meta name="viewport" content="width=device-width, initial-scale=1">

0 commit comments

Comments
 (0)