Merge pull request #412 from ember-learn/upgrade

Breaking: drop support for Node 10, update ember to 3.28, and remove deprecations

Author: mansona

.eslintignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try

.eslintrc.js

@@ -24,22 +24,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.stylelintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -51,5 +44,10 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

.github/workflows/ci.yml

@@ -3,89 +3,78 @@ name: CI
 on:
   push:
     branches:
-      - master
       - main
-      - "v*"
-  pull_request:
+      - master
+  pull_request: {}
 
-env:
-  NODE_VERSION: 10
-  PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
-  PERCY_PARALLEL_TOTAL: 1
-  FORCE_COLOR: 1
+concurrency:
+   group: ci-${{ github.head_ref || github.ref }}
+   cancel-in-progress: true
 
 jobs:
-  lint:
-    name: Linting
+  test:
+    name: "Tests"
     runs-on: ubuntu-latest
+    env:
+      PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
+      RUN_PERCY_TESTS: true
 
     steps:
       - uses: actions/checkout@v2
+      - uses: mansona/npm-lockfile-version@v1
       - uses: actions/setup-node@v2
         with:
-          node-version: ${{ env.NODE_VERSION }}
-
+          node-version: 12.x
+          cache: npm
       - run: npm i -g npm@7
       - run: npm ci
       - run: npm run lint
+      - run: npx percy exec -- npm run test
 
-  floating-dependencies:
-    name: Floating Dependencies
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      - run: npm i -g npm@7
-      - run: npm install --no-package-lock
-      - run: npm test
-
-  test:
-    name: Tests
+  floating:
+    name: "Floating Dependencies"
     runs-on: ubuntu-latest
-    env:
-      PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
-      RUN_PERCY_TESTS: true
-
 
     steps:
       - uses: actions/checkout@v2
-      - uses: mansona/npm-lockfile-version@v1
       - uses: actions/setup-node@v2
         with:
-          node-version: ${{ env.NODE_VERSION }}
-
+          node-version: 12.x
+          cache: npm
       - run: npm i -g npm@7
-      - run: npm ci
-      - run: npx percy exec -- npm run test
+      - run: npm install --no-shrinkwrap
+      - run: npm run test:ember
 
   try-scenarios:
-    name: "ember-try: ${{ matrix.ember-try-scenario }}"
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    timeout-minutes: 10
-    needs: test
+    needs: 'test'
 
     strategy:
+      fail-fast: false
       matrix:
-        ember-try-scenario:
-          - 'ember-lts-3.16'
-          - 'ember-lts-3.20'
-          - 'ember-release'
-          - 'ember-beta'
-          - 'ember-canary'
-          - 'ember-default-with-jquery'
-          - 'ember-classic'
+        try-scenario:
+          - ember-lts-3.16
+          - ember-lts-3.20
+          - ember-lts-3.24
+          - ember-lts-3.28
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - ember-classic
+          - ember-default-with-jquery
+          - embroider-safe
+          - embroider-optimized
+          - no-deprecations
+          - ember-release-no-deprecations
 
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: ${{ env.NODE_VERSION }}
-
+          node-version: 12.x
+          cache: npm
       - run: npm i -g npm@7
       - run: npm ci
-      - name: test
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.node-version

@@ -15,6 +15,8 @@
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
@@ -24,6 +26,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 

.npmignore

@@ -1,4 +1,4 @@
-/* eslint-disable prettier/prettier */
+/* eslint-disable no-undef, prettier/prettier */
 module.exports = {
   extends: 'stylelint-config-standard',
   plugins: [

.stylelintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: 'recommended',
 };

.template-lintrc.js

@@ -9,7 +9,7 @@
 ## Linting
 
 * `npm run lint`
-* `npm run lint:js -- --fix`
+* `npm run lint:fix`
 
 ## Running tests
 

CONTRIBUTING.md

@@ -11,9 +11,9 @@ This addon is intended to provide basic components for easier style coordination
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.16 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 Installation

README.md

@@ -1,3 +1,4 @@
+{{! template-lint-disable no-redundant-landmark-role }}
 <header
   class="es-header"
   role="banner"

addon/components/es-header.hbs

@@ -4,7 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
 import { rawTimeout, task, timeout } from 'ember-concurrency';
-import { buildWaiter } from 'ember-test-waiters';
+import { buildWaiter } from '@ember/test-waiters';
 
 const SPEED = 200;
 

addon/services/progress.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
@@ -21,6 +22,22 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-3.24',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.24.3',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-3.28',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {
@@ -68,11 +85,33 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
+      {
+        name: 'no-deprecations',
+        npm: {
+          devDependencies: {
+            'ember-deprecation-error': '*',
+          },
+        },
+      },
+      {
+        name: 'ember-release-no-deprecations',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+            'ember-deprecation-error': '*',
+          },
+        },
+      },
     ],
   };
 };

config/ember-try.js

@@ -0,0 +1,13 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export default class ButtonComponent extends Component {
+  @tracked
+  value = 0;
+
+  @action
+  incrementValue() {
+    this.value++;
+  }
+}

docs/components/button.js

@@ -19,11 +19,11 @@ Also supported- block use:
 To add interactivity you can pass an action to `onClicked`
 
 ```handlebars
-<EsButton @onClicked={{action (mut value) (increment value)}}>
+<EsButton @onClicked={{this.incrementValue}}>
   Increment Value
 </EsButton>
 
-{{value}}
+{{this.value}}
 ```
 
 ## Secondary Buttons

docs/components/button.md

@@ -0,0 +1,35 @@
+import Component from '@glimmer/component';
+
+export default class HeaderComponent extends Component {
+  links = [
+    {
+      name: 'Example Links',
+      type: 'dropdown',
+      items: [
+        {
+          href: 'https://guides.emberjs.com/release/',
+          name: 'Ember.js Guides',
+          type: 'link',
+        },
+        {
+          href: 'https://api.emberjs.com',
+          name: 'API Reference',
+          type: 'link',
+        },
+        {
+          href: 'https://cli.emberjs.com',
+          name: 'CLI Guides',
+          type: 'link',
+        },
+        {
+          type: 'divider',
+        },
+        {
+          href: 'https://emberjs.com/learn',
+          name: 'Learn Ember',
+          type: 'link',
+        },
+      ],
+    },
+  ];
+}

docs/components/header.js

@@ -9,7 +9,7 @@ Shows the side wide header with the global navigation.
 If you would like to override the default links you can pass a json object to update the links in the navbar.
 
 ```handlebars
-<EsHeader @links={{links}} />
+<EsHeader @links={{this.links}} />
 ```
 
 You can also use the block form of the component to add extra HTML to the navigation bar