Updating p-queue and node-fetch

divdavem · divdavem · commit 2ec3c9a0ee09 · 2022-12-02T12:35:24.000+01:00
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -16,16 +16,6 @@ jobs:
           node-version: "14.x"
       - run: npm i -g pnpm
       - run: pnpm update -r --latest -E
-      - run: |
-          ( cd ./components/assistive-webdriver && pnpm install p-queue@6.6.2 )
-          ( cd ./components/assistive-webdriver && pnpm install node-fetch@2.6.7 )
-          ( cd ./components/assistive-webdriver && pnpm install -D @types/node-fetch@2.6.2 )
-          ( cd ./components/assistive-playwright-client && pnpm install node-fetch@2.6.7 )
-          ( cd ./components/assistive-playwright-client && pnpm install -D @types/node-fetch@2.6.2 )
-          ( cd ./components/assistive-playwright-server && pnpm install -D node-fetch@2.6.7 )
-          ( cd ./components/assistive-playwright-server && pnpm install -D @types/node-fetch@2.6.2 )
-          ( cd ./components/assistive-playwright-tester && pnpm install node-fetch@2.6.7 )
-          ( cd ./components/assistive-playwright-tester && pnpm install -D @types/node-fetch@2.6.2 )
       - name: Create pull request
         uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e # v4.0.2
         with:
diff --git a/components/assistive-playwright-client/jest.config.js b/components/assistive-playwright-client/jest.config.js
@@ -17,7 +17,9 @@
  */
 
 module.exports = {
+  transformIgnorePatterns: [],
   transform: {
+    "\\.m?js$": "../../tools/jestEsmTransform",
     "^.+\\.ts$": [
       "../../tools/code-coverage/jestTransform",
       { tsconfig: "tsconfig.test.json" }
diff --git a/components/assistive-playwright-client/package.json b/components/assistive-playwright-client/package.json
@@ -26,20 +26,22 @@
   ],
   "devDependencies": {
     "@microsoft/api-extractor": "7.33.6",
+    "@rollup/plugin-commonjs": "23.0.3",
+    "@rollup/plugin-node-resolve": "15.0.1",
+    "@rollup/plugin-typescript": "10.0.1",
     "@types/jest": "29.2.3",
-    "@types/node-fetch": "2.6.2",
     "@types/pngjs": "6.0.1",
     "@types/uuid": "9.0.0",
     "@types/ws": "8.5.3",
     "assistive-playwright-server": "workspace:*",
     "jest": "29.3.1",
+    "node-fetch": "3.3.0",
     "rollup": "3.5.1",
     "tslib": "2.4.1",
     "typescript": "4.9.3",
     "wait-port": "1.0.4"
   },
   "dependencies": {
-    "node-fetch": "2.6.7",
     "playwright-core": "1.28.1",
     "uuid": "9.0.0",
     "vm-providers": "workspace:*",
diff --git a/components/assistive-playwright-client/rollup.config.js b/components/assistive-playwright-client/rollup.config.js
@@ -19,14 +19,17 @@
 require("../../tools/code-coverage/overrideReadFileSync");
 const pkg = require("./package.json");
 const dependencies = Object.keys(pkg.dependencies);
+const commonjs = require("@rollup/plugin-commonjs");
+const { nodeResolve } = require("@rollup/plugin-node-resolve");
 const typescript = require("@rollup/plugin-typescript");
 
 module.exports = [
   {
     output: [
       {
         file: "./dist/index.js",
-        format: "cjs"
+        format: "cjs",
+        inlineDynamicImports: true
       }
     ],
     input: "./src/index.ts",
@@ -41,6 +44,6 @@ module.exports = [
       "stream",
       "url"
     ]),
-    plugins: [typescript()]
+    plugins: [commonjs({ preferBuiltins: true }), nodeResolve(), typescript()]
   }
 ];
diff --git a/components/assistive-playwright-server/jest.config.js b/components/assistive-playwright-server/jest.config.js
@@ -17,7 +17,9 @@
  */
 
 module.exports = {
+  transformIgnorePatterns: [],
   transform: {
+    "\\.m?js$": "../../tools/jestEsmTransform",
     "^.+\\.ts$": [
       "../../tools/code-coverage/jestTransform",
       { tsconfig: "tsconfig.test.json" }
diff --git a/components/assistive-playwright-server/package.json b/components/assistive-playwright-server/package.json
@@ -31,11 +31,10 @@
     "@types/co-body": "6.1.0",
     "@types/http-proxy": "1.17.9",
     "@types/jest": "29.2.3",
-    "@types/node-fetch": "2.6.2",
     "@types/ws": "8.5.3",
     "@types/yargs": "17.0.15",
     "jest": "29.3.1",
-    "node-fetch": "2.6.7",
+    "node-fetch": "3.3.0",
     "rollup": "3.5.1",
     "tslib": "2.4.1",
     "typescript": "4.9.3",
diff --git a/components/assistive-playwright-server/rollup.config.js b/components/assistive-playwright-server/rollup.config.js
@@ -21,8 +21,9 @@ const {
 } = require("../../tools/code-coverage/overrideReadFileSync");
 const pkg = require("./package.json");
 const dependencies = Object.keys(pkg.dependencies);
-const typescript = require("@rollup/plugin-typescript");
 const commonjs = require("@rollup/plugin-commonjs");
+const { nodeResolve } = require("@rollup/plugin-node-resolve");
+const typescript = require("@rollup/plugin-typescript");
 const replace = require("@rollup/plugin-replace");
 
 module.exports = {
@@ -49,7 +50,8 @@ module.exports = {
       },
       preventAssignment: true
     }),
-    commonjs(),
+    commonjs({ preferBuiltins: true }),
+    nodeResolve(),
     typescript()
   ]
 };
diff --git a/components/assistive-playwright-tester/package.json b/components/assistive-playwright-tester/package.json
@@ -19,17 +19,19 @@
   ],
   "dependencies": {
     "assistive-playwright-client": "workspace:*",
-    "node-fetch": "2.6.7",
     "uuid": "9.0.0",
     "vm-providers": "workspace:*",
     "winston": "3.8.2",
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@types/node-fetch": "2.6.2",
+    "@rollup/plugin-commonjs": "23.0.3",
+    "@rollup/plugin-node-resolve": "15.0.1",
+    "@rollup/plugin-typescript": "10.0.1",
     "@types/uuid": "9.0.0",
     "@types/yargs": "17.0.15",
     "playwright-core": "1.28.1",
+    "node-fetch": "3.3.0",
     "rollup": "3.5.1",
     "tslib": "2.4.1",
     "typescript": "4.9.3",
diff --git a/components/assistive-playwright-tester/rollup.config.js b/components/assistive-playwright-tester/rollup.config.js
@@ -19,16 +19,19 @@
 require("../../tools/code-coverage/overrideReadFileSync");
 const pkg = require("./package.json");
 const dependencies = Object.keys(pkg.dependencies);
+const commonjs = require("@rollup/plugin-commonjs");
+const { nodeResolve } = require("@rollup/plugin-node-resolve");
 const typescript = require("@rollup/plugin-typescript");
 
 module.exports = {
   output: [
     {
       file: "./dist/index.js",
-      format: "cjs"
+      format: "cjs",
+      inlineDynamicImports: true
     }
   ],
   input: "./src/cli.ts",
   external: dependencies.concat(["http", "os", "readline", "path", "fs"]),
-  plugins: [typescript()]
+  plugins: [commonjs({ preferBuiltins: true }), nodeResolve(), typescript()]
 };
diff --git a/components/assistive-webdriver/jest.config.js b/components/assistive-webdriver/jest.config.js
@@ -17,7 +17,9 @@
  */
 
 module.exports = {
+  transformIgnorePatterns: [],
   transform: {
+    "\\.m?js$": "../../tools/jestEsmTransform",
     "^.+\\.ts$": [
       "../../tools/code-coverage/jestTransform",
       { tsconfig: "tsconfig.test.json" }
diff --git a/components/assistive-webdriver/package.json b/components/assistive-webdriver/package.json
@@ -37,7 +37,6 @@
     "http-proxy": "1.18.1",
     "koa": "2.13.4",
     "koa-route": "3.2.0",
-    "node-fetch": "2.6.7",
     "uuid": "9.0.0",
     "vm-providers": "workspace:*",
     "winston": "3.8.2",
@@ -56,15 +55,15 @@
     "@types/koa": "2.13.5",
     "@types/koa-bodyparser": "4.3.10",
     "@types/koa-route": "3.2.5",
-    "@types/node-fetch": "2.6.2",
     "@types/pngjs": "6.0.1",
     "@types/selenium-webdriver": "4.1.9",
     "@types/uuid": "9.0.0",
     "@types/ws": "8.5.3",
     "@types/yargs": "17.0.15",
     "jest": "29.3.1",
     "json-schema-to-typescript": "11.0.2",
-    "p-queue": "6.6.2",
+    "node-fetch": "3.3.0",
+    "p-queue": "7.3.0",
     "pngjs": "6.0.0",
     "rollup": "3.5.1",
     "selenium-webdriver": "4.7.0",
diff --git a/components/assistive-webdriver/rollup.config.js b/components/assistive-webdriver/rollup.config.js
@@ -65,16 +65,24 @@ module.exports = [
     output: [
       {
         file: "./dist/server/index.js",
-        format: "cjs"
+        format: "cjs",
+        inlineDynamicImports: true
       },
       {
         file: "./dist/server/index.mjs",
-        format: "esm"
+        format: "esm",
+        inlineDynamicImports: true
       }
     ],
     input: "./src/server/index.ts",
     external: externalDependencies,
-    plugins
+    plugins,
+    onwarn(warning, warn) {
+      if (warning.code === "THIS_IS_UNDEFINED") {
+        return; // ignore this warning
+      }
+      warn(warning);
+    }
   },
   {
     output: [
diff --git a/components/vm-providers/jest.config.js b/components/vm-providers/jest.config.js
@@ -17,7 +17,9 @@
  */
 
 module.exports = {
+  transformIgnorePatterns: [],
   transform: {
+    "\\.m?js$": "../../tools/jestEsmTransform",
     "^.+\\.ts$": [
       "../../tools/code-coverage/jestTransform",
       { tsconfig: "tsconfig.test.json" }
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "devDependencies": {
     "@babel/core": "7.20.5",
     "@babel/plugin-syntax-typescript": "7.20.0",
+    "@babel/plugin-transform-modules-commonjs": "7.19.6",
     "@microsoft/api-documenter": "7.19.25",
     "@typescript-eslint/eslint-plugin": "5.45.0",
     "@typescript-eslint/parser": "5.45.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/jestEsmTransform.js b/tools/jestEsmTransform.js
