From 88a230cbfaeae47298187ab1858f723be79f12da Mon Sep 17 00:00:00 2001 From: Tomas Valli Date: Fri, 14 Jul 2023 11:32:55 +0200 Subject: [PATCH 1/3] Package upgrades --- package.json | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 5c0d02258..88379a712 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "rn-pdf-reader-js", + "name": "@valli/rn-pdf-reader-js", "version": "4.1.1", - "description": "PDF reader for Expo", + "description": "Fork From PDF reader for Expo - Xavier Carpentier (https://xaviercarpentier.com/)", "main": "node_modules/expo/AppEntry.js", "types": "lib/index.d.ts", - "author": "Xavier Carpentier (https://xaviercarpentier.com/)", + "author": "Tomas Valli", "license": "MIT", "scripts": { "start": "yarn config:dev && expo start -c", @@ -31,37 +31,37 @@ ], "repository": { "type": "git", - "url": "git+https://github.com/xcarpentier/rn-pdf-reader-js.git" + "url": "git+https://github.com/Valli-/rn-pdf-reader-js.git" }, "peerDependencies": { - "expo": ">= 33.0.x < 41.0.x", - "expo-constants": ">= 5.0.0 < 9.x", - "expo-file-system": ">= 5.0.0 < 9.x", - "react": "16.x", + "expo": ">= 33.0.x ", + "expo-constants": ">= 5.0.0", + "expo-file-system": ">= 5.0.0 ", + "react": ">= 16.x", "react-native": "*", - "react-native-webview": ">= 7.0.5 < 12.x" + "react-native-webview": ">= 7.0.5" }, "dependencies": { - "buffer": "5.1.0", - "csstype": "2.6.8", - "js-base64": "2.4.5" + "buffer": "^6.0.3", + "csstype": "^3.1.1", + "js-base64": "^3.7.2" }, "devDependencies": { - "@types/js-base64": "2.3.1", - "@types/react": "16.9.17", - "@types/react-dom": "16.9.4", - "@types/react-native": "0.60.28", - "babel-preset-expo": "^8.0.0", - "crypto": "1.0.1", - "expo": "^36.0.2", - "expo-constants": "~8.0.0", - "expo-file-system": "~8.0.0", - "json": "^9.0.6", - "react": "16.9.0", - "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz", - "react-native-webview": "7.4.3", - "tslint": "^5.20.1", + "@types/js-base64": "^3.3.1", + "@types/react": "~18.0.0", + "@types/react-dom": "~18.0.0", + "@types/react-native": "~0.69.1", + "babel-preset-expo": "~9.2.0", + "crypto": "^1.0.1", + "expo": "^46.0.0", + "expo-constants": "~13.2.4", + "expo-file-system": "~14.1.0", + "json": "^11.0.0", + "react": "18.0.0", + "react-native": "0.69.5", + "react-native-webview": "11.23.0", + "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", - "typescript": "3.7.4" + "typescript": "^4.6.3" } } From 9d5126a437f5e312fee98f7ce538a57b386b819d Mon Sep 17 00:00:00 2001 From: Tomas Valli Date: Fri, 14 Jul 2023 14:07:40 +0200 Subject: [PATCH 2/3] Package upgrades --- app.json | 2 +- package.json | 33 +- react-pdf/package.json | 7 +- src/index.tsx | 15 +- tsconfig.json | 19 +- yarn.lock | 6601 +++++++++++++++++++++++++++------------- 6 files changed, 4590 insertions(+), 2087 deletions(-) diff --git a/app.json b/app.json index 054a3d725..226a8e675 100644 --- a/app.json +++ b/app.json @@ -4,7 +4,7 @@ "description": "PDF reader Example", "slug": "rn-pdf-reader-example", "privacy": "public", - "sdkVersion": "36.0.0", + "sdkVersion": "46.0.0", "platforms": ["ios", "android", "web"], "version": "1.0.0", "orientation": "portrait", diff --git a/package.json b/package.json index 88379a712..296dd7f0b 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { - "name": "@valli/rn-pdf-reader-js", - "version": "4.1.1", + "name": "@valli_/rn-pdf-reader-js", + "version": "1.0.3", "description": "Fork From PDF reader for Expo - Xavier Carpentier (https://xaviercarpentier.com/)", - "main": "node_modules/expo/AppEntry.js", + "main": "lib/index.js", "types": "lib/index.d.ts", "author": "Tomas Valli", "license": "MIT", "scripts": { - "start": "yarn config:dev && expo start -c", + "start": "npx expo start", "tsc": "node_modules/.bin/tsc --noEmit", "bundle": "./scripts/gen_bundle_string.js", - "build": "yarn bundle && rm -rf lib/ && node_modules/.bin/tsc", + "build": "yarn bundle && node_modules/.bin/tsc", "config:dev": "json -I -f package.json -e 'this.main=\"node_modules/expo/AppEntry.js\"'", "config:npm": "json -I -f package.json -e 'this.main=\"lib/index.js\"'", "lint": "tslint --project .", @@ -19,6 +19,9 @@ "postpublish": "yarn config:dev", "cleaning": "rm -rf node_modules && rm -f yarn.lock && yarn cache clean && yarn install && watchman watch-del-all && rm -fr $TMPDIR/react-*" }, + "resolutions": { + "@expo/cli": "0.3.3" + }, "keywords": [ "React-Native", "PDF", @@ -29,18 +32,6 @@ "react-pdf", "expo" ], - "repository": { - "type": "git", - "url": "git+https://github.com/Valli-/rn-pdf-reader-js.git" - }, - "peerDependencies": { - "expo": ">= 33.0.x ", - "expo-constants": ">= 5.0.0", - "expo-file-system": ">= 5.0.0 ", - "react": ">= 16.x", - "react-native": "*", - "react-native-webview": ">= 7.0.5" - }, "dependencies": { "buffer": "^6.0.3", "csstype": "^3.1.1", @@ -48,9 +39,9 @@ }, "devDependencies": { "@types/js-base64": "^3.3.1", - "@types/react": "~18.0.0", - "@types/react-dom": "~18.0.0", - "@types/react-native": "~0.69.1", + "@types/react": "18.0.0", + "@types/react-dom": "18.0.0", + "@types/react-native": "^0.72.2", "babel-preset-expo": "~9.2.0", "crypto": "^1.0.1", "expo": "^46.0.0", @@ -58,7 +49,7 @@ "expo-file-system": "~14.1.0", "json": "^11.0.0", "react": "18.0.0", - "react-native": "0.69.5", + "react-native": "0.69.9", "react-native-webview": "11.23.0", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", diff --git a/react-pdf/package.json b/react-pdf/package.json index 3b1335dcb..42ff99b7e 100755 --- a/react-pdf/package.json +++ b/react-pdf/package.json @@ -9,9 +9,9 @@ "dependencies": { "@babel/runtime": "7.7.7", "raf": "3.4.1", - "react": "16.12.0", - "react-dom": "16.12.0", - "react-pdf": "4.1.0" + "react": "18.0.0", + "react-dom": "18.0.0", + "react-pdf": "7.1.2" }, "devDependencies": { "@babel/core": "7.7.7", @@ -29,7 +29,6 @@ "@babel/preset-react": "7.7.4", "@babel/runtime-corejs2": "7.7.7", "@types/raf": "3.4.0", - "@types/react-pdf": "4.0.3", "babel-eslint": "10.0.3", "babel-loader": "8.0.6", "copy-webpack-plugin": "5.1.1", diff --git a/src/index.tsx b/src/index.tsx index b88e66809..35eeb2f38 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -81,8 +81,7 @@ function viewerHtml( PDF reader - @@ -101,8 +100,8 @@ function viewerHtml( @@ -100,8 +96,8 @@ function viewerHtml(