diff --git a/.ember-cli b/.ember-cli index ee64cfed..4ccb4bf4 100644 --- a/.ember-cli +++ b/.ember-cli @@ -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 } diff --git a/.eslintignore b/.eslintignore index 701947ed..d474a40b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -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 diff --git a/.eslintrc.js b/.eslintrc.js index ab627f4f..d025472e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -45,7 +45,7 @@ module.exports = { extends: ['plugin:node/recommended'], }, { - // Test files: + // test files files: ['tests/**/*-test.{js,ts}'], extends: ['plugin:qunit/recommended'], }, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a3e3436..4c1478f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,62 +8,76 @@ on: pull_request: {} concurrency: - group: ci-${{ github.head_ref || github.ref }} - cancel-in-progress: true + group: ci-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: percy: name: "Percy Tests" runs-on: ubuntu-latest + timeout-minutes: 10 env: PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 with: node-version: 18.x cache: npm - - run: npm ci - - run: npx percy exec -- npm run test:docs + - name: Install Dependencies + run: npm ci + - name: Run Tests + run: npx percy exec -- npm run test:docs test: name: "Tests" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: mansona/npm-lockfile-version@v1 - - uses: actions/setup-node@v3 + - name: Install Node + uses: actions/setup-node@v3 with: node-version: 18.x cache: npm - - run: npm ci - - run: npm run lint - - run: npx percy exec -- npm run test + - name: Install Dependencies + run: npm ci + - name: Lint + run: npm run lint + - name: Run Tests + run: npm run test:ember floating: name: "Floating Dependencies" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 18.x cache: npm - - run: npm install --no-shrinkwrap - - run: npm run test:ember + - name: Install Dependencies + run: npm install --no-shrinkwrap + - name: Run Tests + run: npm run test:ember try-scenarios: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest - needs: 'test' + needs: "test" + timeout-minutes: 10 strategy: fail-fast: false matrix: try-scenario: - ember-lts-3.28 + - ember-lts-4.4 - ember-release - ember-beta - ember-classic @@ -73,12 +87,14 @@ jobs: - no-deprecations steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 with: node-version: 18.x cache: npm - - run: npm ci + - name: Install Dependencies + run: npm ci - name: Run Tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} @@ -86,6 +102,7 @@ jobs: name: ${{ matrix.try-scenario }} - Allowed to fail runs-on: ubuntu-latest needs: 'test' + timeout-minutes: 10 permissions: pull-requests: write @@ -97,12 +114,14 @@ jobs: - ember-release-no-deprecations steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 with: node-version: 18.x cache: npm - - run: npm ci + - name: Install Dependencies + run: npm ci - name: Run Tests id: tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} diff --git a/.gitignore b/.gitignore index abd780fb..9f8c625a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,11 +21,18 @@ /testem.log /yarn-error.log +# IDEs +.vscode +.idea +.changelog + # 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 -.vscode -.idea -.changelog +# broccoli-debug +/DEBUG/ diff --git a/.npmignore b/.npmignore index f30effe9..3aac2443 100644 --- a/.npmignore +++ b/.npmignore @@ -14,6 +14,7 @@ /.eslintignore /.eslintrc.js /.git/ +/.github/ /.gitignore /.prettierignore /.prettierrc.js @@ -33,4 +34,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 diff --git a/.prettierignore b/.prettierignore index 92216555..4178fd57 100644 --- a/.prettierignore +++ b/.prettierignore @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c05588d..86aea026 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,4 +23,4 @@ * `ember serve` * Visit the dummy application at [http://localhost:4200](http://localhost:4200). -For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). +For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/). diff --git a/README.md b/README.md index e57a1b57..bac95a02 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ +# ember-styleguide + [![This project uses GitHub Actions for continuous integration.](https://github.com/ember-learn/ember-styleguide/workflows/CI/badge.svg)](https://github.com/ember-learn/ember-styleguide/actions?query=workflow%3ACI) [![This project uses Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Ember/ember-styleguide) [![Latest NPM release](https://img.shields.io/npm/v/ember-styleguide.svg)](https://www.npmjs.com/package/ember-styleguide.svg) -ember-styleguide -============================================================================== - This addon is intended to provide basic components for easier style coordination among the Ember family of websites, although the original intent is to support the emberjs.com website. We are committed to the goal of meeting WCAG 2.0 AA conformance standards. -Compatibility ------------------------------------------------------------------------------- +## Compatibility * Ember.js v3.24 or above * Ember CLI v3.24 or above diff --git a/addon/components/es-footer-help.hbs b/addon/components/es-footer-help.hbs index aa804781..a8a37dc6 100644 --- a/addon/components/es-footer-help.hbs +++ b/addon/components/es-footer-help.hbs @@ -1,3 +1,4 @@ +{{! template-lint-disable no-whitespace-for-layout }}