Merge pull request #723 from dequelabs/release-1683060243

chore: release v4.7.1
dequelabs · May 3, 2023 · 32caffd · 32caffd
2 parents 623da3a + 49161f5
commit 32caffd
Show file tree

Hide file tree

Showing 32 changed files with 249 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+
+### Bug Fixes
+
+* proper imports in esm context ([#718](https://github.com/dequelabs/axe-core-npm/issues/718)) ([f2a41bc](https://github.com/dequelabs/axe-core-npm/commit/f2a41bcaf33f5000fa1cd08f1a3e184b5d6360be))
+* **react:** include .mjs file in publish ([#722](https://github.com/dequelabs/axe-core-npm/issues/722)) ([a7bf92f](https://github.com/dequelabs/axe-core-npm/commit/a7bf92fd9856b7be0fea4f3c8bd38a79a3c9fde3))
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 

diff --git a/lerna.json b/lerna.json
@@ -5,5 +5,5 @@
     "packages/webdriverjs/tests/example",
     "axe_core_test"
   ],
-  "version": "4.7.0"
+  "version": "4.7.1"
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+**Note:** Version bump only for package @axe-core/cli
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 

diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/cli",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "A CLI for accessibility testing using axe-core",
   "author": {
     "name": "Wilco Fiers",
@@ -53,7 +53,7 @@
     "testing"
   ],
   "dependencies": {
-    "@axe-core/webdriverjs": "^4.7.0",
+    "@axe-core/webdriverjs": "^4.7.1",
     "axe-core": "^4.7.0",
     "chromedriver": "^112.0.0",
     "colors": "^1.4.0",

diff --git a/packages/playwright/CHANGELOG.md b/packages/playwright/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+**Note:** Version bump only for package @axe-core/playwright
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 

diff --git a/packages/playwright/package-lock.json b/packages/playwright/package-lock.json
diff --git a/packages/playwright/package.json b/packages/playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/playwright",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Provides a method to inject and analyze web pages using axe",
   "contributors": [
     {

diff --git a/packages/puppeteer/CHANGELOG.md b/packages/puppeteer/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+
+### Bug Fixes
+
+* proper imports in esm context ([#718](https://github.com/dequelabs/axe-core-npm/issues/718)) ([f2a41bc](https://github.com/dequelabs/axe-core-npm/commit/f2a41bcaf33f5000fa1cd08f1a3e184b5d6360be))
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 

diff --git a/packages/puppeteer/esmTest.mjs b/packages/puppeteer/esmTest.mjs
@@ -1,7 +1,34 @@
 import defaultExport, { AxePuppeteer } from './dist/index.mjs';
 import assert from 'assert';
+import puppeteer from 'puppeteer';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { join } from 'path';
 
 const exportIsFunction = typeof(defaultExport) === 'function';
 const exportIsSame = defaultExport === AxePuppeteer;
 assert(exportIsFunction, 'export is not a function');
 assert(exportIsSame, 'default and named export is not the same');
+
+
+const options = {};
+
+if (process.env.CI) {
+  options.args = [];
+  options.args.push('--no-sandbox', '--disable-setuid-sandbox');
+  options.executablePath = '/usr/bin/google-chrome-stable';
+}
+
+async function integrationTest() {
+  let path = fileURLToPath(new URL('.', import.meta.url));
+  path = join(path, './node_modules/axe-test-fixtures/fixtures/index.html');
+
+  const browser = await puppeteer.launch(options);
+  const page = await browser.newPage();
+  await page.setBypassCSP(true);
+  await page.goto(pathToFileURL(path));
+  const results = await new AxePuppeteer(page).analyze();
+  assert(results.violations.length > 0, 'could not find violations');
+  await page.close();
+  await browser.close();
+}
+integrationTest();
diff --git a/packages/puppeteer/package-lock.json b/packages/puppeteer/package-lock.json
diff --git a/packages/puppeteer/package.json b/packages/puppeteer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/puppeteer",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Provides a chainable axe API for Puppeteer and automatically injects into all frames",
   "repository": {
     "type": "git",
@@ -40,6 +40,7 @@
     "@types/test-listen": "^1.1.0",
     "axe-test-fixtures": "github:dequelabs/axe-test-fixtures#v1",
     "chai": "^4.3.6",
+    "cross-dirname": "^0.1.0",
     "express": "^4.18.2",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",

diff --git a/packages/puppeteer/src/legacy.ts b/packages/puppeteer/src/legacy.ts
@@ -1,5 +1,7 @@
 import * as fs from 'fs';
 import { Frame } from 'puppeteer';
+import { getFilename } from 'cross-dirname';
+import { pathToFileURL } from 'url';
 
 interface IInjectAxeArgs {
   source?: string | Function;
@@ -52,7 +54,19 @@ export async function injectJS(
 }
 
 async function injectJSModule(frame: Frame): Promise<void> {
-  const source = fs.readFileSync(require.resolve('axe-core'), 'utf8');
+  let axeCorePath = '';
+  if (typeof require === 'function' && typeof require.resolve === 'function') {
+    axeCorePath = require.resolve('axe-core');
+  } else {
+    const { createRequire } = (await import('node:module')) as any;
+    // `getFilename` is needed because esm's `import.meta.url` is illegal syntax in cjs
+    const filename = pathToFileURL(getFilename()).toString();
+
+    const require = createRequire(filename);
+    axeCorePath = require.resolve('axe-core');
+  }
+
+  const source = fs.readFileSync(axeCorePath, 'utf8');
   await injectJSSource(frame, source);
 }
 

diff --git a/packages/puppeteer/src/utils.ts b/packages/puppeteer/src/utils.ts
@@ -2,6 +2,8 @@ import * as fs from 'fs';
 import * as Axe from 'axe-core';
 import { Frame } from 'puppeteer';
 import { axeConfigure, axeShadowSelect } from './browser';
+import { getFilename } from 'cross-dirname';
+import { pathToFileURL } from 'url';
 import { pageIsLoaded } from './browser';
 
 export async function frameSourceInject(
@@ -11,8 +13,22 @@ export async function frameSourceInject(
 ): Promise<void> {
   await assertFrameReady(frame);
   if (!source) {
-    const pathFile = require.resolve('axe-core');
-    source = fs.readFileSync(pathFile, 'utf8');
+    let axeCorePath = '';
+    if (
+      typeof require === 'function' &&
+      typeof require.resolve === 'function'
+    ) {
+      axeCorePath = require.resolve('axe-core');
+    } else {
+      const { createRequire } = (await import('node:module')) as any;
+      // `getFilename` is needed because esm's `import.meta.url` is illegal syntax in cjs
+      const filename = pathToFileURL(getFilename()).toString();
+
+      const require = createRequire(filename);
+      axeCorePath = require.resolve('axe-core');
+    }
+
+    source = fs.readFileSync(axeCorePath, 'utf8');
   }
   await frame.evaluate(source);
   await frame.evaluate(axeConfigure, config as Axe.Spec);

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+
+### Bug Fixes
+
+* **react:** include .mjs file in publish ([#722](https://github.com/dequelabs/axe-core-npm/issues/722)) ([a7bf92f](https://github.com/dequelabs/axe-core-npm/commit/a7bf92fd9856b7be0fea4f3c8bd38a79a3c9fde3))
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 

diff --git a/packages/react/examples/shadow-dom/CHANGELOG.md b/packages/react/examples/shadow-dom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.7.1](https://github.com/dequelabs/axe-core-npm/compare/v4.7.0...v4.7.1) (2023-05-02)
+
+**Note:** Version bump only for package @axe-core/react-example
+
+
+
+
+
 # [4.7.0](https://github.com/dequelabs/axe-core-npm/compare/v4.6.1...v4.7.0) (2023-04-28)
 
 **Note:** Version bump only for package @axe-core/react-example

diff --git a/packages/react/examples/shadow-dom/package-lock.json b/packages/react/examples/shadow-dom/package-lock.json
diff --git a/packages/react/examples/shadow-dom/package.json b/packages/react/examples/shadow-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/react-example",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Example of react-axe with a React.js application",
   "main": "index.js",
   "private": true,
@@ -13,7 +13,7 @@
   "author": "Dylan Barrell (dylan@barrell.com)",
   "license": "MIT",
   "dependencies": {
-    "@axe-core/react": "^4.7.0",
+    "@axe-core/react": "^4.7.1",
     "create-react-class": "^15.6.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",

diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/react",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Dynamic accessibility analysis for React using axe-core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -20,6 +20,7 @@
     "dist/cache.d.ts",
     "dist/cache.js.map",
     "dist/index.js",
+    "dist/index.mjs",
     "dist/index.d.ts",
     "dist/index.js.map"
   ],