Merge pull request #298 from ember-a11y/fix-ts-duplicate-identifier

ember-a11y · Oct 18, 2021 · dff095f · dff095f
2 parents e0a450a + 31a302a
commit dff095f
Show file tree

Hide file tree

Showing 8 changed files with 2,493 additions and 3,195 deletions.
diff --git a/addon-test-support/logger.ts b/addon-test-support/logger.ts
@@ -106,9 +106,11 @@ function logHtml(node: NodeResult | RelatedNode): void {
 function logFailureMessage(node: NodeResult, key: AxeCoreNodeResultKey): void {
   // this exists on axe but we don't export it as part of the typescript
   // namespace, so just let me use it as I need
-  const message: string = ((axeCore as unknown) as AxeWithAudit)._audit.data.failureSummaries[
-    key
-  ].failureMessage(node[key].map((check) => check.message || ''));
+  const message: string = (
+    axeCore as unknown as AxeWithAudit
+  )._audit.data.failureSummaries[key].failureMessage(
+    node[key].map((check) => check.message || '')
+  );
 
   console.error(message);
 }

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -62,6 +62,10 @@ module.exports = async function () {
       {
         name: 'ember-release',
         npm: {
+          dependencies: {
+            'ember-auto-import': '^2.2.0',
+            webpack: '^5.0.0',
+          },
           devDependencies: {
             'ember-source': await getChannelURL('release'),
           },
@@ -70,6 +74,10 @@ module.exports = async function () {
       {
         name: 'ember-beta',
         npm: {
+          dependencies: {
+            'ember-auto-import': '^2.2.0',
+            webpack: '^5.0.0',
+          },
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
           },
@@ -78,6 +86,10 @@ module.exports = async function () {
       {
         name: 'ember-canary',
         npm: {
+          dependencies: {
+            'ember-auto-import': '^2.2.0',
+            webpack: '^5.0.0',
+          },
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
           },

diff --git a/node-tests/setup-middleware-test.js b/node-tests/setup-middleware-test.js
@@ -48,19 +48,20 @@ QUnit.module('setupMiddleware', function (hooks) {
     server.close();
   });
 
-  QUnit.test('can respond to requests to report violations', async function (
-    assert
-  ) {
-    let data = [buildResult(violationsFixture)];
+  QUnit.test(
+    'can respond to requests to report violations',
+    async function (assert) {
+      let data = [buildResult(violationsFixture)];
 
-    let json = await fetch('http://localhost:3000/report-violations', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(data),
-    }).then((res) => res.json());
+      let json = await fetch('http://localhost:3000/report-violations', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(data),
+      }).then((res) => res.json());
 
-    assert.deepEqual(readJSONSync(json.outputPath), data);
-  });
+      assert.deepEqual(readJSONSync(json.outputPath), data);
+    }
+  );
 });
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
+    "lint:ts": "tsc --noEmit",
     "start": "ember serve",
     "test": "npm-run-all lint:* test:*",
     "test:node": "qunit node-tests",
@@ -132,6 +133,9 @@
       "tokenRef": "GITHUB_AUTH"
     }
   },
+  "resolutions": {
+    "socket.io": "^4.3.1"
+  },
   "contributors": [
     "Trent Willis <[email protected]>",
     "Andrew A Lee <[email protected]>",
@@ -164,4 +168,4 @@
     "node": "12.22.1",
     "yarn": "1.22.10"
   }
-}
+}
diff --git a/tests/acceptance/setup-global-a11y-hooks-test.ts b/tests/acceptance/setup-global-a11y-hooks-test.ts
@@ -50,23 +50,24 @@ module('setupGlobalA11yHooks with invokeAll', function (hooks) {
   });
 
   getRange(TEST_INVOCATIONS_COUNT).forEach((num) => {
-    test(getTestName(num, TEST_INVOCATIONS_COUNT, 'invokeAll'), async function (
-      assert
-    ) {
-      assert.expect(0);
+    test(
+      getTestName(num, TEST_INVOCATIONS_COUNT, 'invokeAll'),
+      async function (assert) {
+        assert.expect(0);
 
-      await visit('/');
+        await visit('/');
 
-      numInvoked++;
+        numInvoked++;
 
-      if (numInvoked === TEST_INVOCATIONS_COUNT) {
-        assert.expect(1);
-        assert.equal(
-          actualAuditInvocationsCount,
-          EXPECTED_AUDIT_INVOCATIONS_COUNT
-        );
+        if (numInvoked === TEST_INVOCATIONS_COUNT) {
+          assert.expect(1);
+          assert.equal(
+            actualAuditInvocationsCount,
+            EXPECTED_AUDIT_INVOCATIONS_COUNT
+          );
+        }
       }
-    });
+    );
   });
 });
 

diff --git a/tests/unit/format-violation-test.ts b/tests/unit/format-violation-test.ts
@@ -61,7 +61,8 @@ module('Unit | Utils | formatViolation', function () {
       ],
     };
 
-    let expected = /formatViolation called with improper structure of parameter: violation. Required properties: impact, help, helpUrl./;
+    let expected =
+      /formatViolation called with improper structure of parameter: violation. Required properties: impact, help, helpUrl./;
 
     assert.throws(function () {
       formatViolation(violation, [violation.nodes[0].html]);

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,6 +9,7 @@
     "alwaysStrict": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
+    "skipLibCheck": true,
     "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,