Dependency Updating Omnibus

.babelrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+  ],
+}

.eslintrc.js

@@ -3,9 +3,13 @@ module.exports = {
     server: true,
   },
   root: true,
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
+    ecmaVersion: 2020,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
   },
   plugins: [
     'ember'
@@ -18,11 +22,20 @@ module.exports = {
     browser: true
   },
   rules: {
+    'ember/no-mixins': 'off',
+    'ember/no-new-mixins': 'off',
+    'ember/no-classic-classes': 'off',
+    'ember/no-get': 'off',
+    'ember/use-ember-data-rfc-395-imports': 'off',
+    'ember/avoid-leaking-state-in-ember-objects': 'off',
+    'ember/no-computed-properties-in-native-classes': 'off',
+    'no-prototype-builtins': 'off',
   },
   overrides: [
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
@@ -47,7 +60,7 @@ module.exports = {
       },
       plugins: ['node'],
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
+        'no-undef': 'off',
       })
     }
   ]

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  push:
+    branches: [ 'master', 'v*' ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ember-try-scenario:
+          - ember-lts-3.4
+          - ember-lts-3.8
+          - ember-lts-3.12
+          - ember-lts-3.16
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - ember-default
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: volta-cli/action@v1
+
+      - name: Run Tests
+        run: |
+          yarn
+          yarn run lint:js
+          ./node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+
+#      - name: Coveralls
+#        uses: coverallsapp/github-action@master
+#        with:
+#          github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -9,6 +9,7 @@
 /node_modules/
 
 # misc
+/.idea
 /.sass-cache
 /connect.lock
 /coverage/

.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
-  - "6"
+  - "12"
 
 sudo: false
 dist: trusty
@@ -22,9 +22,10 @@ env:
   matrix:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - EMBER_TRY_SCENARIO=ember-lts-2.12
-    - EMBER_TRY_SCENARIO=ember-lts-2.16
-    - EMBER_TRY_SCENARIO=ember-lts-2.18
+    - EMBER_TRY_SCENARIO=ember-lts-3.4
+    - EMBER_TRY_SCENARIO=ember-lts-3.8
+    - EMBER_TRY_SCENARIO=ember-lts-3.12
+    - EMBER_TRY_SCENARIO=ember-lts-3.16
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary
@@ -37,7 +38,7 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g npm@4
+  - npm install -g npm@7
   - npm --version
 
 script:

README.md

@@ -2,8 +2,6 @@
 
 [![Build Status](https://travis-ci.org/amiel/ember-data-url-templates.svg)](https://travis-ci.org/amiel/ember-data-url-templates)
 [![Ember Observer Score](http://emberobserver.com/badges/ember-data-url-templates.svg)](http://emberobserver.com/addons/ember-data-url-templates)
-[![Dependency Status](https://david-dm.org/amiel/ember-data-url-templates.svg)](https://david-dm.org/amiel/ember-data-url-templates)
-[![devDependency Status](https://david-dm.org/amiel/ember-data-url-templates/dev-status.svg)](https://david-dm.org/amiel/ember-data-url-templates?type=dev)
 
 ember-data-url-templates is an addon to allow building urls with url templates instead of
 defining `buildURL` as described in [RFC #4](https://github.com/emberjs/rfcs/pull/4).
@@ -24,7 +22,8 @@ ember install ember-data-url-templates
 
 ### Requirements
 
-ember-data-url-templates `>= 0.1.0` is known to work with ember-data `>= 1.0.0-beta.18`, `^1.13`, and `^2.0`.
+- Node `>= 10`
+- ember-data-url-templates `>= 1.0.0` is known to work with ember-data `>= 3.4`.
 
 ### Documentation
 

config/ember-try.js

@@ -1,5 +1,4 @@
 'use strict';
-
 const getChannelURL = require('ember-source-channel-url');
 
 module.exports = function() {
@@ -9,28 +8,60 @@ module.exports = function() {
     getChannelURL('canary')
   ]).then((urls) => {
     return {
+      useYarn: true,
+
       scenarios: [
         {
-          name: 'ember-lts-2.12',
+          name: 'ember-lts-3.4',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({
+              'jquery-integration': true,
+            }),
+          },
+          npm: {
+            devDependencies: {
+              '@ember/jquery': '^1.1.0',
+              'ember-source': '~3.4.0',
+              'ember-data': '~3.4.0',
+              'ember-ajax': '~4.0.1',
+              'ember-decorators-polyfill': '~1.1.5',
+              'ember-angle-bracket-invocation-polyfill': '~3.0.0',
+            }
+          }
+        },
+        {
+          name: 'ember-lts-3.8',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({
+              'jquery-integration': true,
+            }),
+          },
           npm: {
             devDependencies: {
-              'ember-source': '~2.12.0'
+              '@ember/jquery': '^1.1.0',
+              'ember-source': '~3.8.0',
+              'ember-data': '~3.8.0',
+              'ember-ajax': '~4.0.1',
+              'ember-decorators-polyfill': '~1.1.5',
+              'ember-angle-bracket-invocation-polyfill': '~3.0.0',
             }
           }
         },
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-3.12',
           npm: {
             devDependencies: {
-              'ember-source': '~2.16.0'
+              'ember-source': '~3.12.0',
+              'ember-data': '~3.12.0',
             }
           }
         },
         {
-          name: 'ember-lts-2.18',
+          name: 'ember-lts-3.16',
           npm: {
             devDependencies: {
-              'ember-source': '~2.18.0'
+              'ember-source': '~3.16.0',
+              'ember-data': '~3.16.0',
             }
           }
         },

index.js

@@ -1,5 +1,11 @@
 'use strict';
 
 module.exports = {
-  name: require('./package').name
+  name: require('./package').name,
+
+  included(app) {
+    this._super.included.apply(this, arguments);
+    app.import('node_modules/uri-templates/uri-templates.js');
+    app.import('vendor/shims/uri-templates.js');
+  },
 };

package.json

@@ -5,56 +5,67 @@
   "keywords": [
     "ember-addon"
   ],
+  "repository": "https://github.com/amiel/ember-data-url-templates",
   "license": "MIT",
   "author": "[email protected]",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
-  "repository": "https://github.com/amiel/ember-data-url-templates",
   "scripts": {
     "build": "ember build",
     "lint:js": "eslint .",
     "start": "ember serve",
     "test": "ember test",
-    "test:all": "ember try:each"
+    "test:coverage": "COVERAGE=true ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.6.0",
-    "ember-cli-uri-templates-shim": "^0.0.2"
+    "ember-cli-babel": "7.26.11",
+    "uri-templates": "^0.2.0"
   },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.7.0",
-    "ember-ajax": "^3.0.0",
-    "ember-cli": "~3.3.0",
-    "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-eslint": "^4.2.1",
-    "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-mirage": "^0.4.9",
-    "ember-cli-qunit": "^4.3.2",
-    "ember-cli-shims": "^1.2.0",
+    "@babel/eslint-parser": "^7.16.5",
+    "@ember/optional-features": "2.0.0",
+    "@ember/test-helpers": "^2.6.0",
+    "ember-auto-import": "^2.2.4",
+    "ember-cli": "3.28.5",
+    "ember-cli-code-coverage": "^1.0.3",
+    "ember-cli-dependency-checker": "3.2.0",
+    "ember-cli-htmlbars": "6.0.1",
+    "ember-cli-inject-live-reload": "2.1.0",
+    "ember-cli-mirage": "2.2.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^2.0.0",
-    "ember-data": "~3.5.0",
+    "ember-data": "~3.28.7",
     "ember-disable-prototype-extensions": "^1.1.2",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.1.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^4.0.0",
-    "ember-source": "~3.3.0",
-    "ember-source-channel-url": "^1.0.1",
-    "ember-try": "^0.2.23",
-    "eslint-plugin-ember": "^5.0.0",
-    "eslint-plugin-node": "^6.0.1",
+    "ember-export-application-global": "2.0.1",
+    "ember-load-initializers": "2.1.2",
+    "ember-maybe-import-regenerator": "1.0.0",
+    "ember-qunit": "^5.1.5",
+    "ember-resolver": "8.0.3",
+    "ember-source": "~3.28.8",
+    "ember-source-channel-url": "3.0.0",
+    "ember-try": "2.0.0",
+    "eslint": "^8.6.0",
+    "eslint-plugin-ember": "10.5.8",
+    "eslint-plugin-node": "11.1.0",
+    "faker": "^5.5.3",
     "loader.js": "^4.2.3",
-    "qunit-dom": "^0.6.2"
+    "qunit": "^2.17.2",
+    "qunit-dom": "2.0.0",
+    "webpack": "^5.65.0"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
   },
+  "ember": {
+    "edition": "octane"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config"
+  },
+  "volta": {
+    "node": "12.22.7",
+    "yarn": "1.22.7"
   }
 }

tests/acceptance/basic-url-template-test.js

@@ -1,15 +1,14 @@
 import { module, test } from 'qunit';
 import { visit, findAll, find } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 
 module('Acceptance | basic url template', function(hooks) {
   setupApplicationTest(hooks);
-
   setupMirage(hooks);
 
   test('it can use a simple custom url', async function(assert) {
-    server.createList('post', 5);
+    this.server.createList('post', 5);
 
     await visit('/posts');
     assert.equal(findAll('#posts .post').length, 5);