diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json index 97017891fb..cc730db425 100644 --- a/packages/app-harness/package.json +++ b/packages/app-harness/package.json @@ -80,16 +80,8 @@ "rnv": "1.0.0-rc.12" }, "private": true, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } + "browserslist": [ + ">0.2%", + "op_mini all" + ] } diff --git a/packages/core/jsonSchema/rnv.app.json b/packages/core/jsonSchema/rnv.app.json index 85d14cdab5..1a98be58c5 100644 --- a/packages/core/jsonSchema/rnv.app.json +++ b/packages/core/jsonSchema/rnv.app.json @@ -1836,9 +1836,6 @@ "environment": { "type": "string" }, - "hostedShellHeaders": { - "type": "string" - }, "webpackConfig": { "type": "object", "properties": { @@ -1968,9 +1965,6 @@ "environment": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/webpackConfig" } @@ -2090,9 +2084,6 @@ "environment": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/webpackConfig" }, @@ -2203,9 +2194,6 @@ "environment": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/webpackConfig" }, @@ -2343,9 +2331,6 @@ "environment": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "buildSchemes": { "type": "object", "additionalProperties": { @@ -2464,9 +2449,6 @@ }, "environment": { "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/environment" - }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.app/properties/platforms/properties/tizen/properties/hostedShellHeaders" } }, "additionalProperties": false diff --git a/packages/core/jsonSchema/rnv.project.json b/packages/core/jsonSchema/rnv.project.json index 6798d6ec83..dfd0de0cd4 100644 --- a/packages/core/jsonSchema/rnv.project.json +++ b/packages/core/jsonSchema/rnv.project.json @@ -2191,9 +2191,6 @@ "environment": { "type": "string" }, - "hostedShellHeaders": { - "type": "string" - }, "webpackConfig": { "type": "object", "properties": { @@ -2323,9 +2320,6 @@ "environment": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/webpackConfig" } @@ -2445,9 +2439,6 @@ "environment": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/webpackConfig" }, @@ -2558,9 +2549,6 @@ "environment": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "webpackConfig": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/webpackConfig" }, @@ -2698,9 +2686,6 @@ "environment": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/environment" }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/hostedShellHeaders" - }, "buildSchemes": { "type": "object", "additionalProperties": { @@ -2819,9 +2804,6 @@ }, "environment": { "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/environment" - }, - "hostedShellHeaders": { - "$ref": "#/definitions/rnv.project/properties/platforms/properties/tizen/properties/hostedShellHeaders" } }, "additionalProperties": false diff --git a/packages/core/src/schema/platforms/fragments/web.ts b/packages/core/src/schema/platforms/fragments/web.ts index 9a2ac4bb95..f53068adb8 100644 --- a/packages/core/src/schema/platforms/fragments/web.ts +++ b/packages/core/src/schema/platforms/fragments/web.ts @@ -4,5 +4,4 @@ export const PlatformWebFragment = { timestampBuildFiles: z.array(z.string()).optional(), devServerHost: z.string().optional(), environment: z.string().optional(), - hostedShellHeaders: z.string().optional(), }; diff --git a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile index fdde550734..f221c517b1 100644 --- a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile +++ b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile @@ -52,6 +52,8 @@ target 'RNVApp-tvOS' do config = use_native_modules! platform :tvos, '{{INJECT_PLUGIN_DEPLOYMENT_TARGET}}' + {{INJECT_PLUGIN_PATHS}} + use_react_native!( :path => config[:reactNativePath], # Enables Flipper. @@ -79,6 +81,7 @@ post_install do |installer| config[:reactNativePath], :mac_catalyst_enabled => false ) + {{INJECT_POST_INSTALL}} end {{INJECT_PLUGIN_PODFILE_INJECT}} \ No newline at end of file diff --git a/packages/engine-rn-web/src/tasks/taskRun.ts b/packages/engine-rn-web/src/tasks/taskRun.ts index 08e3f0f1f8..43df971636 100644 --- a/packages/engine-rn-web/src/tasks/taskRun.ts +++ b/packages/engine-rn-web/src/tasks/taskRun.ts @@ -51,7 +51,6 @@ const _configureHostedIfRequired = async (c: RnvContext) => { logTask('_configureHostedIfRequired'); const bundleAssets = getConfigProp(c, c.platform, 'bundleAssets', false); - const hostedShellHeaders = getConfigProp(c, c.platform, 'hostedShellHeaders') || ''; if (!bundleAssets && !existBuildsOverrideForTargetPathSync(c, path.join(getPlatformProjectDir(c)!, 'index.html'))) { logDebug('Running hosted build'); @@ -66,10 +65,6 @@ const _configureHostedIfRequired = async (c: RnvContext) => { pattern: '{{DEV_SERVER}}', override: `http://${ipAddress}:${c.runtime.port}`, }, - { - pattern: '{{APPSHELL_HTML_HEADER}}', - override: String(hostedShellHeaders || ''), - }, ], undefined, c diff --git a/packages/engine-rn-web/templates/appShell/index.html b/packages/engine-rn-web/templates/appShell/index.html index ccfbba9066..588f833e69 100644 --- a/packages/engine-rn-web/templates/appShell/index.html +++ b/packages/engine-rn-web/templates/appShell/index.html @@ -1,34 +1,5 @@ - -
- -