From d9014615f0a146733fbf7d494d0d201068817086 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 7 Jul 2022 13:08:52 -0500 Subject: [PATCH] fix(mobile): component viewer in mobile web --- packages/mobile/.gitignore | 1 + packages/mobile/MobileWebAppContainer.tsx | 1 + packages/mobile/html/Web.bundle/src/index.html | 6 +++--- packages/mobile/package.json | 2 +- .../lib/Services/ComponentManager/ComponentManager.spec.ts | 2 +- .../snjs/lib/Services/ComponentManager/ComponentManager.ts | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/mobile/.gitignore b/packages/mobile/.gitignore index 8d6147670..ab6d3eeee 100644 --- a/packages/mobile/.gitignore +++ b/packages/mobile/.gitignore @@ -52,6 +52,7 @@ app-release.aab *.bundle !Web.bundle html/Web.bundle/src/web-src +html/Web.bundle/src/components ios-release.bundle.map # fastlane diff --git a/packages/mobile/MobileWebAppContainer.tsx b/packages/mobile/MobileWebAppContainer.tsx index f5e03251c..cf08b5cbb 100644 --- a/packages/mobile/MobileWebAppContainer.tsx +++ b/packages/mobile/MobileWebAppContainer.tsx @@ -127,6 +127,7 @@ export const MobileWebAppContainer = () => { onHttpError={() => console.error('An HTTP error occurred')} onMessage={onMessage} allowFileAccess={true} + allowUniversalAccessFromFileURLs={true} injectedJavaScript={injectedJS} /> ) diff --git a/packages/mobile/html/Web.bundle/src/index.html b/packages/mobile/html/Web.bundle/src/index.html index 89ed8f450..a149179bb 100644 --- a/packages/mobile/html/Web.bundle/src/index.html +++ b/packages/mobile/html/Web.bundle/src/index.html @@ -6,9 +6,6 @@ - - - + + + \ No newline at end of file diff --git a/packages/mobile/package.json b/packages/mobile/package.json index bcc18cd17..5e0479f18 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -22,7 +22,7 @@ "start": "react-native start", "tsc": "tsc --noEmit", "upgrade:snjs": "ncu -u '@standardnotes/*'", - "web:bundle": "mkdir -p html/Web.bundle/src/web-src/ && cp -r ../web/dist/. html/Web.bundle/src/web-src/" + "web:bundle": "mkdir -p html/Web.bundle/src/web-src/ && cp -r ../web/dist/. html/Web.bundle/src/web-src/ && mkdir -p html/Web.bundle/src/components/assets && cp -r ../components/dist/assets/. html/Web.bundle/src/components/assets/" }, "installConfig": { "hoistingLimits": "workspaces" diff --git a/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts b/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts index faf597bf4..93070a3c7 100644 --- a/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts +++ b/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts @@ -292,7 +292,7 @@ describe('featuresService', () => { const component = nativeComponent() const url = manager.urlForComponent(component) const feature = FindNativeFeature(component.identifier) as FeatureDescription - expect(url).toEqual(`http://localhost/components/assets/${component.identifier}/${feature.index_path}`) + expect(url).toEqual(`components/assets/${component.identifier}/${feature.index_path}`) }) it('returns hosted path for third party component', () => { diff --git a/packages/snjs/lib/Services/ComponentManager/ComponentManager.ts b/packages/snjs/lib/Services/ComponentManager/ComponentManager.ts index acf6bf2b4..d687c7dd0 100644 --- a/packages/snjs/lib/Services/ComponentManager/ComponentManager.ts +++ b/packages/snjs/lib/Services/ComponentManager/ComponentManager.ts @@ -285,7 +285,7 @@ export class SNComponentManager extends AbstractService