Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"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.
*/
"isTypeScriptProject": false
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# 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
22 changes: 10 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 @@ -30,6 +33,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -45,16 +49,10 @@ 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:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
pull_request:
pull_request: {}

concurrency:
group: ci-${{ github.head_ref || github.ref }}
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,14 @@ jsconfig.json
# 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

/.lighthouseci/

/.idea/

# broccoli-debug
/DEBUG/
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/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
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/
6 changes: 0 additions & 6 deletions .stylelintrc

This file was deleted.

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: {
// We use BEM naming conventions which aren't compatible with the kebap-case convention that stylelint-config-standard expects
'selector-class-pattern': null,
},
};
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Components come from [ember-styleguide](https://github.com/ember-learn/ember-sty
You will need the following things properly installed on your computer.

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

## Installation
Expand Down Expand Up @@ -52,7 +52,7 @@ The app is continuously deployed to Netlify when a pull request is merged and pa
## Further Reading / Useful Links

* [ember.js](https://emberjs.com/)
* [ember-cli](https://ember-cli.com/)
* [ember-cli](https://cli.emberjs.com/release/)
* Development Browser Extensions
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
Expand Down
4 changes: 1 addition & 3 deletions app/components/cta-emberconf.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
target="_blank"
>
<img
alt=""
role="presentation"
src="/images/brand/virtual-emberconf-2022-logo.svg"
alt="" src="/images/brand/virtual-emberconf-2022-logo.svg"
>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/ember-community-survey/introduction.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="bg-dark bg-shape-boxes">
<div class="container">
<h1>
<h1 {{! template-lint-disable no-empty-headings }}>
<img
alt={{@surveyLogoAlt}}
class="survey-logo"
Expand Down
1 change: 0 additions & 1 deletion app/components/index/ember-addons.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class="addon-tabs--header"
role="tablist"
>
{{!-- template-lint-disable "no-down-event-binding" --}}
{{#each this.emberAddons as |emberAddon index|}}
<Index::EmberAddons::Tab
@currentTabId={{this.currentTabId}}
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/community/meetups/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class CommunityMeetupsIndexController extends Controller {
};

get meetupsByArea() {
const meetups = (this.model ?? []).toArray();
const meetups = (this.model ?? []).slice();
const groupMeetupsByArea = new Map();

meetups.forEach((meetup) => {
Expand Down
1 change: 0 additions & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="description" content="Ember.js helps developers be more productive out of the box. Designed with developer ergonomics in mind, its friendly APIs help you get your job done—fast.">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:description" content="Ember.js helps developers be more productive out of the box. Designed with developer ergonomics in mind, its friendly APIs help you get your job done—fast." />
Expand Down
4 changes: 2 additions & 2 deletions app/routes/ember-users.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
export default class EmberUsersRoute extends Route {
@service store;

model() {
return this.store.findAll('user');
async model() {
return (await this.store.findAll('user')).slice();
}
}
4 changes: 2 additions & 2 deletions app/routes/mascots.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
export default class MascotsRoute extends Route {
@service store;

model() {
return this.store.findAll('tomster');
async model() {
return (await this.store.findAll('tomster')).slice();
}
}
4 changes: 2 additions & 2 deletions app/routes/releases/beta.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default class ReleasesBetaRoute extends Route {

model() {
return hash({
ember: this.store.find('project', 'ember/beta'),
emberData: this.store.find('project', 'emberData/beta'),
ember: this.store.findRecord('project', 'ember/beta'),
emberData: this.store.findRecord('project', 'emberData/beta'),
});
}
}
4 changes: 2 additions & 2 deletions app/routes/releases/canary.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export default class ReleasesCanaryRoute extends Route {

model() {
return hash({
ember: this.store.find('project', 'ember/canary'),
emberData: this.store.find('project', 'emberData/canary'),
ember: this.store.findRecord('project', 'ember/canary'),
emberData: this.store.findRecord('project', 'emberData/canary'),
canaryInfo: fetch(
'https://s3.amazonaws.com/builds.emberjs.com/canary.json'
).then((response) => response.json()),
Expand Down
4 changes: 2 additions & 2 deletions app/routes/releases/lts.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default class ReleasesLtsRoute extends Route {

model() {
return hash({
ember: this.store.find('project', 'ember/lts'),
emberData: this.store.find('project', 'emberData/lts'),
ember: this.store.findRecord('project', 'ember/lts'),
emberData: this.store.findRecord('project', 'emberData/lts'),
});
}
}
4 changes: 2 additions & 2 deletions app/routes/releases/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default class ReleasesReleaseRoute extends Route {

model() {
return hash({
ember: this.store.find('project', 'ember/release'),
emberData: this.store.find('project', 'emberData/release'),
ember: this.store.findRecord('project', 'ember/release'),
emberData: this.store.findRecord('project', 'emberData/release'),
});
}
}
5 changes: 4 additions & 1 deletion app/routes/team-redirect.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Route from '@ember/routing/route';
import { service } from '@ember/service';

export default class TeamRedirectRoute extends Route {
@service router;

redirect() {
this.transitionTo('teams');
this.router.transitionTo('teams');
}
}
34 changes: 17 additions & 17 deletions app/styles/app.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@import "components/addon-tabs.css";
@import "components/brand-logos.css";
@import "components/community-trends.css";
@import "components/ecosystem-icons.css";
@import "components/cta-emberconf.css";
@import "components/faqs.css";
@import "components/homepage-image-grid.css";
@import "components/homepage-hero-callout.css";
@import "components/lts-table.css";
@import "components/release-timeline.css";
@import "components/survey-section.css";
@import "components/surveys.css";
@import "components/team-list.css";
@import "components/terminal-code.css";
@import "components/callout-banner.css";
@import "components/mascots.css";
@import "legacy/form.css";
@import url("components/addon-tabs.css");
@import url("components/brand-logos.css");
@import url("components/community-trends.css");
@import url("components/ecosystem-icons.css");
@import url("components/cta-emberconf.css");
@import url("components/faqs.css");
@import url("components/homepage-image-grid.css");
@import url("components/homepage-hero-callout.css");
@import url("components/lts-table.css");
@import url("components/release-timeline.css");
@import url("components/survey-section.css");
@import url("components/surveys.css");
@import url("components/team-list.css");
@import url("components/terminal-code.css");
@import url("components/callout-banner.css");
@import url("components/mascots.css");
@import url("legacy/form.css");

@media only percy {
.hide-in-percy {
Expand Down
8 changes: 6 additions & 2 deletions app/styles/components/addon-tabs.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
.addon-tabs {
background: linear-gradient(0deg, rgba(52, 55, 62, 1) 0%, rgba(66, 69, 77, 1) 100%);
background: linear-gradient(
0deg,
rgb(52 55 62 / 100%) 0%,
rgb(66 69 77 / 100%) 100%
);
border-radius: 15px;
box-shadow: 0 5px 15px -10px rgba(0, 0, 0, 0.75);
box-shadow: 0 5px 15px -10px rgb(0 0 0 / 75%);
min-height: 364px;
width: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions app/styles/components/brand-logos.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

.brand-logos > li {
border: 1px solid rgba($black, 0.3);
background-image: url('/images/brand/brand-bg.png');
background-image: url("/images/brand/brand-bg.png");
border-radius: 4px;
padding: 1rem 1.5rem;
}
Expand All @@ -27,5 +27,5 @@
}

.brand-logos > li:nth-child(3) {
background-color: rgba(199, 52, 31, 0.9);
background-color: rgb(199 52 31 / 90%);
}
2 changes: 1 addition & 1 deletion app/styles/components/callout-banner.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

.callout-banner a + a::before {
content: '';
content: "";
width: 3px;
height: 3px;
background: white;
Expand Down
5 changes: 2 additions & 3 deletions app/styles/components/community-trends.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
max-width: 600px;
}

@media (max-width: 1500px) {
@media (width <= 1500px) {
.uwu-logo {
transform: none;
right: 0;
max-width: 400px;
}
}

@media (max-width: 1000px) {
@media (width <= 1000px) {
.uwu-logo {
transform: none;
right: unset;
left: 0;
max-width: 200px;
}
}

2 changes: 1 addition & 1 deletion app/styles/components/cta-emberconf.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
margin-top: 1rem;
}

@media screen and (min-width: 450px) {
@media screen and (width >= 450px) {
.emberconf-announcement {
padding-top: 3rem;
margin-top: -5rem;
Expand Down
Loading
Loading