Skip to content

Commit

Permalink
Merge branch 'main' into fix/enable-nav-gestures-ios
Browse files Browse the repository at this point in the history
  • Loading branch information
@MegaMaddin
MegaMaddin authored Sep 23, 2024
2 parents 15a9a55 + 912d532 commit 64fb6c4
Show file tree
Hide file tree
Showing 14 changed files with 902 additions and 144 deletions.
14 changes: 0 additions & 14 deletions cli/src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,17 +523,3 @@ const config: CapacitorConfig = ${formatJSObject(extConfig)};
export default config;\n`;
}

export function checkExternalConfig(config: ExtConfigPairs): void {
if (typeof config.extConfig.bundledWebRuntime !== 'undefined') {
let actionMessage = `Can be safely deleted.`;
if (config.extConfig.bundledWebRuntime === true) {
actionMessage = `Please, use a bundler to bundle Capacitor and its plugins.`;
}
logger.warn(
`The ${c.strong(
'bundledWebRuntime',
)} configuration option has been deprecated. ${actionMessage}`,
);
}
}
15 changes: 0 additions & 15 deletions cli/src/declarations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,6 @@ export interface CapacitorConfig {
*/
webDir?: string;

/**
* Whether to copy the Capacitor runtime bundle or not.
*
* If your app is not using a bundler, set this to `true`, then Capacitor
* will create a `capacitor.js` file that you'll need to add as a script in
* your `index.html` file.
*
* It's deprecated and will be removed in Capacitor 6
*
* @since 1.0.0
* @deprecated 5.0.0
* @default false
*/
bundledWebRuntime?: boolean;

/**
* The build configuration (as defined by the native app) under which Capacitor
* will send statements to the log system. This applies to log statements in
Expand Down
6 changes: 0 additions & 6 deletions cli/src/definitions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ export interface AppConfig {
readonly extConfigName: string;
readonly extConfigFilePath: string;
readonly extConfig: ExternalConfig;
/**
* Whether to use a bundled web runtime instead of relying on a bundler/module
* loader. If you're not using something like rollup or webpack or dynamic ES
* module imports, set this to "true" and import "capacitor.js" manually.
*/
readonly bundledWebRuntime?: boolean;
}

export interface AndroidConfig extends PlatformConfig {
Expand Down
8 changes: 1 addition & 7 deletions cli/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Option, program } from 'commander';
import { resolve } from 'path';

import c from './colors';
import { checkExternalConfig, loadConfig } from './config';
import { loadConfig } from './config';
import type { Config } from './definitions';
import { fatal, isFatal } from './errors';
import { receive } from './ipc';
Expand Down Expand Up @@ -96,7 +96,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async (platform, { deployment, inline }) => {
checkExternalConfig(config.app);
const { syncCommand } = await import('./tasks/sync');
await syncCommand(config, platform, deployment, inline);
}),
Expand All @@ -117,7 +116,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async (platform, { deployment }) => {
checkExternalConfig(config.app);
const { updateCommand } = await import('./tasks/update');
await updateCommand(config, platform, deployment);
}),
Expand All @@ -135,7 +133,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async (platform, { inline }) => {
checkExternalConfig(config.app);
const { copyCommand } = await import('./tasks/copy');
await copyCommand(config, platform, inline);
}),
Expand Down Expand Up @@ -283,7 +280,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async (platform, { packagemanager }) => {
checkExternalConfig(config.app);
const { addCommand } = await import('./tasks/add');

const configWritable: Writable<Config> = config as Writable<Config>;
Expand All @@ -307,7 +303,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async platform => {
checkExternalConfig(config.app);
const { listCommand } = await import('./tasks/list');
await listCommand(config, platform);
}),
Expand All @@ -320,7 +315,6 @@ export function runProgram(config: Config): void {
.action(
wrapAction(
telemetryAction(config, async platform => {
checkExternalConfig(config.app);
const { doctorCommand } = await import('./tasks/doctor');
await doctorCommand(config, platform);
}),
Expand Down
2 changes: 1 addition & 1 deletion cli/src/ios/build.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export async function buildiOS(
<plist version="1.0">
<dict>
<key>method</key>
<string>app-store</string>
<string>app-store-connect</string>
</dict>
</plist>`;

Expand Down
3 changes: 0 additions & 3 deletions cli/src/tasks/copy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { logger } from '../log';
import { getPlugins } from '../plugin';
import { generateIOSPackageJSON } from '../util/iosplugin';
import { allSerial } from '../util/promise';
import { copyWeb } from '../web/copy';

import { inlineSourceMaps } from './sourcemaps';

Expand Down Expand Up @@ -180,8 +179,6 @@ export async function copy(
logger.info(
'FederatedCapacitor Plugin installed, skipping web bundling...',
);
} else {
await copyWeb(config);
}
} else {
throw `Platform ${platformName} is not valid.`;
Expand Down
30 changes: 0 additions & 30 deletions cli/src/web/copy.ts
View file

This file was deleted.

16 changes: 16 additions & 0 deletions ios/Capacitor/Capacitor.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@
A71289EB27F380FD00DADDF3 /* RouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A71289EA27F380FD00DADDF3 /* RouterTests.swift */; };
A7187FD22BD1CB7D00093C45 /* CAPPluginMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7187FD12BD1CB7D00093C45 /* CAPPluginMethod.swift */; };
A76739792B98E09700795F7B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A76739782B98E09700795F7B /* PrivacyInfo.xcprivacy */; };
A771ADEE2C8B845000AF234D /* DateCodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A771ADED2C8B845000AF234D /* DateCodableTests.swift */; };
A771ADF12C8B909100AF234D /* URLCodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A771ADF02C8B909100AF234D /* URLCodableTests.swift */; };
A7BE62CC2B486A5400165ACB /* KeyValueStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BE62CB2B486A5400165ACB /* KeyValueStore.swift */; };
A7D474D52C8BA8E8005620A8 /* DataCodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D474D42C8BA8E8005620A8 /* DataCodableTests.swift */; };
A7D474D82C8BA8FD005620A8 /* NonconformingFloatCodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D474D72C8BA8FD005620A8 /* NonconformingFloatCodableTests.swift */; };
A7D8B3522B238A840003FAD6 /* JSValueEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D8B3512B238A840003FAD6 /* JSValueEncoder.swift */; };
A7D8B3632B263B8D0003FAD6 /* NestedCodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D8B3622B263B8D0003FAD6 /* NestedCodableTests.swift */; };
A7D8B3642B263B8D0003FAD6 /* Capacitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50503EDF1FC08594003606DC /* Capacitor.framework */; };
Expand Down Expand Up @@ -244,7 +248,11 @@
A71289EA27F380FD00DADDF3 /* RouterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterTests.swift; sourceTree = "<group>"; };
A7187FD12BD1CB7D00093C45 /* CAPPluginMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CAPPluginMethod.swift; sourceTree = "<group>"; };
A76739782B98E09700795F7B /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
A771ADED2C8B845000AF234D /* DateCodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateCodableTests.swift; sourceTree = "<group>"; };
A771ADF02C8B909100AF234D /* URLCodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLCodableTests.swift; sourceTree = "<group>"; };
A7BE62CB2B486A5400165ACB /* KeyValueStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyValueStore.swift; sourceTree = "<group>"; };
A7D474D42C8BA8E8005620A8 /* DataCodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataCodableTests.swift; sourceTree = "<group>"; };
A7D474D72C8BA8FD005620A8 /* NonconformingFloatCodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonconformingFloatCodableTests.swift; sourceTree = "<group>"; };
A7D8B3512B238A840003FAD6 /* JSValueEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSValueEncoder.swift; sourceTree = "<group>"; };
A7D8B3562B23B2110003FAD6 /* CodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableTests.swift; sourceTree = "<group>"; };
A7D8B3602B263B8D0003FAD6 /* CodableTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CodableTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -475,6 +483,10 @@
A7D8B3622B263B8D0003FAD6 /* NestedCodableTests.swift */,
A7D8B3562B23B2110003FAD6 /* CodableTests.swift */,
A7D8B36D2B2692300003FAD6 /* SuperCodableTests.swift */,
A771ADED2C8B845000AF234D /* DateCodableTests.swift */,
A771ADF02C8B909100AF234D /* URLCodableTests.swift */,
A7D474D42C8BA8E8005620A8 /* DataCodableTests.swift */,
A7D474D72C8BA8FD005620A8 /* NonconformingFloatCodableTests.swift */,
);
path = CodableTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -779,9 +791,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A771ADEE2C8B845000AF234D /* DateCodableTests.swift in Sources */,
A7D8B3632B263B8D0003FAD6 /* NestedCodableTests.swift in Sources */,
A7D474D52C8BA8E8005620A8 /* DataCodableTests.swift in Sources */,
A7D8B36A2B263B990003FAD6 /* CodableTests.swift in Sources */,
A7D8B36E2B2692300003FAD6 /* SuperCodableTests.swift in Sources */,
A7D474D82C8BA8FD005620A8 /* NonconformingFloatCodableTests.swift in Sources */,
A771ADF12C8B909100AF234D /* URLCodableTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading

0 comments on commit 64fb6c4

Please sign in to comment.