Merge pull request #264 from lblod/enhancement/bump-embroider-macros

Ember upgrade to v3.28 and others

.eslintignore

@@ -13,8 +13,9 @@
 # misc
 /coverage/
 !.*
-/tests/dummy/app/config/sample-data.ts
+.*/
 .eslintcache
+/tests/.eslintrc.js
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -31,21 +31,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.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',
@@ -124,5 +118,10 @@ module.exports = {
         '@typescript-eslint/unbound-method': ['error', { ignoreStatic: true }],
       },
     },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

.npmignore

@@ -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
 

.template-lintrc.js

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

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "10"
+  - "12"
 
 dist: xenial
 
@@ -47,13 +47,15 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.24
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.28
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-safe
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

@@ -15,9 +15,8 @@ It also means we are currently sticking to v1 lockfiles.
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `npm run lint`
+* `npm run lint:fix`
 
 ## Running tests
 

README.md

@@ -175,9 +175,10 @@ This addon uses CSS variables to customise the styling. You can override these v
 
 
 ## Compatibility
-* Ember.js v3.20 or above
-* Ember CLI v2.20 or above
-* Node.js v10 or above
+
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 ## Contributing

addon/components/ce/content-editable.hbs

@@ -1,4 +1,5 @@
 {{! template-lint-disable no-invalid-interactive }}
+{{! template-lint-disable no-down-event-binding }}
 <div
   {{on 'paste' this.paste}}
   {{on 'cut' this.cut}}
@@ -16,4 +17,4 @@
   class={{@class}}
   ...attributes
 >
-</div>
+</div>

addon/components/rdfa/editor-toolbar.hbs

@@ -155,10 +155,14 @@
           </Menu.Item>
         {{else}}
           <div role='menuitem' class='say-dropdown__menu-with-inputs'>
-            {{t 'ember-rdfa-editor.columns'}} <Input class='say-input say-input--small' size='1' @value={{this.tableAddColumns}} />
+            {{t 'ember-rdfa-editor.columns'}}
+            <AuLabel for="editor-table-columns" class="au-u-hidden-visually">{{t 'ember-rdfa-editor.columns'}}</AuLabel>
+            <Input id="editor-table-columns" class='say-input say-input--small' size='1' @value={{this.tableAddColumns}} />
           </div>
           <div role='menuitem' class='say-dropdown__menu-with-inputs'>
-            {{t 'ember-rdfa-editor.rows'}} <Input class='say-input say-input--small' size='1' @value={{this.tableAddRows}} />
+            {{t 'ember-rdfa-editor.rows'}}
+            <AuLabel for="editor-table-rows" class="au-u-hidden-visually">{{t 'ember-rdfa-editor.rows'}}</AuLabel>
+            <Input id="editor-table-rows" class='say-input say-input--small' size='1' @value={{this.tableAddRows}} />
           </div>
           <Menu.Item @menuAction={{fn this.insertTable this.tableAddRows this.tableAddColumns}} title={{t 'ember-rdfa-editor.insert-table'}}>
             <AuIcon @icon="table-insert" @ariaHidden={{true}} />

blueprints/@lblod/ember-rdfa-editor/index.js

@@ -1,8 +1,9 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
+/*eslint no-undef: "warn"*/
 module.exports = {
   description: '',
 

config/ember-try.js

@@ -7,10 +7,18 @@ module.exports = async function () {
   return {
     scenarios: [
       {
-        name: 'ember-lts-3.20',
+        name: 'ember-lts-3.24',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.24.3',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.20.5',
+            'ember-source': '~3.28.0',
           },
         },
       },

ember-cli-build.js

@@ -47,4 +47,13 @@ module.exports = function (defaults) {
   */
   const { maybeEmbroider } = require('@embroider/test-setup');
   return maybeEmbroider(app);
+  //Older config to check if still needed
+  //const { maybeEmbroider } = require('@embroider/test-setup');
+  //return maybeEmbroider(app, {
+  //  skipBabel: [
+  //    {
+  //      package: 'qunit',
+  //    },
+  //  ],
+  //});
 };