Skip to content

Commit e300cb8

Browse files
committed
v3.28.4...v5.10.0
1 parent 64ac94c commit e300cb8

23 files changed

+183
-160
lines changed

.ember-cli

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"disableAnalytics": false
2+
"disableAnalytics": false,
3+
/**
4+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
5+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
6+
*/
7+
"isTypeScriptProject": false
38
}

.eslintignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

.eslintrc.js

+10-12
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: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
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'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./testem.js',
@@ -41,16 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
46-
rules: {
47-
// this can be removed once the following is fixed
48-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49-
'node/no-unpublished-require': 'off',
50-
},
48+
extends: ['plugin:n/recommended'],
5149
},
5250
{
53-
// Test files:
51+
// test files
5452
files: ['tests/**/*-test.{js,ts}'],
5553
extends: ['plugin:qunit/recommended'],
5654
},

.github/workflows/ci.yml

+26-31
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,47 @@
11
name: CI
22

3-
on:
3+
on:
44
push:
55
branches:
66
- main
7-
pull_request:
7+
- master
8+
pull_request: {}
89

9-
env:
10-
NODE_VERSION: 14
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1113

1214
jobs:
1315
lint:
14-
name: Lint files
16+
name: "Lint"
1517
runs-on: ubuntu-latest
16-
timeout-minutes: 3
17-
steps:
18-
- name: Check out a copy of the repo
19-
uses: actions/checkout@v2
18+
timeout-minutes: 10
2019

21-
- name: Use Node.js ${{ env.NODE_VERSION }}
22-
uses: actions/setup-node@v2
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
2324
with:
24-
cache: 'npm'
25-
node-version: ${{ env.NODE_VERSION }}
26-
27-
- name: Install dependencies
25+
node-version: 18
26+
cache: npm
27+
- name: Install Dependencies
2828
run: npm ci
29-
3029
- name: Lint
3130
run: npm run lint
3231

33-
34-
test-app:
35-
name: Test app
32+
test:
33+
name: "Test"
3634
runs-on: ubuntu-latest
37-
timeout-minutes: 3
38-
steps:
39-
- name: Check out a copy of the repo
40-
uses: actions/checkout@v2
35+
timeout-minutes: 10
4136

42-
- name: Use Node.js ${{ env.NODE_VERSION }}
43-
uses: actions/setup-node@v2
37+
steps:
38+
- uses: actions/checkout@v3
39+
- name: Install Node
40+
uses: actions/setup-node@v3
4441
with:
45-
cache: 'npm'
46-
node-version: ${{ env.NODE_VERSION }}
47-
48-
- name: Install dependencies
42+
node-version: 18
43+
cache: npm
44+
- name: Install Dependencies
4945
run: npm ci
50-
51-
- name: Test
46+
- name: Run Tests
5247
run: npm test

.gitignore

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115

2216
# ember-try
2317
/.node_modules.ember-try/
24-
/bower.json.ember-try
18+
/npm-shrinkwrap.json.ember-try
2519
/package.json.ember-try
2620
.DS_Store
21+
/package-lock.json.ember-try
22+
/yarn.lock.ember-try
23+
24+
# broccoli-debug
25+
/DEBUG/

.prettierignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
10+
.*/
1711

1812
# ember-try
1913
/.node_modules.ember-try/
20-
/bower.json.ember-try
21-
/package.json.ember-try

.prettierrc.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

README.md

+16-15
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,39 @@ This is a working repository for the Ember Upgrade Guide.
1010

1111
You will need the following things properly installed on your computer.
1212

13-
* [Git](https://git-scm.com/)
14-
* [Node.js](https://nodejs.org/)
15-
* [Ember CLI](https://ember-cli.com/)
16-
* [Google Chrome](https://google.com/chrome/)
13+
- [Git](https://git-scm.com/)
14+
- [Node.js](https://nodejs.org/) (with npm)
15+
- [Ember CLI](https://cli.emberjs.com/release/)
16+
- [Google Chrome](https://google.com/chrome/)
1717

1818

1919
## Installation
2020

21-
* `git clone <repository-url>` this repository
22-
* `cd upgrade-guide`
23-
* `npm install`
21+
- `git clone <repository-url>` this repository
22+
- `cd upgrade-guide`
23+
- `npm install`
2424

2525

2626
## Running / Development
2727

28-
* `ember serve`
29-
* Visit your app at [http://localhost:4200](http://localhost:4200).
30-
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
28+
- `npm run start`
29+
- Visit your app at [http://localhost:4200](http://localhost:4200).
30+
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
3131

3232
### Running Tests
3333

34-
* `npm test`
35-
* `npm test --server`
34+
- `npm run test`
35+
- `npm run test:ember -- --server`
3636

3737
### Linting
3838

39-
* `npm run lint`
40-
* `npm run lint:fix`
39+
- `npm run lint`
40+
- `npm run lint:fix`
4141

4242
### Building
4343

44-
* `npm build` (production)
44+
- `npm exec ember build` (development)
45+
- `npm run build` (production)
4546

4647
### Deploying
4748

app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
5+
<title>Upgrade Guide - Ember.js</title>
66
<meta name="description" content="Ember.js upgrade guide">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88

app/styles/app.css

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */

config/ember-cli-update.json

+1-1
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": "5.10.0",
77
"blueprints": [
88
{
99
"name": "app",

config/environment.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'upgrade-guide',
66
environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'history',
99
EmberENV: {
10+
EXTEND_PROTOTYPES: false,
1011
FEATURES: {
1112
// Here you can enable experimental features on an ember canary build
1213
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1314
},
14-
EXTEND_PROTOTYPES: {
15-
// Prevent Ember Data from overriding Date.parse.
16-
Date: false,
17-
},
1815
},
1916

2017
APP: {

config/optional-features.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
5-
"template-only-glimmer-components": true
5+
"template-only-glimmer-components": true,
6+
"no-implicit-route-model": true
67
}

config/targets.js

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

0 commit comments

Comments
 (0)