Ember and dep updates (#955)

* Try embroider again

* Yarn upgrade

* Add my-awesome-thing

* Optional chaining for projectTag

* Bump some deps

* Bump deps

* ember-cli 4.1.0, node 14

* Remove ember-composable-helpers options

* Update test addon to use octane

* Add @ember/optional-features

* Update scenarios

* Try ...attributes

* Try to fix test

* Remove test:ember-compatibility

* Update ci-cd.yml

* Comment out embroider tests

* ember-cli 4.1.1

* Update index.hbs

* Update index.hbs

* Bump deps, yarn upgrade

* Revert "Bump deps, yarn upgrade"

This reverts commit d006c84.

* Fix deps

* Try embroider again

* Remove embroider again

* Add 3.28 to CI

Author: RobbieTheWagner

.eslintignore

@@ -19,7 +19,10 @@
 # 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
 
 # Test apps
 /test-apps/

.eslintrc.js

@@ -83,7 +83,7 @@ module.exports = {
       },
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

.github/workflows/ci-cd.yml

@@ -3,11 +3,16 @@ name: CI/CD
 on:
   push:
     branches:
+      - main
       - master
-  pull_request:
+  pull_request: {}
+
+concurrency:
+   group: ci-${{ github.head_ref || github.ref }}
+   cancel-in-progress: true  
 
 env:
-  NODE_VERSION: 12
+  NODE_VERSION: 14
 
 jobs:
   lint:
@@ -90,9 +95,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scenario:
-          - 'ember-lts-3.20'
-          - 'ember-lts-3.24'
+        try-scenario:
+          # - 'ember-lts-3.24'
+          - 'ember-lts-3.28'
           - 'ember-release'
           - 'ember-beta'
           - 'ember-canary'
@@ -115,7 +120,7 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Test
-        run: yarn test:ember-compatibility ${{ matrix.scenario }}
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
 
   deploy-app:
     name: Deploy app

.gitignore

@@ -24,7 +24,10 @@
 .DS_Store
 /.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
 
 # intellij
 /.idea/

.npmignore

@@ -14,6 +14,7 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -35,7 +36,10 @@
 # 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
 /test-apps
 
 # TODO: should be removed (so that it is included!) once

.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

README.md

@@ -9,8 +9,8 @@ ember-cli-addon-docs
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.20 or above
-* Ember CLI v3.20 or above
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
 * Node.js v12 or above
 
 **2/28/20 Update: AddonDocs is in Maintenance Mode.**

addon/services/project-version.js

@@ -59,7 +59,7 @@ export default class ProjectVersionService extends Service {
       currentVersion = {
         key: latestVersionName,
         name: latestVersionName,
-        tag: config.projectTag,
+        tag: config?.projectTag,
         path: '',
         sha: 'abcde',
       };

config/ember-try.js

@@ -8,18 +8,18 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.20',
+        name: 'ember-lts-3.24',
         npm: {
           devDependencies: {
-            'ember-source': '~3.20.5',
+            'ember-source': '~3.24.3',
           },
         },
       },
       {
-        name: 'ember-lts-3.24',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.3',
+            'ember-source': '~3.28.0',
           },
         },
       },
@@ -57,6 +57,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             '@ember/jquery': '^1.1.0',
+            'ember-source': '~3.28.0',
           },
         },
       },

index.js

@@ -171,34 +171,6 @@ module.exports = {
 
     includer.options.snippetExtensions = snippetExtensions;
 
-    const VersionChecker = require('ember-cli-version-checker');
-    const checker = new VersionChecker(this.project);
-    const ember = checker.for('ember-source');
-
-    if (ember.gte('3.8.0')) {
-      // array helper is built into ember as of 3.8.
-      // ember 3.17 starts erroring when overwritting built in helpers
-
-      // exclude from ember-cli-addon-docs
-      this.options['ember-composable-helpers'] = {
-        except: ['array'],
-      };
-
-      // exclude from the app using ember-cli-addon-docs
-      if (!includer.options['ember-composable-helpers']) {
-        includer.options['ember-composable-helpers'] = {};
-      }
-
-      const echOptions = includer.options['ember-composable-helpers'];
-      if (!echOptions.only) {
-        if (!echOptions.except) {
-          echOptions.except = ['array'];
-        } else if (echOptions.except.indexOf('array') === -1) {
-          echOptions.except.push('array');
-        }
-      }
-    }
-
     // This must come after we add our own options above, or else other addons won't see them.
     this._super.included.apply(this, arguments);