Fix react-native build

perry-mitchell · Apr 21, 2024 · 77437ba · 77437ba
1 parent 17059d9
commit 77437ba
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 63 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,6 +76,7 @@
     "md5": "^2.3.0",
     "minimatch": "^7.4.6",
     "nested-property": "^4.0.0",
+    "node-fetch": "^3.3.2",
     "path-posix": "^1.0.0",
     "url-join": "^5.0.0",
     "url-parse": "^1.5.10"
@@ -87,7 +88,7 @@
     "@types/chai": "^4.3.12",
     "@types/he": "^1.2.3",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.28",
+    "@types/node": "^20.12.7",
     "@types/sinon": "^17.0.3",
     "@types/url-parse": "^1.4.11",
     "babel-loader": "^9.1.3",
@@ -112,7 +113,6 @@
     "mkdirp": "^1.0.4",
     "mocha": "^10.3.0",
     "nock": "^13.5.4",
-    "node-fetch": "^3.3.0",
     "nodemon": "^3.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.2.5",
@@ -121,7 +121,7 @@
     "rimraf": "^5.0.5",
     "sinon": "^17.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.5",
     "wait-on": "^6.0.1",
     "webdav-server": "^2.6.2",
     "webpack": "^5.90.3",

diff --git a/source/operations/copyFile.ts b/source/operations/copyFile.ts
@@ -2,7 +2,7 @@ import { joinURL } from "../tools/url.js";
 import { encodePath } from "../tools/path.js";
 import { request, prepareRequestOptions } from "../request.js";
 import { handleResponseCode } from "../response.js";
-import { CopyFileOptions, WebDAVClientContext, WebDAVMethodOptions } from "../types.js";
+import { CopyFileOptions, WebDAVClientContext } from "../types.js";
 
 export async function copyFile(
     context: WebDAVClientContext,

diff --git a/source/operations/moveFile.ts b/source/operations/moveFile.ts
@@ -2,7 +2,7 @@ import { joinURL } from "../tools/url.js";
 import { encodePath } from "../tools/path.js";
 import { request, prepareRequestOptions } from "../request.js";
 import { handleResponseCode } from "../response.js";
-import { MoveFileOptions, WebDAVClientContext, WebDAVMethodOptions } from "../types.js";
+import { MoveFileOptions, WebDAVClientContext } from "../types.js";
 
 export async function moveFile(
     context: WebDAVClientContext,

diff --git a/source/operations/partialUpdateFileContents.ts b/source/operations/partialUpdateFileContents.ts
@@ -1,4 +1,4 @@
-import { Readable } from "node:stream";
+import { Readable } from "stream";
 import { Layerr } from "layerr";
 import { joinURL } from "../tools/url.js";
 import { encodePath } from "../tools/path.js";
@@ -10,8 +10,7 @@ import {
     ErrorCode,
     Headers,
     WebDAVMethodOptions,
-    WebDAVClientContext,
-    WebDAVClientError
+    WebDAVClientContext
 } from "../types.js";
 
 export async function partialUpdateFileContents(

diff --git a/source/tools/dav.ts b/source/tools/dav.ts
@@ -28,10 +28,8 @@ function getParser(): XMLParser {
             hex: true,
             leadingZeros: false
         }
-        // // We don't use the processors here as decoding is done manually
-        // // later on - decoding early would break some path checks.
-        // attributeValueProcessor: val => decodeHTMLEntities(decodeURIComponent(val)),
-        // tagValueProcessor: val => decodeHTMLEntities(decodeURIComponent(val))
+        // We don't use the processors here as decoding is done manually
+        // later on - decoding early would break some path checks.
     });
 }
 

diff --git a/webpack.config.cjs b/webpack.config.cjs
@@ -20,17 +20,15 @@ function getBasicConfig() {
                     loader: "babel-loader",
                     options: {
                         presets: [
-                            ["@babel/preset-env", {
-                                targets: [
-                                    "> 0.25%, not dead",
-                                    "maintained node versions"
-                                ]
-                            }],
+                            [
+                                "@babel/preset-env",
+                                {
+                                    targets: ["> 0.25%, not dead", "maintained node versions"]
+                                }
+                            ],
                             "@babel/preset-typescript"
                         ],
-                        plugins: [
-                            "babel-plugin-transform-async-to-promises"
-                        ]
+                        plugins: ["babel-plugin-transform-async-to-promises"]
                     },
                     resolve: {
                         fullySpecified: false
@@ -52,8 +50,8 @@ function getBasicConfig() {
 
         resolve: {
             alias: {
-                "http": path.resolve(__dirname, "./util/http.stub.ts"),
-                "node-fetch": path.resolve(__dirname, "./util/node-fetch.stub.ts")
+                http: path.resolve(__dirname, "./util/http.stub.ts"),
+                https: path.resolve(__dirname, "./util/http.stub.ts")
             },
             extensions: [".js"],
             fallback: {
@@ -89,7 +87,7 @@ module.exports = [
 
         resolve: {
             alias: {
-                "he": path.resolve(__dirname, "./util/he.stub.ts")
+                he: path.resolve(__dirname, "./util/he.stub.ts")
             },
             plugins: [
                 // Handle .ts => .js resolution
@@ -104,7 +102,8 @@ module.exports = [
 
         output: {
             filename: "index.js",
-            path: path.resolve(__dirname, "./dist/react-native")
+            path: path.resolve(__dirname, "./dist/react-native"),
+            chunkFormat: "commonjs"
         },
 
         plugins: [
@@ -120,6 +119,6 @@ module.exports = [
             ]
         },
 
-        target: "web"
-    }),
+        target: "node"
+    })
 ];