Skip to content

Commit

Permalink
Upgrade ember to 5.4.0 version (#757)
Browse files Browse the repository at this point in the history
* upgrade ember to 4.8.1 version

* upgrade ember to 4.12.1 version

* upgrade: ember to 5.4.0 version

* fix: ci.yml file

* chore: remove unnecessary actions and its file

* tests: fix login service test leak issue

* chore: add node modules to eslintignore and prettierignore

* chore: remove unnecessary log file
  • Loading branch information
satyam73 authored Dec 4, 2023
1 parent 06179ee commit 1e69080
Show file tree
Hide file tree
Showing 101 changed files with 4,224 additions and 3,633 deletions.
12 changes: 2 additions & 10 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
15 changes: 3 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
# dependencies
/node_modules/

# 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
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
24 changes: 12 additions & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand All @@ -19,13 +22,16 @@ module.exports = {
env: {
browser: true,
},
rules: {},
rules: {
'qunit/require-expect': [1, 'except-simple'],
},
overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -41,13 +47,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
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',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,27 @@ on:
- '**'

jobs:
lint:
name: "Lint"
runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- name: Install Node with node version ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: npm
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn run lint

build:
runs-on: ubuntu-latest

Expand Down
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,22 @@
/package-lock.json
# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
19 changes: 5 additions & 14 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
# dependencies
/node_modules/

# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/.node_modules.ember-try/
9 changes: 8 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
'use strict';

module.exports = {
singleQuote: true,
overrides: [
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
9 changes: 9 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],

rules: {
'selector-class-pattern': null,
},
};
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
4 changes: 2 additions & 2 deletions app/components/events/logs-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ export default class LogsPageComponent extends Component {
{
...GET_API_CONFIGS,
credentials: 'include',
}
},
);

const logsFromApi = removePeerLogsTransformer(
(await logsResponse.json())?.logs
(await logsResponse.json())?.logs,
);

// filtering logs of current active event
Expand Down
129 changes: 87 additions & 42 deletions app/components/header.hbs
Original file line number Diff line number Diff line change
@@ -1,48 +1,93 @@
{{#if this.isDevMode}}
<section aria-label='main-section under dev feature flag' class='main--dev'>
<h1 data-test-main-welcome-title class="main__welcome--title">Welcome to Real Dev Squad</h1>
<img data-test-main-hero-img class='main__hero--img' src='assets\images\hero-community.png' alt='Real Dev Squad' />
<div data-test-main-container class='main__container'>
<div class='social'>
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a data-test-social-link={{social.title}} href={{social.url}} rel='noopener noreferrer' target='_blank'
class='social__link'>
<img data-test-social-icon={{social.title}} class='social__icon' src={{social.icon}} alt={{social.title}} />
</a>
{{#if (not-eq social.title 'Instagram')}}
<span data-test-vertical-separators class='social__seperators-vertical--dev'> | </span>
{{/if}}
{{/each}}
<section aria-label="main-section under dev feature flag" class="main--dev">
<h1 data-test-main-welcome-title class="main__welcome--title">Welcome to
Real Dev Squad</h1>
<img
data-test-main-hero-img
class="main__hero--img"
src="assets\images\hero-community.png"
alt="Real Dev Squad"
/>
<div data-test-main-container class="main__container">
<div class="social--dev">
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a
data-test-social-link={{social.title}}
href={{social.url}}
rel="noopener noreferrer"
target="_blank"
class="social__link"
>
<img
data-test-social-icon={{social.title}}
class="social__icon--dev"
src={{social.icon}}
alt={{social.title}}
/>
</a>
{{#if (not-eq social.title "Instagram")}}
<span
data-test-vertical-separators
class="social__seperators-vertical--dev"
> | </span>
{{/if}}
{{/each}}
</div>
</div>
</div>
</section>
</section>
{{else}}
<section class='header'>
<img data-test-logo class='header__logo' src='assets/images/rds-logo-2x.png' alt='Real Dev Squad' />
<section class="header">
<img
data-test-logo
class="header__logo"
src="assets/images/rds-logo-2x.png"
alt="Real Dev Squad"
/>

<div class='header__container'>
<span class='container__text-social'>
<h2 data-test-subtitle class='text__subtitle'>
<span class='text__welcome'>Welcome</span>
<span class='text__to'>to the</span>
</h2>
<h1 data-test-title class='text__title'>Real Dev Squad</h1>
<div class="header__container">
<span class="container__text-social">
<h2 data-test-subtitle class="text__subtitle">
<span class="text__welcome">Welcome</span>
<span class="text__to">to the</span>
</h2>
<h1 data-test-title class="text__title">Real Dev Squad</h1>

<div class='social'>
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a data-test-social-link={{social.title}} href={{social.url}} rel='noopener noreferrer' target='_blank'
class='social__handles'>
{{social.title}}
<img data-test-social-icon={{social.title}} class='social__icon' src={{social.icon}} alt={{social.title}} />
</a>
{{#if (not-eq social.title 'Instagram')}}
<span data-test-vertical-separators class='social__seperators-vertical'></span>
<span data-test-round-separators class='social__seperators-round'>&bull;</span>
{{/if}}
{{/each}}
</div>
</span>
<img data-test-welcome-img class='container__image' src='assets/images/welcome-image.png' alt='Welcome' />
</div>
</section>
<div class="social">
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a
data-test-social-link={{social.title}}
href={{social.url}}
rel="noopener noreferrer"
target="_blank"
class="social__handles"
>
{{social.title}}
<img
data-test-social-icon={{social.title}}
class="social__icon"
src={{social.icon}}
alt={{social.title}}
/>
</a>
{{#if (not-eq social.title "Instagram")}}
<span
data-test-vertical-separators
class="social__seperators-vertical"
></span>
<span
data-test-round-separators
class="social__seperators-round"
>&bull;</span>
{{/if}}
{{/each}}
</div>
</span>
<img
data-test-welcome-img
class="container__image"
src="assets/images/welcome-image.png"
alt="Welcome"
/>
</div>
</section>
{{/if}}
Loading

0 comments on commit 1e69080

Please sign in to comment.