Skip to content

Commit b0e1afb

Browse files
committed
Merge branch 'docusaurus'
2 parents c47199d + c2e70df commit b0e1afb

File tree

1,514 files changed

+15560
-10950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,514 files changed

+15560
-10950
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818
CI: true
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
run: |
21-
npm install
22-
npm run lint
23-
npm run build.ci
21+
npm ci
22+
npm run build
23+
- name: vercel deploy
24+
if: ${{ github.ref == 'refs/heads/docusaurus' }}
25+
run: vercel --token ${{ secrets.VERCEL_TOKEN }} deploy --prod
26+
env:
27+
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
28+
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}

.gitignore

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1+
# Dependencies
2+
/node_modules
3+
4+
# Production
5+
/build
6+
7+
# Generated files
8+
.docusaurus
9+
.cache-loader
10+
11+
# Misc
112
.DS_Store
2-
node_modules/
3-
.stencil/
4-
.nova/
5-
dist/
6-
www/
7-
src/pages/**/*.json
8-
src/l10n/pages/**/*.json
9-
src/components/menu/data/
10-
src/components/page/data/
11-
src/components/search/data/
12-
.idea
13-
/.env
14-
/.docusaurus
15-
/docs
13+
.env.local
14+
.env.development.local
15+
.env.test.local
16+
.env.production.local
17+
18+
npm-debug.log*
19+
yarn-debug.log*
20+
yarn-error.log*

Procfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

app.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

babel.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
3+
};

crowdin.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
files:
2-
- source: /src/assets/locales/en/messages.json
3-
translation: /src/assets/locales/%two_letters_code%/messages.json
4-
- source: /src/pages/**/*.md
5-
translation: /src/pages/%two_letters_code%/**/%original_file_name%
6-
ignore:
7-
- /src/pages/%two_letters_code%/**/%original_file_name%
2+
- source: /i18n/en/**/*
3+
translation: /i18n/%two_letters_code%/**/%original_file_name%
4+
- source: /docs/**/*
5+
translation: /i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%

src/pages/angular/config.md renamed to docs/angular/config.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
---
2-
previousText: 'Navigation/Routing'
3-
previousUrl: '/docs/angular/navigation'
4-
nextText: 'Platform'
5-
nextUrl: '/docs/angular/platform'
62
contributors:
73
- liamdebeasi
84
- mhartington

src/pages/angular/lifecycle.md renamed to docs/angular/lifecycle.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
2-
previousText: 'Your First App'
3-
previousUrl: '/docs/angular/your-first-app'
4-
nextText: 'Navigation'
5-
nextUrl: '/docs/angular/navigation'
2+
sidebar_label: Lifecycle
63
contributors:
74
- elylucas
85
---
@@ -12,7 +9,7 @@ contributors:
129
This guide covers how the page life cycle works in an app built with Ionic and Angular.
1310

1411

15-
![Ionic life cycle events demo](/docs/assets/img/guides/lifecycle/ioniclifecycle.png)
12+
![Ionic life cycle events demo](/img/guides/lifecycle/ioniclifecycle.png)
1613

1714
## Angular Life Cycle Events
1815

@@ -44,7 +41,7 @@ The difference between `ionViewWillEnter` and `ionViewDidEnter` is when they fir
4441
For `ionViewWillLeave` and `ionViewDidLeave`, `ionViewWillLeave` gets called directly before the transition away from the current page begins, and `ionViewDidLeave` does not get called until after the new page gets successfully transitioned into (after the new pages `ionViewDidEnter` fires).
4542

4643

47-
![Ionic life cycle events demo](/docs/assets/img/guides/lifecycle/ioniclifecycle.gif)
44+
![Ionic life cycle events demo](/img/guides/lifecycle/ioniclifecycle.gif)
4845

4946
## How Ionic Handles the Life of a Page
5047

src/pages/angular/navigation.md renamed to docs/angular/navigation.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
2-
previousText: 'Lifecycle'
3-
previousUrl: '/docs/angular/lifecycle'
4-
nextText: 'Config'
5-
nextUrl: '/docs/angular/config'
2+
sidebar_label: Navigation/Routing
63
contributors:
74
- mhartington
85
---

src/pages/angular/overview.md renamed to docs/angular/overview.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
nextText: 'Build Your First App'
3-
nextUrl: '/docs/angular/your-first-app'
2+
sidebar_label: Overview
43
---
54

65
# Ionic Angular Overview
@@ -13,4 +12,4 @@ Ionic supports `Angular 6.0.0 and up`. As part of their upgrade strategy, Angula
1312

1413
## Angular Tooling
1514

16-
With Ionic 4+, the official Angular stack for building an app and routing are used, so your app can fall in-line with the rest of the great Angular ecosystem. In cases where more opinionated features are needed, Ionic provides `@ionic/angular-toolkit`, which builds and integrates with the [official Angular CLI](https://angular.io/cli) and provides features that are specific to `@ionic/angular` apps.
15+
With Ionic 4+, the official Angular stack for building an app and routing are used, so your app can fall in-line with the rest of the great Angular ecosystem. In cases where more opinionated features are needed, Ionic provides `@ionic/angular-toolkit`, which builds and integrates with the [official Angular CLI](https://angular.io/cli) and provides features that are specific to `@ionic/angular` apps.

0 commit comments

Comments
 (0)