Skip to content

Commit 03fc600

Browse files
authored
Merge pull request ember-learn#268 from MehulKChaudhari/mehulkc/update-to-v4.12
Update ember to v4.12
2 parents 4725ec4 + ab9e91a commit 03fc600

33 files changed

+1716
-2176
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
/bower.json.ember-try
2222
/npm-shrinkwrap.json.ember-try
2323
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
2426

2527
# ember-cli-mirage
2628
/mirage/

.eslintrc.js

Lines changed: 9 additions & 17 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: {
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'],
@@ -20,15 +23,13 @@ module.exports = {
2023
browser: true,
2124
},
2225
rules: {},
23-
globals: {
24-
server: true,
25-
},
2626
overrides: [
2727
// node files
2828
{
2929
files: [
3030
'./.eslintrc.js',
3131
'./.prettierrc.js',
32+
'./.stylelintrc.js',
3233
'./.template-lintrc.js',
3334
'./ember-cli-build.js',
3435
'./testem.js',
@@ -44,21 +45,12 @@ module.exports = {
4445
browser: false,
4546
node: true,
4647
},
47-
plugins: ['node'],
48-
extends: ['plugin:node/recommended'],
49-
rules: {
50-
// this can be removed once the following is fixed
51-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
52-
'node/no-unpublished-require': 'off',
53-
},
48+
extends: ['plugin:n/recommended'],
5449
},
5550
{
5651
// test files
5752
files: ['tests/**/*-test.{js,ts}'],
5853
extends: ['plugin:qunit/recommended'],
59-
rules: {
60-
'qunit/require-expect': 'off',
61-
},
6254
},
6355
],
6456
};

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
cache: 'pnpm'
4545
node-version: ${{ env.NODE_VERSION }}
4646
- run: pnpm install
47-
- run: pnpm percy exec -- npm test
47+
- run: pnpm percy exec -- pnpm run test:ember
4848
env:
4949
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
5050
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@
1919
/npm-debug.log*
2020
/testem.log
2121
/.vscode
22+
/yarn-error.log
2223

2324
# intellij data
2425
.idea
2526
*.iml
27+
2628
# ember-try
2729
/.node_modules.ember-try/
2830
/bower.json.ember-try
2931
/npm-shrinkwrap.json.ember-try
3032
/package.json.ember-try
3133
/package-lock.json.ember-try
3234
/yarn.lock.ember-try
35+
36+
# broccoli-debug
37+
/DEBUG/

.prettierrc.js

Lines changed: 8 additions & 1 deletion
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

Lines changed: 8 additions & 0 deletions
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

Lines changed: 5 additions & 0 deletions
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+
};

README.md

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[![This project uses GitHub Actions for continuous integration.](https://github.com/ember-learn/ember-help-wanted/workflows/CI/badge.svg)](https://github.com/ember-learn/ember-help-wanted/actions?query=workflow%3ACI)
22
[![This project uses Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Ember/ember-help-wanted)
33

4-
ember-help-wanted
5-
==============================================================================
4+
# ember-help-wanted
65

76
This app helps you find Ember-related issues and contribute to open source. It works well for project nights for meetups, conferences, and hackathons.
87

98
The app is designed to interface with [ember-help-wanted-server](https://github.com/ember-learn/ember-help-wanted-server) as the backend.
109

1110

12-
Big picture
13-
------------------------------------------------------------------------------
11+
## Big picture
1412

1513
Our goal with this app is to do two major things in the Ember community.
1614

@@ -37,8 +35,7 @@ contributors to various projects, which in turn could help the entire community
3735
accomplish ambitious things faster.
3836

3937

40-
Big picture, technically
41-
------------------------------------------------------------------------------
38+
### Big picture, technically
4239

4340
To accomplish the above, we aim to have [a Node backend](https://github.com/ember-learn/ember-help-wanted-server)
4441
that receives Github webhook notifications about issues across a number of Ember
@@ -51,8 +48,7 @@ add some level of curation to the issues (whether that is needed is still to be
5148
determined) or in other ways editorialize as issues show up in the app.
5249

5350

54-
Future goals
55-
------------------------------------------------------------------------------
51+
### Future goals
5652

5753
We hope that meetup organizers (and contributor workshops at various Ember
5854
conferences) are able to sort through issues and pick subsets for their meetings. For example,
@@ -72,28 +68,24 @@ write up an issue or contact us on the Ember Community Discord `#st-help-wanted-
7268
channel. Look forward to working on these things with you further!
7369

7470

75-
Prerequisites
76-
------------------------------------------------------------------------------
71+
## Prerequisites
7772

7873
You will need the following things properly installed on your computer.
7974

8075
* [Git](https://git-scm.com/)
81-
* [Node.js](https://nodejs.org/)
82-
* [NPM](https://npmpkg.com/)
83-
* [Ember CLI](https://ember-cli.com/)
76+
* [Node.js](https://nodejs.org/) (with npm)
77+
* [Ember CLI](https://cli.emberjs.com/release/)
8478
* [Google Chrome](https://google.com/chrome/)
8579

8680

87-
Installation
88-
------------------------------------------------------------------------------
81+
## Installation
8982

9083
* `git clone <repository-url>` this repository
9184
* `cd ember-help-wanted`
92-
* `npm install`
85+
* `pnpm install`
9386

9487

95-
Running / Development
96-
------------------------------------------------------------------------------
88+
## Running / Development
9789

9890
* `ember serve`
9991
* Visit your app at [http://localhost:4200](http://localhost:4200).
@@ -115,28 +107,27 @@ Make use of the many generators for code, try `ember help generate` for more det
115107

116108
### Running Tests
117109

118-
* `npm test`
119-
* `npm test --server`
110+
* `pnpm test`
111+
* `pnpm test --server`
120112

121113
### Linting
122114

123-
* `npm run lint`
124-
* `npm run lint:fix`
115+
* `pnpm run lint`
116+
* `pnpm run lint:fix`
125117

126118
### Building
127119

128-
* `npm build` (production)
120+
* `pnpm build` (production)
129121

130122
### Deploying
131123

132124
Specify what it takes to deploy your app.
133125

134126

135-
Further Reading / Useful Links
136-
------------------------------------------------------------------------------
127+
## Further Reading / Useful Links
137128

138129
* [ember.js](https://emberjs.com/)
139-
* [ember-cli](https://ember-cli.com/)
130+
* [ember-cli](https://cli.emberjs.com/release/)
140131
* Development Browser Extensions
141132
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
142133
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/app.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import config from 'ember-help-wanted/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;
8-
98
podModulePrefix = config.podModulePrefix;
10-
119
Resolver = Resolver;
1210
}
1311

0 commit comments

Comments
 (0)