Upgrade deps

.github/workflows/ci.yml

@@ -21,15 +21,15 @@ jobs:
     strategy:
       matrix:
         node:
-          - "12"
           - "14"
+          - "16"
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm install
+      - run: yarn install
 
       - name: Test with ${{ matrix.node }}
         run: node_modules/.bin/ember test
@@ -68,19 +68,19 @@ jobs:
       matrix:
         ember-try-scenario:
           - ember-3.25
-          - ember-3.26
+          - ember-3.28
           - ember-release
           - ember-beta
-          # - ember-canary
+          - ember-canary
           - embroider-safe
           - embroider-optimized
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: install dependencies
-        run: npm install
+        run: yarn install
       - name: test
         run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
 
@@ -111,7 +111,7 @@ jobs:
         with:
           persist-credentials: false
       - uses: volta-cli/action@v1
-      - run: npm install
+      - run: yarn install
 
       - name: Release
         run: node_modules/.bin/semantic-release

.github/workflows/lint.yml

@@ -24,14 +24,37 @@ jobs:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
 
-      - run: npm install
+      - run: yarn install
 
       - name: ESLint
-        run: npm run lint:js
+        run: yarn lint:js
 
       - name: Templates
-        run: npm run lint:hbs
+        run: yarn lint:hbs
 
+  tooling:
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
+    name: Tooling
+    runs-on: ubuntu-latest
+    needs: [install_dependencies]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: volta-cli/action@v1
+        with:
+          node-version: "14" # min-supported
+
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Semantic Release
+        run: yarn semantic-release --dry-run
+        working-directory: ./ember-resources
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # docs:
   #   if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"

.github/workflows/types.yml

@@ -24,8 +24,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
 
-      - run: npm install
+      - run: yarn install
 
       - name: Type Checking
-        # run: yarn tsc --build
-        run: npm run prepack
+        run: yarn prepack
+        # run: npm run prepack

addon/-private/proxy.ts

@@ -1,17 +1,17 @@
 import { assert } from '@ember/debug';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
-import { get as consumeTag, notifyPropertyChange as dirtyKey } from '@ember/object';
 
-import { tracked, TrackedWeakMap } from 'tracked-built-ins';
+import { createStorage, getValue, setValue } from 'ember-tracked-storage-polyfill';
 
+import type { TrackedStorage } from 'ember-tracked-storage-polyfill';
 import type { EventObject, Interpreter, State } from 'xstate';
 
 export const UPDATE_EVENT_NAME = 'ARGS_UPDATE';
 
-const CACHE = new TrackedWeakMap<Interpreter<unknown>, Record<string, unknown>>();
+const CACHE = new WeakMap<Interpreter<unknown>, TrackedStorage<null>>();
 
 export function reactiveInterpreter(interpreter: Interpreter<unknown>) {
-  CACHE.set(interpreter, tracked({}));
+  ensureStorage(interpreter);
 
   interpreter.onTransition(async (_state: State<unknown>, event: EventObject) => {
     // init always runs, we don't need to dirty
@@ -39,22 +39,31 @@ export function reactiveInterpreter(interpreter: Interpreter<unknown>) {
   return new Proxy(interpreter, {
     get(target, key, receiver) {
       if (key === '_state') {
-        let tracking = CACHE.get(target);
+        let storage = ensureStorage(target);
 
-        assert(`Tracking context lost!`, tracking);
-
-        consumeTag(tracking, key);
+        getValue(storage);
       }
 
       return Reflect.get(target, key, receiver);
     },
   });
 }
 
+function ensureStorage(interpreter: Interpreter<unknown>) {
+  let storage = CACHE.get(interpreter);
+
+  if (!storage) {
+    storage = createStorage(null, () => false);
+    CACHE.set(interpreter, storage);
+  }
+
+  return storage;
+}
+
 function dirtyState(interpreter: Interpreter<unknown>) {
-  let tracking = CACHE.get(interpreter);
+  let storage = CACHE.get(interpreter);
 
-  assert(`Tracking context lost!`, tracking);
+  assert(`Tracking context lost!`, storage);
 
-  dirtyKey(tracking, '_state');
+  setValue(storage, null);
 }

commitlint.config.js

@@ -1,18 +1,18 @@
 'use strict';
 
 module.exports = {
- extends: ['@commitlint/config-conventional'],
+  extends: ['@commitlint/config-conventional'],
   // https://commitlint.js.org/#/reference-rules
   // Level [0..2]: 0 disables the rule. For 1 it will be considered a warning for 2 an error.
   // Applicable always|never: never inverts the rule.
   // Value: value to use for this rule.
   rules: {
     // 72, the default, is a little short
-    "header-max-length": [1, "always", 100],
+    'header-max-length': [1, 'always', 100],
     // Let people use caps
-    "header-case": [0],
+    'header-case': [0],
     // Let people write  sentences
-    "header-full-stop": [0],
-    "subject-case": [0],
-  }
-}
+    'header-full-stop': [0],
+    'subject-case': [0],
+  },
+};

config/ember-try.js

@@ -15,10 +15,10 @@ module.exports = async function () {
         },
       },
       {
-        name: 'ember-3.26',
+        name: 'ember-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.26.0',
+            'ember-source': '~3.28.0',
           },
         },
       },
@@ -46,8 +46,20 @@ module.exports = async function () {
           },
         },
       },
-      embroiderSafe(),
-      embroiderOptimized(),
+      embroiderSafe({
+        npm: {
+          devDependencies: {
+            '@babel/plugin-proposal-private-methods': '^7.0.0',
+          },
+        },
+      }),
+      embroiderOptimized({
+        npm: {
+          devDependencies: {
+            '@babel/plugin-proposal-private-methods': '^7.0.0',
+          },
+        },
+      }),
     ],
   };
 };

ember-cli-build.js

@@ -4,7 +4,16 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
-    // Add options here
+    // 'ember-cli-babel': {
+    //   compileModules: false,
+    // },
+    babel: {
+      loose: true,
+      plugins: [
+        // ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
+        ['@babel/plugin-proposal-private-methods', { loose: true }],
+      ],
+    },
   });
 
   /*