Merge branch 'main' of github.com:ionic-team/ionic-docs

# Conflicts:
#	docs/deployment/desktop-app.md
#	docs/updating/7-0.md
#	docusaurus.config.js
#	versioned_docs/version-v6/reference/migration.md

Author: rdlabo

docs/api/datetime.md

@@ -336,7 +336,7 @@ const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 const date = new Date('2014-10-25T10:46:20Z');
 
 // Use date-fns-tz to convert from UTC to a zoned time
-const zonedTime = dateFnsTz.utcToZonedTime(date, userTimeZone);
+const zonedTime = utcToZonedTime(date, userTimeZone);
 
 // Create a formatted string from the zoned time
 format(zonedTime, 'yyyy-MM-dd HH:mm:ssXXX', { timeZone: userTimeZone });

docs/contributing/coc.md

@@ -8,4 +8,6 @@ We promise to extend courtesy and respect to everyone involved in this project r
 
 If any member of the community violates this code of conduct, the maintainers of the Ionic project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
 
-If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at <a href="mailto:[email protected]">[email protected]</a>.
+If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at <a href="mailto:[email protected]">[email protected]</a>.
+
+Please click <a href="https://ionic.io/code-of-conduct" target="_blank" rel="noopener">here</a> to review to Ionic's full code of conduct.

docs/reference/support.md

@@ -22,8 +22,8 @@ The current status of each Ionic Framework version is:
 
 | Version |        Status         |   Released   | Maintenance Ends | Ext. Support Ends |
 | :-----: | :-------------------: | :----------: | :--------------: | :---------------: |
-| V7      | Beta                  | TBD          | TBD              | TBD               |
-| V6      | **Active**            | Dec 8, 2021  | TBD              | TBD               |
+| V7      | **Active**            | Mar 29, 2023 | TBD              | TBD               |
+| V6      | Maintenance           | Dec 8, 2021  | Sep 29, 2023     | Mar 29, 2024      |
 | V5      | End of Support        | Feb 11, 2020 | June 8, 2022     | Dec 8, 2022       |
 | V4      | End of Support        | Jan 23, 2019 | Aug 11, 2020     | Sept 30, 2022     |
 | V3      | End of Support        | Apr 5, 2017  | Oct 30, 2019     | Aug 11, 2020      |

docs/updating/4-0.md

@@ -30,7 +30,7 @@ We suggest the following general process when migrating an existing application
 
 In many cases, using the Ionic CLI to generate a new object and then copying the code also works very well. For example: `ionic g service weather` will create a shell `Weather` service and test. The code can then be copied from the older project with minor modifications as needed. This helps to ensure the proper structure is followed. This also generates shells for unit tests.
 
-## Changes in Package Name
+### Changes in Package Name
 
 In Ionic 4, the package name is `@ionic/angular`. Uninstall Ionic 3 and install Ionic 4 using the new package name:
 
@@ -41,7 +41,7 @@ $ npm install @ionic/angular@v4-lts
 
 While migrating an app, update the imports from `ionic-angular` to `@ionic/angular`.
 
-## Project structure
+### Project structure
 
 One of the major changes between an Ionic 3 app and an Ionic 4 app is the overall project layout and structure. In v3, Ionic apps had a custom convention for how an app should be set up and what that folder structure should look like. In v4, this has been changed to follow the recommended setup of each supported framework.
 
@@ -133,19 +133,19 @@ See the following `ionic.config.json` as an example:
 }
 ```
 
-## RxJS Changes
+### RxJS Changes
 
 Between V3 and V4, RxJS was updated to version 6. This changes many of the import paths of operators and core RxJS functions. Please see the <a href="https://github.com/ReactiveX/rxjs/blob/6.x/docs_app/content/guide/v6/migration.md" target="_blank">RxJS Migration Guide</a> for details.
 
-## Lifecycle Events
+### Lifecycle Events
 
 With V4, we're now able to utilize the typical events provided by [Angular](https://angular.io/guide/lifecycle-hooks). But for certain cases, you might want to have access to the events fired when a component has finished animating during its route change. In this case, the `ionViewWillEnter`, `ionViewDidEnter`, `ionViewWillLeave`, and `ionViewDidLeave` have been ported over from V3. Use these events to coordinate actions with Ionic's own animations system.
 
 Older events like `ionViewDidLoad`, `ionViewCanLeave`, and `ionViewCanEnter` have been removed, and the proper Angular alternatives should be used.
 
 For more details, check out the [router-outlet docs](../api/router-outlet.md)
 
-## Overlay Components
+### Overlay Components
 
 In prior versions of Ionic, overlay components such as Loading, Toast, or Alert were created synchronously. In Ionic v4, these components are all created asynchronously. As a result of this, the API is now promise-based.
 
@@ -183,15 +183,15 @@ async showAlert() {
 }
 ```
 
-## Navigation
+### Navigation
 
 In V4, navigation received the most changes. Now, instead of using Ionic's own `NavController`, we integrate with the official Angular Router. This not only provides a consistent routing experience across apps, but is much more dependable. The Angular team has an <a href="http://angular.io/guide/router" target="_blank">excellent guide</a> on their docs site that covers the Router in great detail.
 
 To provide the platform-specific animations that users are used to, we have created `ion-router-outlet` for Angular Apps. This behaves in a similar manner to Angular's `router-outlet` but provides a stack-based navigation (tabs) and animations.
 
 For a detailed explanation in navigation works in a V4 project, check out the [Angular navigation guide](../angular/navigation.md).
 
-## Lazy Loading
+### Lazy Loading
 
 Since Navigation has changed, the mechanism for lazy loading has also changed in V4.
 
@@ -241,7 +241,7 @@ export class AppModule {}
 
 For a detailed explanation of lazy loading in V4 project, check out the [Angular navigation guide](../angular/navigation.md#lazy-loading-routes).
 
-## Markup Changes
+### Markup Changes
 
 Since v4 moved to Custom Elements, there's been a significant change to the markup for each component. These changes have all been made to follow the Custom Elements spec, and have been documented in a <a href="https://github.com/ionic-team/ionic/blob/master/angular/BREAKING.md#breaking-changes" target="_blank">dedicated file on GitHub</a>.
 

docs/updating/7-0.md

@@ -9,7 +9,7 @@ This guide assumes that you have already updated your app to the latest version
 :::
 
 :::info Breaking Changes
-For a **complete list of breaking changes** from Ionic 6 to Ionic 7, please refer to [the breaking changes document](https://github.com/ionic-team/ionic-framework/blob/feature-7.0/BREAKING.md#version-7x) in the Ionic Framework repository.
+For a **complete list of breaking changes** from Ionic 6 to Ionic 7, please refer to [the breaking changes document](https://github.com/ionic-team/ionic-framework/blob/main/BREAKING.md#version-7x) in the Ionic Framework repository.
 :::
 
 ## はじめ方
@@ -26,13 +26,13 @@ npm install [email protected]
 3. Ionic 7の最新バージョンにアップデートしてください：
 
 ```shell
-npm install @ionic/angular@next
+npm install @ionic/angular@7
 ```
 
 Ionic Angular Serverを使用している場合は、必ずそちらも更新してください。
 
 ```shell
-npm install @ionic/angular@next @ionic/angular-server@next
+npm install @ionic/angular@7 @ionic/angular-server@7
 ```
 
 ### React
@@ -46,7 +46,7 @@ npm install react@latest react-dom@latest
 2. Ionic 7の最新バージョンにアップデートします。
 
 ```shell
-npm install @ionic/react@next @ionic/react-router@next
+npm install @ionic/react@7 @ionic/react-router@7
 ```
 
 ### Vue
@@ -60,15 +60,15 @@ npm install vue@latest vue-router@latest
 3. Ionic 7の最新バージョンにアップデートします。
 
 ```shell
-npm install @ionic/vue@next @ionic/vue-router@next
+npm install @ionic/vue@7 @ionic/vue-router@7
 ```
 
 ### Core
 
 1. Ionic 7の最新バージョンにアップデートします。
 
 ```shell
-npm install @ionic/core@next
+npm install @ionic/core@7
 ```
 
 ## あなたのコードのアップデート
@@ -148,11 +148,7 @@ iOS >=14
 
 ## アップグレードに助けが必要？
 
-[Ionic 7 Breaking Changes Guide](https://github.com/ionic-team/ionic-framework/blob/feature-7.0/BREAKING.md#version-7x) を必ず見てください。デフォルトのプロパティとCSS Variableの値について、開発者が注意する必要がある変更がいくつかありました。このページでは、ユーザーアクションが必要な変更点のみをリストアップしています。
+[Ionic 7 Breaking Changes Guide](https://github.com/ionic-team/ionic-framework/blob/main/BREAKING.md#version-7x) を必ず見てください。デフォルトのプロパティとCSS Variableの値について、開発者が注意する必要がある変更がいくつかありました。このページでは、ユーザーアクションが必要な変更点のみをリストアップしています。
 
-<<<<<<< HEAD
 アップグレードのヘルプが必要な場合は、[Ionic Forum](https://forum.ionicframework.com/)にスレッドを投稿してください。
 
-=======
-If you need help upgrading, please post a thread on the [Ionic Forum](https://forum.ionicframework.com/).
->>>>>>> 3bd16bc620b471736c9f4ce90e2f3eae53781174

docusaurus.config.js

@@ -100,8 +100,8 @@ module.exports = {
         {
           type: 'cta',
           position: 'left',
-          text: 'Ionic採用事例をみよう',
-          href: `https://ionicframework.jp/case/`,
+          text: 'Ionic v7 アップグレードガイド',
+          href: `/updating/7-0`,
         },
         {
           type: 'docsVersionDropdown',

scripts/i18n.sh

@@ -2,9 +2,7 @@
 set -o errexit
 set -o nounset
 
-if [ "${VERCEL_ENV:-preview}" == "production" ]; then
-    mkdir -p i18n/ja/docusaurus-plugin-content-docs/version-v6/
-    curl -fsSL https://github.com/ionic-team/ionic-docs/archive/refs/heads/translation/jp.tar.gz |
-      tar -zxf - -C i18n/ja/docusaurus-plugin-content-docs/version-v6/ --strip-components 2 ionic-docs-translation-jp/docs
-    node scripts/api-ja.js
-fi
+mkdir -p i18n/ja/docusaurus-plugin-content-docs/version-v6/
+curl -fsSL https://github.com/ionic-team/ionic-docs/archive/refs/heads/translation/jp.tar.gz |
+  tar -zxf - -C i18n/ja/docusaurus-plugin-content-docs/version-v6/ --strip-components 2 ionic-docs-translation-jp/docs
+node scripts/api-ja.js

versioned_docs/version-v5/contributing/coc.md

@@ -8,4 +8,6 @@ We promise to extend courtesy and respect to everyone involved in this project r
 
 If any member of the community violates this code of conduct, the maintainers of the Ionic project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
 
-If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at <a href="mailto:[email protected]">[email protected]</a>.
+If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at <a href="mailto:[email protected]">[email protected]</a>.
+
+Please click <a href="https://ionic.io/code-of-conduct" target="_blank" rel="noopener">here</a> to review to Ionic's full code of conduct.