diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c66245e24..e994b3d4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - **android:** correctly parsing `server.url` when they include paths ([#8391](https://github.com/ionic-team/capacitor/issues/8391)) ([a9f2181](https://github.com/ionic-team/capacitor/commit/a9f218179b60555d86b44bf2b33354da3e64e98c)) - **cli:** inline CSS sourcemaps in addition to JS sourcemaps ([#8377](https://github.com/ionic-team/capacitor/issues/8377)) ([69476ab](https://github.com/ionic-team/capacitor/commit/69476ab9c0b47911a14d2482cab53a877a5ae784)) - **http:** handle URL objects on fetch ([#8386](https://github.com/ionic-team/capacitor/issues/8386)) ([003099a](https://github.com/ionic-team/capacitor/commit/003099aef246adfd76d890074d46b1484951824b)) -- **ios:** make getArray accesible on Objective-C plugins ([#8392](https://github.com/ionic-team/capacitor/issues/8392)) ([afb80f2](https://github.com/ionic-team/capacitor/commit/afb80f2fecb4bf85dbebe25e815de2a5564264d6)) +- **ios:** make getArray accessible on Objective-C plugins ([#8392](https://github.com/ionic-team/capacitor/issues/8392)) ([afb80f2](https://github.com/ionic-team/capacitor/commit/afb80f2fecb4bf85dbebe25e815de2a5564264d6)) - **SystemBars:** use native safe area insets on Android ([#8384](https://github.com/ionic-team/capacitor/issues/8384)) ([4e99598](https://github.com/ionic-team/capacitor/commit/4e99598a2a57ee97e82be1aaa09492744622fa60)) ### Features @@ -238,7 +238,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -- **android-template:** prevent app restart on bluetooh keyboard changes ([#7652](https://github.com/ionic-team/capacitor/issues/7652)) ([200c7cb](https://github.com/ionic-team/capacitor/commit/200c7cb911898fbfb12b0b25e8cfd1982e0a6bf0)) +- **android-template:** prevent app restart on bluetooth keyboard changes ([#7652](https://github.com/ionic-team/capacitor/issues/7652)) ([200c7cb](https://github.com/ionic-team/capacitor/commit/200c7cb911898fbfb12b0b25e8cfd1982e0a6bf0)) - **cli:** replace app-store deprecated method on build ([#7637](https://github.com/ionic-team/capacitor/issues/7637)) ([942b108](https://github.com/ionic-team/capacitor/commit/942b108c1d506539c0c53276ed4ec35eed36634e)) - **ios:** fix retain cycle caused by CDVPluginManager ([#7692](https://github.com/ionic-team/capacitor/issues/7692)) ([02bdb3d](https://github.com/ionic-team/capacitor/commit/02bdb3d1d15907dcc577f16b7f2e22050e54ffef)) @@ -831,7 +831,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - **android:** Use addWebMessageListener where available ([#5427](https://github.com/ionic-team/capacitor/issues/5427)) ([c2dfe80](https://github.com/ionic-team/capacitor/commit/c2dfe808446717412b35e82713d123b7a052f264)) - **android-template:** Use Android 12 splash API ([#5777](https://github.com/ionic-team/capacitor/issues/5777)) ([f3ab951](https://github.com/ionic-team/capacitor/commit/f3ab9519e1f08d5dfeb2db61b6939725be92b4f3)) - **cli:** add migrator for cap3 to cap4 ([#5762](https://github.com/ionic-team/capacitor/issues/5762)) ([7cb660a](https://github.com/ionic-team/capacitor/commit/7cb660a34d9a87274761d4492d0d77c9ef44ace8)) -- **ios:** Add overrideable router var for CAPWebView. ([#5743](https://github.com/ionic-team/capacitor/issues/5743)) ([c1de1c0](https://github.com/ionic-team/capacitor/commit/c1de1c0138aad188a760118e35983d10d257f8e7)) +- **ios:** Add overridable router var for CAPWebView. ([#5743](https://github.com/ionic-team/capacitor/issues/5743)) ([c1de1c0](https://github.com/ionic-team/capacitor/commit/c1de1c0138aad188a760118e35983d10d257f8e7)) - **iOS:** post install script for deployment target ([#5783](https://github.com/ionic-team/capacitor/issues/5783)) ([f5afa94](https://github.com/ionic-team/capacitor/commit/f5afa94b3b9c246d87b2af03359840f503bace90)) - Add option for custom error page ([#5723](https://github.com/ionic-team/capacitor/issues/5723)) ([e8bdef3](https://github.com/ionic-team/capacitor/commit/e8bdef3b4634e4ad45fa8fc34c7c0ab8dfa383f3)) @@ -927,7 +927,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - **android:** Add overridable routing for WebViewLocalServer ([#5553](https://github.com/ionic-team/capacitor/issues/5553)) ([3bb288e](https://github.com/ionic-team/capacitor/commit/3bb288e848c5c0e49c1e58c0782e0b1ffd7b1f31)) - **cli:** support capacitor portals plugin changes needed ([#5558](https://github.com/ionic-team/capacitor/issues/5558)) ([6810a19](https://github.com/ionic-team/capacitor/commit/6810a19ae2bbda1f4b2afad61d37ca822ca157f5)) -- **ios:** Add overrideable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa)) +- **ios:** Add overridable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa)) # [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25) diff --git a/android/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java b/android/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java index 1115429d7b..5022948433 100644 --- a/android/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java +++ b/android/capacitor/src/main/java/com/getcapacitor/cordova/MockCordovaWebViewImpl.java @@ -182,8 +182,8 @@ public void handleDestroy() { @Deprecated @Override - public void sendJavascript(String statememt) { - nativeToJsMessageQueue.addJavaScript(statememt); + public void sendJavascript(String statement) { + nativeToJsMessageQueue.addJavaScript(statement); } public void eval(final String js, final ValueCallback callback) { diff --git a/cli/src/declarations.ts b/cli/src/declarations.ts index 6c8645406d..d798cd90cc 100644 --- a/cli/src/declarations.ts +++ b/cli/src/declarations.ts @@ -597,7 +597,7 @@ export interface CapacitorConfig { * Configure the local scheme on Android. * * Custom schemes on Android are unable to change the URL path as of Webview 117. Changing this value from anything other than `http` or `https` can result in your - * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarentees that this + * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarantees that this * will continue to work long term as allowing non-standard schemes to modify query parameters and url fragments is only allowed for compatibility reasons. * https://ionic.io/blog/capacitor-android-customscheme-issue-with-chrome-117 * diff --git a/cli/src/definitions.ts b/cli/src/definitions.ts index 2df6398e97..cc0aa46a38 100644 --- a/cli/src/definitions.ts +++ b/cli/src/definitions.ts @@ -158,7 +158,7 @@ export interface FrameworkConfig { /** * Specific UI libraries (Ionic) and higher-level frameworks (NextJs/Gatsby) * should be prioritorized over a more generic framework like React/Angular/Vue. - * Lower the priorty number the more important it is (1 has more priority over 2). + * Lower the priority number the more important it is (1 has more priority over 2). * This helps to make sure a specific framework like "NextJs" is chosen before * the more generic "React". */ diff --git a/cli/src/ios/doctor.ts b/cli/src/ios/doctor.ts index 87bb3911f5..22f4e93e9c 100644 --- a/cli/src/ios/doctor.ts +++ b/cli/src/ios/doctor.ts @@ -16,7 +16,7 @@ export async function doctorIOS(config: Config): Promise { // check plugins versions // check native project deps are up-to-date === npm install // check if npm install was updated - // check online datebase of common errors + // check online database of common errors // check if www folder is empty (index.html does not exist) try { await check([() => checkWebDir(config), checkXcode, ...(await getCommonChecks(config))]); diff --git a/cli/src/sysconfig.ts b/cli/src/sysconfig.ts index 487095404b..6619e51e85 100644 --- a/cli/src/sysconfig.ts +++ b/cli/src/sysconfig.ts @@ -24,7 +24,7 @@ export interface SystemConfig { readonly telemetry?: boolean; /** - * Wheter the user choose to signup or not. + * Whether the user choose to signup or not. * * If undefined, the prompt has not been shown. */ diff --git a/cli/src/util/emoji.ts b/cli/src/util/emoji.ts index f86b7166b6..9791dad0aa 100644 --- a/cli/src/util/emoji.ts +++ b/cli/src/util/emoji.ts @@ -1,4 +1,4 @@ -// Emoji falback, right now just uses fallback on windows, +// Emoji fallback, right now just uses fallback on windows, // but could expand to be more sophisticated to allow emoji // on Hyper term on windows, for example. export const emoji = (x: string, fallback: string): string => { diff --git a/cli/src/util/spm.ts b/cli/src/util/spm.ts index 3e2e515293..a03b37d43d 100644 --- a/cli/src/util/spm.ts +++ b/cli/src/util/spm.ts @@ -59,7 +59,7 @@ export async function checkPluginsForPackageSwift(config: Config, plugins: Plugi logger.debug(`Found ${plugins.length} iOS plugins, ${packageSwiftPluginList.length} have a Package.swift file`); logger.info('All plugins have a Package.swift file and will be included in Package.swift'); } else { - logger.warn('Some installed packages are not compatable with SPM'); + logger.warn('Some installed packages are not compatible with SPM'); } return packageSwiftPluginList; diff --git a/cli/test/add.android.spec.ts b/cli/test/add.android.spec.ts index f8e6ae0ec4..a9c6f9f37e 100644 --- a/cli/test/add.android.spec.ts +++ b/cli/test/add.android.spec.ts @@ -16,7 +16,7 @@ describe.each([false, true])('Add: Android (monoRepoLike: %p)', (monoRepoLike) = FS = new MappedFS(appDir); }); - afterAll(() => { + after all(() => { appDirObj.cleanupCallback(); }); diff --git a/cli/test/add.ios.spec.ts b/cli/test/add.ios.spec.ts index 21b2108949..e2cf127360 100644 --- a/cli/test/add.ios.spec.ts +++ b/cli/test/add.ios.spec.ts @@ -16,7 +16,7 @@ describe.each([false, true])('Add: iOS (monoRepoLike: %p)', (monoRepoLike) => { FS = new MappedFS(appDir); }); - afterAll(() => { + after all(() => { appDirObj.cleanupCallback(); }); diff --git a/cli/test/init.spec.ts b/cli/test/init.spec.ts index 14be69d646..3f8b4b8186 100644 --- a/cli/test/init.spec.ts +++ b/cli/test/init.spec.ts @@ -19,7 +19,7 @@ describe('Init', () => { FS = new MappedFS(appDir); }); - afterAll(() => { + after all(() => { appDirObj.cleanupCallback(); }); diff --git a/cli/test/update.android.spec.ts b/cli/test/update.android.spec.ts index bfa8ba5b3a..698b71ee34 100644 --- a/cli/test/update.android.spec.ts +++ b/cli/test/update.android.spec.ts @@ -17,7 +17,7 @@ describe.each([false, true])('Update: Android (monoRepoLike: %p)', (monoRepoLike FS = new MappedFS(appDir); }); - afterAll(() => { + after all(() => { //appDirObj.cleanupCallback(); }); diff --git a/cli/test/update.ios.spec.ts b/cli/test/update.ios.spec.ts index 37684e938f..6c0ebeb72b 100644 --- a/cli/test/update.ios.spec.ts +++ b/cli/test/update.ios.spec.ts @@ -17,7 +17,7 @@ describe.each([false, true])('Update: iOS (monoRepoLike: %p)', (monoRepoLike) => FS = new MappedFS(appDir); }); - afterAll(() => { + after all(() => { //appDirObj.cleanupCallback(); }); diff --git a/core/cordova.js b/core/cordova.js index b0219ff5a5..0ad1746a1e 100644 --- a/core/cordova.js +++ b/core/cordova.js @@ -1014,7 +1014,7 @@ } capacitorExec.nativeFetchMessages = function () { - // Stop listing for window detatch once native side confirms poke. + // Stop listing for window detach once native side confirms poke. if (failSafeTimerId) { clearTimeout(failSafeTimerId); failSafeTimerId = 0; diff --git a/core/http.md b/core/http.md index f459597c1f..d7ad5b75d0 100644 --- a/core/http.md +++ b/core/http.md @@ -419,7 +419,7 @@ An event which takes place in the DOM. | **`cancelable`** | boolean | Returns true or false depending on how event was initialized. Its return value does not always carry meaning, but true can indicate that part of the operation during which event was dispatched, can be canceled by invoking the preventDefault() method. | | **`composed`** | boolean | Returns true or false depending on how event was initialized. True if event invokes listeners past a ShadowRoot node that is the root of its target, and false otherwise. | | **`currentTarget`** | EventTarget | Returns the object whose event listener's callback is currently being invoked. | -| **`defaultPrevented`** | boolean | Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise. | +| **`defaultPrevented`** | boolean | Returns true if preventDefault() was invoked successfully to indicate cancellation, and false otherwise. | | **`eventPhase`** | number | Returns the event's phase, which is one of NONE, CAPTURING_PHASE, AT_TARGET, and BUBBLING_PHASE. | | **`isTrusted`** | boolean | Returns true if event was dispatched by the user agent, and false otherwise. | | **`returnValue`** | boolean | | diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index a37fe723fd..1fa19c5180 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -8,7 +8,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes - **http:** handle URL objects on fetch ([#8386](https://github.com/ionic-team/capacitor/issues/8386)) ([003099a](https://github.com/ionic-team/capacitor/commit/003099aef246adfd76d890074d46b1484951824b)) -- **ios:** make getArray accesible on Objective-C plugins ([#8392](https://github.com/ionic-team/capacitor/issues/8392)) ([afb80f2](https://github.com/ionic-team/capacitor/commit/afb80f2fecb4bf85dbebe25e815de2a5564264d6)) +- **ios:** make getArray accessible on Objective-C plugins ([#8392](https://github.com/ionic-team/capacitor/issues/8392)) ([afb80f2](https://github.com/ionic-team/capacitor/commit/afb80f2fecb4bf85dbebe25e815de2a5564264d6)) # [8.2.0](https://github.com/ionic-team/capacitor/compare/8.1.0...8.2.0) (2026-03-06) @@ -526,7 +526,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - **android:** Add Optional Data Param for Error Object ([#5719](https://github.com/ionic-team/capacitor/issues/5719)) ([174172b](https://github.com/ionic-team/capacitor/commit/174172b6c64dc9117c48ed0e20c25e0b6c2fb625)) - **android:** Use addWebMessageListener where available ([#5427](https://github.com/ionic-team/capacitor/issues/5427)) ([c2dfe80](https://github.com/ionic-team/capacitor/commit/c2dfe808446717412b35e82713d123b7a052f264)) -- **ios:** Add overrideable router var for CAPWebView. ([#5743](https://github.com/ionic-team/capacitor/issues/5743)) ([c1de1c0](https://github.com/ionic-team/capacitor/commit/c1de1c0138aad188a760118e35983d10d257f8e7)) +- **ios:** Add overridable router var for CAPWebView. ([#5743](https://github.com/ionic-team/capacitor/issues/5743)) ([c1de1c0](https://github.com/ionic-team/capacitor/commit/c1de1c0138aad188a760118e35983d10d257f8e7)) - **iOS:** post install script for deployment target ([#5783](https://github.com/ionic-team/capacitor/issues/5783)) ([f5afa94](https://github.com/ionic-team/capacitor/commit/f5afa94b3b9c246d87b2af03359840f503bace90)) - Add option for custom error page ([#5723](https://github.com/ionic-team/capacitor/issues/5723)) ([e8bdef3](https://github.com/ionic-team/capacitor/commit/e8bdef3b4634e4ad45fa8fc34c7c0ab8dfa383f3)) @@ -593,7 +593,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -- **ios:** Add overrideable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa)) +- **ios:** Add overridable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa)) # [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25) diff --git a/ios/Capacitor/Capacitor/CAPInstanceDescriptor.h b/ios/Capacitor/Capacitor/CAPInstanceDescriptor.h index f477ef55be..b7f9103334 100644 --- a/ios/Capacitor/Capacitor/CAPInstanceDescriptor.h +++ b/ios/Capacitor/Capacitor/CAPInstanceDescriptor.h @@ -120,7 +120,7 @@ NS_SWIFT_NAME(InstanceDescriptor) */ @property (nonatomic, copy, nonnull) NSURL *appLocation; /** - @brief The path (relative to @c appLocation) which Capacitor will use for the inital URL at launch. + @brief The path (relative to @c appLocation) which Capacitor will use for the initial URL at launch. @discussion Defaults to nil, in which case Capacitor will attempt to load @c index.html. */ @property (nonatomic, copy, nullable) NSString *appStartPath; @@ -135,7 +135,7 @@ NS_SWIFT_NAME(InstanceDescriptor) */ @property (nonatomic, copy, nullable) NSString *preferredContentMode; /** - @brief The parser used to load the cofiguration for Cordova plugins. + @brief The parser used to load the configuration for Cordova plugins. */ @property (nonatomic, copy, nonnull) CDVConfigParser *cordovaConfiguration; /** diff --git a/ios/Capacitor/Capacitor/CAPNotifications.swift b/ios/Capacitor/Capacitor/CAPNotifications.swift index 03d80aa87b..f372213d03 100644 --- a/ios/Capacitor/Capacitor/CAPNotifications.swift +++ b/ios/Capacitor/Capacitor/CAPNotifications.swift @@ -1,5 +1,5 @@ /** - Notificaton types for NotificationCenter and NSNotificationCenter + Notification types for NotificationCenter and NSNotificationCenter We want to include `capacitor` in the name(s) to uniquely identify these even though it can make the names long and the deprecated notifications are only here for backwards compatibility. diff --git a/ios/Capacitor/Capacitor/Codable/JSValueDecoder.swift b/ios/Capacitor/Capacitor/Codable/JSValueDecoder.swift index 43042e4f42..dc3966e4f5 100644 --- a/ios/Capacitor/Capacitor/Codable/JSValueDecoder.swift +++ b/ios/Capacitor/Capacitor/Codable/JSValueDecoder.swift @@ -16,7 +16,7 @@ public final class JSValueDecoder: TopLevelDecoder { /// The strategies available for decoding raw data. public typealias DataDecodingStrategy = JSONDecoder.DataDecodingStrategy - /// The strategies availble for decoding NaN, Infinity, and -Infinity + /// The strategies available for decoding NaN, Infinity, and -Infinity public enum NonConformingFloatDecodingStrategy { /// Decodes directly into the floating point type as .infinity, -.infinity, or .nan case deferred @@ -127,7 +127,7 @@ extension _JSValueDecoder: Decoder { SingleValueContainer(data: data, codingPath: codingPath, userInfo: userInfo, options: options) } - // force casting is fine becasue we've already determined that T is the type in the case + // force casting is fine because we've already determined that T is the type in the case // the swift standard library also force casts in their similar functions // https://github.com/swiftlang/swift-foundation/blob/da80d51fa3e77f3e7ed57c4300a870689e755713/Sources/FoundationEssentials/JSON/JSONEncoder.swift#L1140 // swiftlint:disable force_cast diff --git a/ios/Capacitor/Capacitor/WebViewAssetHandler.swift b/ios/Capacitor/Capacitor/WebViewAssetHandler.swift index acc8effb74..10ac90fc60 100644 --- a/ios/Capacitor/Capacitor/WebViewAssetHandler.swift +++ b/ios/Capacitor/Capacitor/WebViewAssetHandler.swift @@ -450,7 +450,7 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler { "texinfo": "application/x-texinfo", "tgz": "application/x-compressed", "thmx": "application/vnd.ms-officetheme", - "thn": "application/octet-stream", + "then": "application/octet-stream", "tif": "image/tiff", "tiff": "image/tiff", "toc": "application/octet-stream", diff --git a/ios/Capacitor/Capacitor/WebViewDelegationHandler.swift b/ios/Capacitor/Capacitor/WebViewDelegationHandler.swift index 2b4a256d00..9c782741a1 100644 --- a/ios/Capacitor/Capacitor/WebViewDelegationHandler.swift +++ b/ios/Capacitor/Capacitor/WebViewDelegationHandler.swift @@ -27,7 +27,7 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat } open func willLoadWebview(_ webView: WKWebView?) { - // Set the webview to be not opaque on the inital load. This prevents + // Set the webview to be not opaque on the initial load. This prevents // the webview from showing a white background, which is its default // loading display, as that can appear as a screen flash. The opacity // might have been set by something else, like a plugin, so we want diff --git a/ios/Capacitor/CapacitorTests/BridgedTypesTests.swift b/ios/Capacitor/CapacitorTests/BridgedTypesTests.swift index f88b4e320e..23695ab65c 100644 --- a/ios/Capacitor/CapacitorTests/BridgedTypesTests.swift +++ b/ios/Capacitor/CapacitorTests/BridgedTypesTests.swift @@ -25,7 +25,7 @@ class BridgedTypesTests: XCTestCase { override class func setUp() { let formatter = ISO8601DateFormatter() // an ISO 8601 string does not necessarily include subsecond precision, so we can't just capture the current date - // or else we won't be able to compare the objects since they could differ by milliseconds or nanoseonds. so instead + // or else we won't be able to compare the objects since they could differ by milliseconds or nanoseconds. so instead // we use a fixed timestamp at a whole hour. let date = NSDate(timeIntervalSinceReferenceDate: 632854800) let subDictionary: [AnyHashable: Any] = ["testIntArray": [0, 1, 2], "testStringArray": ["1", "2", "3"], "testDictionary":["foo":"bar"]]