From 4fed24a47c61faac7cf741e4e8977b18a9113a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Tue, 20 Jul 2021 12:21:46 -0400 Subject: [PATCH] OPS: Update Windows files --- ios/BlueWallet.xcodeproj/project.pbxproj | 14 +- metro.config.js | 36 ++-- package-lock.json | 2 +- package.json | 5 +- windows/ExperimentalFeatures.props | 24 +++ windows/NuGet.Config | 14 ++ windows/bluewallet.sln | 158 +++--------------- windows/bluewallet/App.cpp | 23 ++- windows/bluewallet/App.h | 1 + .../bluewallet/AutolinkedNativeModules.g.cpp | 26 +-- .../AutolinkedNativeModules.g.props | 2 +- .../AutolinkedNativeModules.g.targets | 20 --- windows/bluewallet/Package.appxmanifest | 4 +- windows/bluewallet/bluewallet.vcxproj | 13 +- windows/bluewallet/packages.config | 2 +- windows/bluewallet/pch.h | 3 +- 16 files changed, 125 insertions(+), 222 deletions(-) create mode 100644 windows/ExperimentalFeatures.props create mode 100644 windows/NuGet.Config diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index e60d6230c..d718cdd5c 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -50,7 +50,7 @@ 6DD410BF266CB13D0087DE03 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4BFA254FBA0E00E9F9AA /* Models.swift */; }; 6DD410C0266CB1460087DE03 /* MarketWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9946622555A660000E52E8 /* MarketWidget.swift */; }; 6DF25A9F249DB97E001D06F5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DF25A9E249DB97E001D06F5 /* LaunchScreen.storyboard */; }; - 6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* EFQRCode */; }; + 6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */; }; 6DFC807224EA2FA9007B8700 /* ViewQRCodefaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFC807124EA2FA9007B8700 /* ViewQRCodefaceController.swift */; }; 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B468CC34D5B41F3950078EF /* libsqlite3.0.tbd */; }; 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9D9B3A7B2CB4255876B67AF /* libz.tbd */; }; @@ -397,7 +397,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */, + 6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -837,7 +837,7 @@ ); name = "BlueWalletWatch Extension"; packageProductDependencies = ( - 6DFC806F24EA0B6C007B8700 /* EFQRCode */, + 6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */, ); productName = "BlueWalletWatch Extension"; productReference = B40D4E3C225841ED00428FCC /* BlueWalletWatch Extension.appex */; @@ -921,7 +921,7 @@ ); mainGroup = 83CBB9F61A601CBA00E9B192; packageReferences = ( - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */, + 6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */, ); productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; @@ -1960,7 +1960,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */ = { + 6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/EFPrefix/EFQRCode.git"; requirement = { @@ -1971,9 +1971,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 6DFC806F24EA0B6C007B8700 /* EFQRCode */ = { + 6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */ = { isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; + package = 6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */; productName = EFQRCode; }; /* End XCSwiftPackageProductDependency section */ diff --git a/metro.config.js b/metro.config.js index 2b544f130..fd816dfa8 100644 --- a/metro.config.js +++ b/metro.config.js @@ -4,26 +4,26 @@ * * @format */ - -// const path = require('path'); -// const blacklist = require('metro-config/src/defaults/blacklist'); +const path = require('path'); +const exclusionList = require('metro-config/src/defaults/exclusionList'); module.exports = { resolver: { - // blacklistRE: blacklist([ - // // This stops "react-native run-windows" from causing the metro server to crash if its already running - // new RegExp(`${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`), - // // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip - // /.*\.ProjectImports\.zip/, - // ]), - // }, - transformer: { - getTransformOptions: async () => ({ - transform: { - experimentalImportSupport: false, - inlineRequires: false, - }, - }), - }, + blockList: exclusionList([ + // This stops "react-native run-windows" from causing the metro server to crash if its already running + new RegExp( + `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`, + ), + // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip + /.*\.ProjectImports\.zip/, + ]), + }, + transformer: { + getTransformOptions: async () => ({ + transform: { + experimentalImportSupport: false, + inlineRequires: true, + }, + }), }, }; diff --git a/package-lock.json b/package-lock.json index 01816bf39..3dc1c95f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19223,7 +19223,7 @@ } }, "scryptsy": { - "version": "file:blue_modules/scryptsy", + "version": "file:https:/registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==" }, "secp256k1": { diff --git a/package.json b/package.json index 02e328d0c..cc995dc87 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,8 @@ "lint": "eslint *.js screen/**/*.js blue_modules/*.js class/**/*.js models/ loc/ tests/**/*.js components/**/*.js components/*.js", "lint:fix": "npm run lint -- --fix", "lint:quickfix": "git status --porcelain | grep -v '\\.json' | grep '\\.js' --color=never | awk '{print $2}' | xargs eslint --fix; exit 0", - "unit": "jest tests/unit/*" + "unit": "jest tests/unit/*", + "windows": "react-native run-windows" }, "jest": { "preset": "react-native", @@ -169,7 +170,7 @@ "react-native-watch-connectivity": "1.0.3", "react-native-webview": "11.6.4", "react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#e2e9a9038b76d096bf929a87105a97a0a7095001", - "react-native-windows": "0.64.14", + "react-native-windows": "^0.64.0-0", "react-test-render": "1.1.2", "readable-stream": "3.6.0", "realm": "10.6.0", diff --git a/windows/ExperimentalFeatures.props b/windows/ExperimentalFeatures.props new file mode 100644 index 000000000..80f79c850 --- /dev/null +++ b/windows/ExperimentalFeatures.props @@ -0,0 +1,24 @@ + + + + + + + false + + + false + + + + \ No newline at end of file diff --git a/windows/NuGet.Config b/windows/NuGet.Config new file mode 100644 index 000000000..e2dd3c1ef --- /dev/null +++ b/windows/NuGet.Config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/windows/bluewallet.sln b/windows/bluewallet.sln index f4d41da78..d6c68bc96 100644 --- a/windows/bluewallet.sln +++ b/windows/bluewallet.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bluewallet", "bluewallet\bluewallet.vcxproj", "{3B23E606-7EFC-44B4-818B-41A6525E4C9E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bluewallet", "bluewallet\bluewallet.vcxproj", "{9A7ACA3E-5742-401A-B142-14184B1E685C}" ProjectSection(ProjectDependencies) = postProject {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} EndProjectSection @@ -35,18 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\reac EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeAsyncStorage", "../node_modules/@react-native-async-storage/async-storage/windows/ReactNativeAsyncStorage/ReactNativeAsyncStorage.vcxproj", "{4855D892-E16C-404D-8286-0089E0F7F9C4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeCameraCPP", "../node_modules/react-native-camera/windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj", "{7432C343-CC07-4BC7-9BD0-8C467BE0F018}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNDeviceInfoCPP", "../node_modules/react-native-device-info/windows/RNDeviceInfoCPP/RNDeviceInfoCPP.vcxproj", "{3E3931F2-4735-4417-8CB0-33668A7314D6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNLocalize", "../node_modules/react-native-localize/windows/RNLocalize/RNLocalize.vcxproj", "{10E2379C-4264-444A-8656-B3D7E83ACB44}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeWebView", "../node_modules/react-native-webview/windows/ReactNativeWebView/ReactNativeWebView.vcxproj", "{729D9AF8-CD9E-4427-9F6C-FB757E287729}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebViewBridgeComponent", "../node_modules/react-native-webview/windows/WebViewBridgeComponent/WebViewBridgeComponent.vcxproj", "{FCB612AD-FACC-410C-828C-24B5940B2762}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -72,30 +60,30 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM.ActiveCfg = Debug|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM.Build.0 = Debug|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM.Deploy.0 = Debug|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM64.Build.0 = Debug|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x64.ActiveCfg = Debug|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x64.Build.0 = Debug|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x64.Deploy.0 = Debug|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x86.ActiveCfg = Debug|Win32 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x86.Build.0 = Debug|Win32 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Debug|x86.Deploy.0 = Debug|Win32 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM.ActiveCfg = Release|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM.Build.0 = Release|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM.Deploy.0 = Release|ARM - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM64.ActiveCfg = Release|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM64.Build.0 = Release|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|ARM64.Deploy.0 = Release|ARM64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x64.ActiveCfg = Release|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x64.Build.0 = Release|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x64.Deploy.0 = Release|x64 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x86.ActiveCfg = Release|Win32 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x86.Build.0 = Release|Win32 - {3B23E606-7EFC-44B4-818B-41A6525E4C9E}.Release|x86.Deploy.0 = Release|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM.ActiveCfg = Debug|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM.Build.0 = Debug|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM.Deploy.0 = Debug|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM64.Build.0 = Debug|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x64.ActiveCfg = Debug|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x64.Build.0 = Debug|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x64.Deploy.0 = Debug|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x86.ActiveCfg = Debug|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x86.Build.0 = Debug|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Debug|x86.Deploy.0 = Debug|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM.ActiveCfg = Release|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM.Build.0 = Release|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM.Deploy.0 = Release|ARM + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM64.ActiveCfg = Release|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM64.Build.0 = Release|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|ARM64.Deploy.0 = Release|ARM64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x64.ActiveCfg = Release|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x64.Build.0 = Release|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x64.Deploy.0 = Release|x64 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x86.ActiveCfg = Release|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x86.Build.0 = Release|Win32 + {9A7ACA3E-5742-401A-B142-14184B1E685C}.Release|x86.Deploy.0 = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -176,102 +164,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|ARM.ActiveCfg = Debug|ARM - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|ARM.Build.0 = Debug|ARM - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|ARM64.Build.0 = Debug|ARM64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|x64.ActiveCfg = Debug|x64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|x64.Build.0 = Debug|x64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|x86.ActiveCfg = Debug|Win32 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Debug|x86.Build.0 = Debug|Win32 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|ARM.ActiveCfg = Release|ARM - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|ARM.Build.0 = Release|ARM - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|ARM64.ActiveCfg = Release|ARM64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|ARM64.Build.0 = Release|ARM64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|x64.ActiveCfg = Release|x64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|x64.Build.0 = Release|x64 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|x86.ActiveCfg = Release|Win32 - {4855D892-E16C-404D-8286-0089E0F7F9C4}.Release|x86.Build.0 = Release|Win32 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|ARM.ActiveCfg = Debug|ARM - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|ARM.Build.0 = Debug|ARM - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|ARM64.Build.0 = Debug|ARM64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|x64.ActiveCfg = Debug|x64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|x64.Build.0 = Debug|x64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|x86.ActiveCfg = Debug|Win32 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Debug|x86.Build.0 = Debug|Win32 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|ARM.ActiveCfg = Release|ARM - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|ARM.Build.0 = Release|ARM - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|ARM64.ActiveCfg = Release|ARM64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|ARM64.Build.0 = Release|ARM64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|x64.ActiveCfg = Release|x64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|x64.Build.0 = Release|x64 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|x86.ActiveCfg = Release|Win32 - {7432C343-CC07-4BC7-9BD0-8C467BE0F018}.Release|x86.Build.0 = Release|Win32 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|ARM.ActiveCfg = Debug|ARM - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|ARM.Build.0 = Debug|ARM - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|ARM64.Build.0 = Debug|ARM64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|x64.ActiveCfg = Debug|x64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|x64.Build.0 = Debug|x64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|x86.ActiveCfg = Debug|Win32 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Debug|x86.Build.0 = Debug|Win32 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|ARM.ActiveCfg = Release|ARM - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|ARM.Build.0 = Release|ARM - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|ARM64.ActiveCfg = Release|ARM64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|ARM64.Build.0 = Release|ARM64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|x64.ActiveCfg = Release|x64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|x64.Build.0 = Release|x64 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|x86.ActiveCfg = Release|Win32 - {3E3931F2-4735-4417-8CB0-33668A7314D6}.Release|x86.Build.0 = Release|Win32 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|ARM.ActiveCfg = Debug|ARM - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|ARM.Build.0 = Debug|ARM - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|ARM64.Build.0 = Debug|ARM64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|x64.ActiveCfg = Debug|x64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|x64.Build.0 = Debug|x64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|x86.ActiveCfg = Debug|Win32 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Debug|x86.Build.0 = Debug|Win32 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|ARM.ActiveCfg = Release|ARM - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|ARM.Build.0 = Release|ARM - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|ARM64.ActiveCfg = Release|ARM64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|ARM64.Build.0 = Release|ARM64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|x64.ActiveCfg = Release|x64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|x64.Build.0 = Release|x64 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|x86.ActiveCfg = Release|Win32 - {10E2379C-4264-444A-8656-B3D7E83ACB44}.Release|x86.Build.0 = Release|Win32 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|ARM.ActiveCfg = Debug|ARM - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|ARM.Build.0 = Debug|ARM - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|ARM64.Build.0 = Debug|ARM64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|x64.ActiveCfg = Debug|x64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|x64.Build.0 = Debug|x64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|x86.ActiveCfg = Debug|Win32 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Debug|x86.Build.0 = Debug|Win32 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|ARM.ActiveCfg = Release|ARM - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|ARM.Build.0 = Release|ARM - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|ARM64.ActiveCfg = Release|ARM64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|ARM64.Build.0 = Release|ARM64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|x64.ActiveCfg = Release|x64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|x64.Build.0 = Release|x64 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|x86.ActiveCfg = Release|Win32 - {729D9AF8-CD9E-4427-9F6C-FB757E287729}.Release|x86.Build.0 = Release|Win32 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|ARM.ActiveCfg = Debug|ARM - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|ARM.Build.0 = Debug|ARM - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|ARM64.Build.0 = Debug|ARM64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|x64.ActiveCfg = Debug|x64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|x64.Build.0 = Debug|x64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|x86.ActiveCfg = Debug|Win32 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Debug|x86.Build.0 = Debug|Win32 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|ARM.ActiveCfg = Release|ARM - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|ARM.Build.0 = Release|ARM - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|ARM64.ActiveCfg = Release|ARM64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|ARM64.Build.0 = Release|ARM64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|x64.ActiveCfg = Release|x64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|x64.Build.0 = Release|x64 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|x86.ActiveCfg = Release|Win32 - {FCB612AD-FACC-410C-828C-24B5940B2762}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/bluewallet/App.cpp b/windows/bluewallet/App.cpp index 5fa7a87b1..0dea145c4 100644 --- a/windows/bluewallet/App.cpp +++ b/windows/bluewallet/App.cpp @@ -5,14 +5,13 @@ #include "AutolinkedNativeModules.g.h" #include "ReactPackageProvider.h" -using namespace winrt::bluewallet; -using namespace winrt::bluewallet::implementation; using namespace winrt; using namespace Windows::UI::Xaml; using namespace Windows::UI::Xaml::Controls; using namespace Windows::UI::Xaml::Navigation; using namespace Windows::ApplicationModel; - +namespace winrt::bluewallet::implementation +{ /// /// Initializes the singleton application object. This is the first line of /// authored code executed, and as such is the logical equivalent of main() or @@ -25,7 +24,7 @@ App::App() noexcept InstanceSettings().UseWebDebugger(false); InstanceSettings().UseFastRefresh(false); #else - JavaScriptMainModuleName(L"index"); + JavaScriptBundleFile(L"index"); InstanceSettings().UseWebDebugger(true); InstanceSettings().UseFastRefresh(true); #endif @@ -53,7 +52,19 @@ void App::OnLaunched(activation::LaunchActivatedEventArgs const& e) super::OnLaunched(e); Frame rootFrame = Window::Current().Content().as(); - rootFrame.Navigate(xaml_typename(), box_value(e.Arguments())); + rootFrame.Navigate(xaml_typename(), box_value(e.Arguments())); +} + +/// +/// Invoked when the application is activated by some means other than normal launching. +/// +void App::OnActivated(Activation::IActivatedEventArgs const &e) { + auto preActivationContent = Window::Current().Content(); + super::OnActivated(e); + if (!preActivationContent && Window::Current()) { + Frame rootFrame = Window::Current().Content().as(); + rootFrame.Navigate(xaml_typename(), nullptr); + } } /// @@ -77,3 +88,5 @@ void App::OnNavigationFailed(IInspectable const&, NavigationFailedEventArgs cons { throw hresult_error(E_FAIL, hstring(L"Failed to load Page ") + e.SourcePageType().Name); } + +} // namespace winrt::bluewallet::implementation diff --git a/windows/bluewallet/App.h b/windows/bluewallet/App.h index 820f7d6d5..9d4363be5 100644 --- a/windows/bluewallet/App.h +++ b/windows/bluewallet/App.h @@ -10,6 +10,7 @@ namespace winrt::bluewallet::implementation { App() noexcept; void OnLaunched(activation::LaunchActivatedEventArgs const&); + void OnActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs const &e); void OnSuspending(IInspectable const&, Windows::ApplicationModel::SuspendingEventArgs const&); void OnNavigationFailed(IInspectable const&, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs const&); private: diff --git a/windows/bluewallet/AutolinkedNativeModules.g.cpp b/windows/bluewallet/AutolinkedNativeModules.g.cpp index 9144cec6e..13e9d0b78 100644 --- a/windows/bluewallet/AutolinkedNativeModules.g.cpp +++ b/windows/bluewallet/AutolinkedNativeModules.g.cpp @@ -3,36 +3,12 @@ #include "pch.h" #include "AutolinkedNativeModules.g.h" -// Includes from @react-native-async-storage/async-storage -#include - -// Includes from react-native-camera -#include - -// Includes from react-native-device-info -#include - -// Includes from react-native-localize -#include - -// Includes from react-native-webview -#include - namespace winrt::Microsoft::ReactNative { void RegisterAutolinkedNativeModulePackages(winrt::Windows::Foundation::Collections::IVector const& packageProviders) { - // IReactPackageProviders from @react-native-async-storage/async-storage - packageProviders.Append(winrt::ReactNativeAsyncStorage::ReactPackageProvider()); - // IReactPackageProviders from react-native-camera - packageProviders.Append(winrt::ReactNativeCameraCPP::ReactPackageProvider()); - // IReactPackageProviders from react-native-device-info - packageProviders.Append(winrt::RNDeviceInfoCPP::ReactPackageProvider()); - // IReactPackageProviders from react-native-localize - packageProviders.Append(winrt::RNLocalize::ReactPackageProvider()); - // IReactPackageProviders from react-native-webview - packageProviders.Append(winrt::ReactNativeWebView::ReactPackageProvider()); + UNREFERENCED_PARAMETER(packageProviders); } } diff --git a/windows/bluewallet/AutolinkedNativeModules.g.props b/windows/bluewallet/AutolinkedNativeModules.g.props index 37e6f4b3f..61432e35c 100644 --- a/windows/bluewallet/AutolinkedNativeModules.g.props +++ b/windows/bluewallet/AutolinkedNativeModules.g.props @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/windows/bluewallet/AutolinkedNativeModules.g.targets b/windows/bluewallet/AutolinkedNativeModules.g.targets index c702dd22b..2d63489cd 100644 --- a/windows/bluewallet/AutolinkedNativeModules.g.targets +++ b/windows/bluewallet/AutolinkedNativeModules.g.targets @@ -2,25 +2,5 @@ - - - {4855D892-E16C-404D-8286-0089E0F7F9C4} - - - - {7432c343-cc07-4bc7-9bd0-8c467be0f018} - - - - {3e3931f2-4735-4417-8cb0-33668a7314d6} - - - - {10e2379c-4264-444a-8656-b3d7e83acb44} - - - - {729d9af8-cd9e-4427-9f6c-fb757e287729} - diff --git a/windows/bluewallet/Package.appxmanifest b/windows/bluewallet/Package.appxmanifest index 8f64cd6da..5ecf33897 100644 --- a/windows/bluewallet/Package.appxmanifest +++ b/windows/bluewallet/Package.appxmanifest @@ -7,11 +7,11 @@ IgnorableNamespaces="uap mp"> - + bluewallet diff --git a/windows/bluewallet/bluewallet.vcxproj b/windows/bluewallet/bluewallet.vcxproj index 56b18c11d..34b264db7 100644 --- a/windows/bluewallet/bluewallet.vcxproj +++ b/windows/bluewallet/bluewallet.vcxproj @@ -1,11 +1,12 @@ - + + true true true - {3b23e606-7efc-44b4-818b-41a6525e4c9e} + {9a7aca3e-5742-401a-b142-14184b1e685c} bluewallet bluewallet en-US @@ -175,21 +176,21 @@ - This project references targets in your node_modules\react-native-windows folder. The missing file is {0}. + This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + diff --git a/windows/bluewallet/packages.config b/windows/bluewallet/packages.config index 4e25d99d5..8973d9697 100644 --- a/windows/bluewallet/packages.config +++ b/windows/bluewallet/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/windows/bluewallet/pch.h b/windows/bluewallet/pch.h index f82c2aa2d..5b6892b28 100644 --- a/windows/bluewallet/pch.h +++ b/windows/bluewallet/pch.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #define NOMINMAX @@ -24,3 +24,4 @@ #include #include #include +using namespace winrt::Windows::Foundation;