From df6814f292f56aa0f650af3d093ba1ca7f159726 Mon Sep 17 00:00:00 2001 From: xuatz Date: Wed, 20 Aug 2025 16:49:19 +0900 Subject: fix(mobile): remove type: module so expo works (#1846) --- apps/mobile/plugins/camera-not-required.cjs | 23 --------------- apps/mobile/plugins/camera-not-required.js | 23 +++++++++++++++ apps/mobile/plugins/trust-local-certs.cjs | 43 ----------------------------- apps/mobile/plugins/trust-local-certs.js | 43 +++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 apps/mobile/plugins/camera-not-required.cjs create mode 100644 apps/mobile/plugins/camera-not-required.js delete mode 100644 apps/mobile/plugins/trust-local-certs.cjs create mode 100644 apps/mobile/plugins/trust-local-certs.js (limited to 'apps/mobile/plugins') diff --git a/apps/mobile/plugins/camera-not-required.cjs b/apps/mobile/plugins/camera-not-required.cjs deleted file mode 100644 index 75116604..00000000 --- a/apps/mobile/plugins/camera-not-required.cjs +++ /dev/null @@ -1,23 +0,0 @@ -const { withAndroidManifest } = require("@expo/config-plugins"); - -const withCameraNotRequired = (config) => { - return withAndroidManifest(config, async (config) => { - config.modResults = await setCustomConfigAsync(config, config.modResults); - return config; - }); -}; - -async function setCustomConfigAsync(_config, androidManifest) { - const usesFeature = androidManifest.manifest["uses-feature"] ?? []; - usesFeature.push({ - $: { - "android:name": "android.hardware.camera", - "android:required": "false", - }, - }); - androidManifest.manifest["uses-feature"] = usesFeature; - - return androidManifest; -} - -module.exports = withCameraNotRequired; diff --git a/apps/mobile/plugins/camera-not-required.js b/apps/mobile/plugins/camera-not-required.js new file mode 100644 index 00000000..75116604 --- /dev/null +++ b/apps/mobile/plugins/camera-not-required.js @@ -0,0 +1,23 @@ +const { withAndroidManifest } = require("@expo/config-plugins"); + +const withCameraNotRequired = (config) => { + return withAndroidManifest(config, async (config) => { + config.modResults = await setCustomConfigAsync(config, config.modResults); + return config; + }); +}; + +async function setCustomConfigAsync(_config, androidManifest) { + const usesFeature = androidManifest.manifest["uses-feature"] ?? []; + usesFeature.push({ + $: { + "android:name": "android.hardware.camera", + "android:required": "false", + }, + }); + androidManifest.manifest["uses-feature"] = usesFeature; + + return androidManifest; +} + +module.exports = withCameraNotRequired; diff --git a/apps/mobile/plugins/trust-local-certs.cjs b/apps/mobile/plugins/trust-local-certs.cjs deleted file mode 100644 index 40275034..00000000 --- a/apps/mobile/plugins/trust-local-certs.cjs +++ /dev/null @@ -1,43 +0,0 @@ -const { AndroidConfig, withAndroidManifest } = require("@expo/config-plugins"); -const { Paths } = require("@expo/config-plugins/build/android"); -const path = require("path"); -const fs = require("fs"); -const fsPromises = fs.promises; - -const { getMainApplicationOrThrow } = AndroidConfig.Manifest; - -const withTrustLocalCerts = (config) => { - return withAndroidManifest(config, async (config) => { - config.modResults = await setCustomConfigAsync(config, config.modResults); - return config; - }); -}; - -async function setCustomConfigAsync(config, androidManifest) { - const src_file_pat = path.join(__dirname, "network_security_config.xml"); - const res_file_path = path.join( - await Paths.getResourceFolderAsync(config.modRequest.projectRoot), - "xml", - "network_security_config.xml", - ); - - const res_dir = path.resolve(res_file_path, ".."); - - if (!fs.existsSync(res_dir)) { - await fsPromises.mkdir(res_dir); - } - - try { - await fsPromises.copyFile(src_file_pat, res_file_path); - } catch (e) { - throw e; - } - - const mainApplication = getMainApplicationOrThrow(androidManifest); - mainApplication.$["android:networkSecurityConfig"] = - "@xml/network_security_config"; - - return androidManifest; -} - -module.exports = withTrustLocalCerts; diff --git a/apps/mobile/plugins/trust-local-certs.js b/apps/mobile/plugins/trust-local-certs.js new file mode 100644 index 00000000..40275034 --- /dev/null +++ b/apps/mobile/plugins/trust-local-certs.js @@ -0,0 +1,43 @@ +const { AndroidConfig, withAndroidManifest } = require("@expo/config-plugins"); +const { Paths } = require("@expo/config-plugins/build/android"); +const path = require("path"); +const fs = require("fs"); +const fsPromises = fs.promises; + +const { getMainApplicationOrThrow } = AndroidConfig.Manifest; + +const withTrustLocalCerts = (config) => { + return withAndroidManifest(config, async (config) => { + config.modResults = await setCustomConfigAsync(config, config.modResults); + return config; + }); +}; + +async function setCustomConfigAsync(config, androidManifest) { + const src_file_pat = path.join(__dirname, "network_security_config.xml"); + const res_file_path = path.join( + await Paths.getResourceFolderAsync(config.modRequest.projectRoot), + "xml", + "network_security_config.xml", + ); + + const res_dir = path.resolve(res_file_path, ".."); + + if (!fs.existsSync(res_dir)) { + await fsPromises.mkdir(res_dir); + } + + try { + await fsPromises.copyFile(src_file_pat, res_file_path); + } catch (e) { + throw e; + } + + const mainApplication = getMainApplicationOrThrow(androidManifest); + mainApplication.$["android:networkSecurityConfig"] = + "@xml/network_security_config"; + + return androidManifest; +} + +module.exports = withTrustLocalCerts; -- cgit v1.2.3-70-g09d2