Skip to content
Merged
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.

5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
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
1 change: 1 addition & 0 deletions app/components/cta-emberconf.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
<div class="container layout">
<div class="emberconf-announcement lg:col-4 lg:start-2">
<div class="inner">
Expand Down
1 change: 1 addition & 0 deletions app/components/ember-community-survey/introduction.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-empty-headings }}
<div class="bg-dark bg-shape-boxes">
<div class="container">
<h1>
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
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
1 change: 1 addition & 0 deletions app/styles/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable import-notation */
@import "components/addon-tabs.css";
@import "components/brand-logos.css";
@import "components/community-trends.css";
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/addon-tabs.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable alpha-value-notation, color-function-notation, prettier/prettier, selector-class-pattern */
.addon-tabs {
background: linear-gradient(0deg, rgba(52, 55, 62, 1) 0%, rgba(66, 69, 77, 1) 100%);
border-radius: 15px;
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/brand-logos.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable alpha-value-notation, color-function-notation, prettier/prettier */
.branding-section {
margin-bottom: var(--spacing-4);
}
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/callout-banner.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable prettier/prettier */
.callout-banner {
position: relative;
display: flex;
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/community-trends.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable media-feature-range-notation, prettier/prettier */
.uwu-logo {
position: fixed;
right: 50%;
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/cta-emberconf.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable media-feature-range-notation */
.emberconf-announcement {
display: flex;
justify-content: center;
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/ecosystem-icons.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable media-feature-range-notation */
.ecosystem-icons-container {
position: relative;
}
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/homepage-hero-callout.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable prettier/prettier */
.hero-callout {
margin-top: -25px;
font-size: 16px;
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/homepage-image-grid.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable declaration-block-no-redundant-longhand-properties, no-descending-specificity, prettier/prettier, selector-attribute-quotes, selector-class-pattern */
.homepage-image-grid {
overflow-x: auto;
}
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/survey-section.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable declaration-block-no-redundant-longhand-properties, prettier/prettier, selector-class-pattern */
.survey-section__container:nth-child(2n + 1) {
/* Definition of .bg-light-muted */
background-color: var(--color-gray-200);
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/surveys.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable prettier/prettier */
.survey-logo {
height: 160px;
}
Expand Down
1 change: 1 addition & 0 deletions app/styles/components/terminal-code.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable color-function-notation */
.terminal-code {
border-radius: 4px;
min-height: 50px;
Expand Down
1 change: 1 addition & 0 deletions app/styles/legacy/form.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable alpha-value-notation, color-function-notation, media-feature-range-notation, prettier/prettier, selector-attribute-quotes */

.tomster-form {
margin-top: 1.5em;
Expand Down
1 change: 1 addition & 0 deletions app/templates/about/legal.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
{{page-title "Legal"}}
<section class="container" aria-labelledby="legal">
<h1 id="legal">Legal</h1>
Expand Down
1 change: 1 addition & 0 deletions app/templates/community/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
<section class="container layout" aria-labelledby="section-community">
<h1 id="section-community">Get Involved: Join the Growing Ember.js Community</h1>

Expand Down
1 change: 1 addition & 0 deletions app/templates/community/meetups/assets.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
{{page-title "Assets"}}
<section class="container" aria-labelledby="ember-meetup-resources">
<h1 id="ember-meetup-resources">
Expand Down
1 change: 1 addition & 0 deletions app/templates/community/meetups/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
{{page-title "Meetups"}}
<div class="container">
<h1 class="mb-3">Meetups Around the World</h1>
Expand Down
1 change: 1 addition & 0 deletions app/templates/editions/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
<section class="container" aria-labelledby="ember-editions">
<h1 id="ember-editions">Ember Editions</h1>
<p>
Expand Down
1 change: 1 addition & 0 deletions app/templates/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
{{page-title "Ember.js - A framework for ambitious web developers" replace=true}}

<section aria-labelledby="hero-title" class="bg-shape-boxes-bottom bg-dark">
Expand Down
1 change: 1 addition & 0 deletions app/templates/learn/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
{{page-title "Learn"}}
<div class="container" aria-labelledby="learning-emberjs">
<h1 id="learning-emberjs">Learning Ember.js</h1>
Expand Down
1 change: 1 addition & 0 deletions app/templates/mascots/commission.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-redundant-role }}
<section class="container layout">
<div class="lg:col-4">
<h1>Mascot Commission Requests</h1>
Expand Down
3 changes: 1 addition & 2 deletions app/templates/mascots/payment.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{!-- template-lint-disable "no-html-comments" --}}
{{! template-lint-disable "no-html-comments" no-pointer-down-event-binding no-redundant-role }}
<section class="container layout">
<div class="lg:col-4">
<h1>Tomster and Zoey Commission Payment</h1>
Expand Down Expand Up @@ -269,7 +269,6 @@
value="4MEwuslashIt71HHTl4RHHwuBejVv47f4wuslashdPwuBeUDhWl3a811Scy1w="
/>

{{!-- template-lint-disable "no-down-event-binding" --}}
<input
id="saveForm"
name="saveForm"
Expand Down
1 change: 1 addition & 0 deletions app/templates/survey/2020.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-whitespace-for-layout }}
{{page-title "Ember Community Survey 2020"}}

<EmberCommunitySurvey::Introduction
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.28.4",
"version": "4.12.3",
"blueprints": [
{
"name": "app",
Expand Down
7 changes: 2 additions & 5 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'ember-website',
environment,
rootURL: '/',
locationType: 'trailing-history',
historySupportMiddleware: true,
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
},

APP: {
Expand Down
22 changes: 22 additions & 0 deletions config/fastboot.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
module.exports = function () {
return {
buildSandboxGlobals(defaultGlobals) {
return Object.assign({}, defaultGlobals, {
AbortController,
ReadableStream:
typeof ReadableStream !== 'undefined'
? ReadableStream
: require('node:stream/web').ReadableStream,
WritableStream:
typeof WritableStream !== 'undefined'
? WritableStream
: require('node:stream/web').WritableStream,
TransformStream:
typeof TransformStream !== 'undefined'
? TransformStream
: require('node:stream/web').TransformStream,
Headers: typeof Headers !== 'undefined' ? Headers : undefined,
});
},
};
};
15 changes: 0 additions & 15 deletions config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
'last 1 Safari versions',
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
node: 'current',
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
const app = new EmberApp(defaults, {
babel: {
plugins: [require.resolve('ember-auto-import/babel-plugin')],
},
Expand Down
Loading
Loading