fix(detox): use improved xml generation (#47)

* fix xml generation generate xml without space or new line in the beginning * remove indentation * update snapshots to no indentation * add built file Co-authored-by: Maurice Döpke <mauricedoepkeoutlook.de>
expo · Mar 16, 2022 · 6324eb0 · 6324eb0
1 parent 480ec19
commit 6324eb0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/packages/detox/build/withNetworkSecurityConfig.js b/packages/detox/build/withNetworkSecurityConfig.js
diff --git a/packages/detox/src/__tests__/__snapshots__/withNetworkSecurityConfig-test.ts.snap b/packages/detox/src/__tests__/__snapshots__/withNetworkSecurityConfig-test.ts.snap
@@ -1,25 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`getTemplateFile returns domain-config when subdomains is an array 1`] = `
-"
-    <?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
-    <network-security-config>
-      
+"<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
+<network-security-config>
+
     <domain-config cleartextTrafficPermitted=\\"true\\">
       <domain includeSubdomains=\\"true\\">localhost</domain>
     </domain-config>
   
-    </network-security-config>
-  "
+</network-security-config>"
 `;
 
 exports[`getTemplateFile returns only base-config when subdomains is '*' 1`] = `
-"
-    <?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
-    <network-security-config>
-      <base-config cleartextTrafficPermitted=\\"true\\" />
-    </network-security-config>
-  "
+"<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
+<network-security-config>
+<base-config cleartextTrafficPermitted=\\"true\\" />
+</network-security-config>"
 `;
 
 exports[`withNetworkSecurityConfigManifest doesn't modify config if subdomains is an empty array 1`] = `

diff --git a/packages/detox/src/withNetworkSecurityConfig.ts b/packages/detox/src/withNetworkSecurityConfig.ts
@@ -29,12 +29,15 @@ function getTemplateConfigContent(subdomains: SubdomainsType) {
 
 export function getTemplateFile(subdomains: SubdomainsType): string {
   const content = getTemplateConfigContent(subdomains);
-  return `
-    <?xml version="1.0" encoding="utf-8"?>
-    <network-security-config>
-      ${content}
-    </network-security-config>
-  `;
+  /**
+   * May not have new lines or spaces in the beginning.
+   * Otherwise build fails with: 
+   * "AAPT: error: XML or text declaration not at start of entity"
+   */
+  return `<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+${content}
+</network-security-config>`;
 }
 
 /**