Merge branch 'release/4.2' into update-json-schema-ref-parser

Author: wparad

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
       - name: Cache Node Modules
@@ -43,12 +43,6 @@ jobs:
       - name: Test
         run: yarn lint && yarn test
 
-      - name: Set up Node.js for publishing
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: 'https://registry.npmjs.org'
-
       - name: Deploy to NPM
         if: github.repository_owner == 'Authress-Engineering' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master' && github.event_name == 'push'
         run: |

.nvmrc

@@ -1 +1 @@
-16
+20

babel.config.js

@@ -9,7 +9,7 @@ module.exports = {
             modules: 'commonjs',
             corejs: { version: 3 },
             targets: {
-              node: '16',
+              node: '20',
             },
             forceAllTransforms: false,
           },

config/webpack/browser.config.babel.js

@@ -41,10 +41,11 @@ const browser = {
     modules: ['node_modules'],
     extensions: ['.js', '.json'],
     fallback: {
+      url: require.resolve('url'),
       http: require.resolve('stream-http'),
       https: require.resolve('https-browserify'),
       buffer: require.resolve('buffer'),
-      path: require.resolve('path-browserify')
+      path: require.resolve('path-browserify'),
     },
   },
   module,
@@ -76,7 +77,7 @@ const browserMin = cloneDeep(browser);
 browserMin.devtool = 'source-map';
 browserMin.performance = {
   hints: 'error',
-  maxEntrypointSize: 270000,
+  maxEntrypointSize: 310000,
   maxAssetSize: 1300000,
 };
 browserMin.output.filename = 'openapi-resolver.browser.min.js';

package.json

@@ -55,6 +55,7 @@
     "@babel/plugin-transform-runtime": "=7.18.6",
     "@babel/preset-env": "=7.18.6",
     "@babel/register": "=7.18.6",
+    "@types/json-schema": "^7.0.15",
     "babel-loader": "=8.2.5",
     "buffer": "^6.0.3",
     "commander": "^9.4.0",
@@ -96,6 +97,10 @@
     "@apidevtools/json-schema-ref-parser": "^15.3.1",
     "@babel/runtime-corejs3": "^7.18.9",
     "js-yaml": "^4.1.1",
-    "lodash.clonedeepwith": "^4.5.0"
+    "lodash.clonedeepwith": "^4.5.0",
+    "url": "^0.11.4"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }

yarn.lock

@@ -5662,6 +5662,14 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url@^0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.4.tgz#adca77b3562d56b72746e76b330b7f27b6721f3c"
+  integrity sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==
+  dependencies:
+    punycode "^1.4.1"
+    qs "^6.12.3"
+
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"