Skip to content

Commit e7dcf6a

Browse files
committed
Merge branch 'main' into fix/api-js-script
2 parents 079fe4b + 70db0de commit e7dcf6a

File tree

4,519 files changed

+55682
-46856
lines changed

Some content is hidden

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

4,519 files changed

+55682
-46856
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@
1212
# This should make it easy to add new rules without breaking existing ones.
1313

1414
* @ionic-team/framework
15-
16-
/_templates/ @mapsandapps

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ docs/api
77
docs/native
88
versioned_docs/version-v*/native
99
docs/cli/commands
10+
docs/reference/glossary.md
1011

1112
static/code/stackblitz
1213

CONTRIBUTING.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@
22

33
Thanks for your interest in contributing to Ionic's documentation! :tada: Check the guidelines below for suggestions and requirements before submitting your contribution.
44

5-
- [Contributing Guide](#contributing-guide)
6-
- [Development Workflow](#development-workflow)
7-
- [Previewing Changes](#previewing-changes)
8-
- [Linting Documentation](#linting-documentation)
9-
- [Spell Check](#spell-check)
10-
- [Using VS Code on Windows](#using-vs-code-on-windows)
11-
- [Project Structure](#project-structure)
12-
- [Directories](#directories)
13-
- [Authoring Content](#authoring-content)
14-
- [Authoring Locally](#authoring-locally)
15-
- [Translation](#translation)
16-
- [Reporting Issues](#reporting-issues)
17-
- [Pull Request Guidelines](#pull-request-guidelines)
18-
- [Deploying](#deploying)
19-
- [License](#license)
5+
<sub>
6+
<b>TABLE OF CONTENTS</b>
7+
</sub>
8+
9+
- [Development Workflow](#development-workflow)
10+
- [Previewing Changes](#previewing-changes)
11+
- [Linting Documentation](#linting-documentation)
12+
- [Spell Check](#spell-check)
13+
- [Using VS Code on Windows](#using-vs-code-on-windows)
14+
- [Project Structure](#project-structure)
15+
- [Directories](#directories)
16+
- [Authoring Content](#authoring-content)
17+
- [Reference Content](#reference-content)
18+
- [Translation](#translation)
19+
- [Reporting Issues](#reporting-issues)
20+
- [Pull Request Guidelines](#pull-request-guidelines)
21+
- [Deploying](#deploying)
22+
- [License](#license)
2023

2124
---
2225

@@ -178,4 +181,4 @@ The Ionic documentation's `main` branch is deployed automatically and separately
178181

179182
This repo is licensed and managed separately from Ionic itself.
180183

181-
By contributing to this repo, you agree to have your contributions licensed under the Apache 2.0 license. See [LICENSE](../LICENSE) for the full license text.
184+
By contributing to this repo, you agree to have your contributions licensed under the Apache 2.0 license. See [LICENSE](LICENSE) for the full license text.

_templates/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Once you've generated your playground, you need to add it to the main markdown f
2626
```
2727
## Feature
2828
29-
import Feature from '@site/static/usage/v7/button/feature/index.md';
29+
import Feature from '@site/static/usage/v8/button/feature/index.md';
3030
3131
<Feature />
3232
```

_templates/playground/new/angular.md.ejs.t

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_html.md` %>"
3+
---
4+
```html
5+
<<%= component %>></<%= component %>>
6+
```
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
2-
# this file only gets generated if `angular_ts` (from the command line prompt) is true
3-
to: "<%= angular_ts ? `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` : null %>"
2+
arbitrary: <% pascalComponent = h.changeCase.pascal(component) %>
3+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` %>"
44
---
55
```ts
66
import { Component } from '@angular/core';
7+
import { <%= pascalComponent %> } from '@ionic/angular/standalone';
78

89
@Component({
910
selector: 'app-example',
1011
templateUrl: 'example.component.html',
11-
<% if (css){ -%>
1212
styleUrls: ['./example.component.css'],
13-
<% } -%>
13+
imports: [<%= pascalComponent %>],
1414
})
15-
export class ExampleComponent {
16-
}
15+
export class ExampleComponent {}
1716
```

_templates/playground/new/index.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,14 @@ module.exports = {
5454
type: 'select',
5555
name: 'version',
5656
message: 'Select the Ionic Framework version for the playground',
57-
initial: '7',
58-
choices: ['6', '7'],
57+
initial: '8',
58+
choices: ['6', '7', '8'],
5959
},
6060
{
6161
type: 'toggle',
6262
name: 'css',
6363
message: 'Generate custom CSS files?',
6464
},
65-
{
66-
type: 'toggle',
67-
name: 'angular_ts',
68-
message: 'Generate an Angular TypeScript file?',
69-
},
7065
])
7166
.then((answers) => {
7267
answers.name = answers.name || answers.component.replace('ion-', '');
@@ -77,7 +72,7 @@ module.exports = {
7772

7873
const playgroundName = changeCase.pascal(answers.path.split('/').pop());
7974
console.log(
80-
`\nTo use this playground in a docs markdown file, include\nthe following:\n\n## ${playgroundName}\n\nimport ${playgroundName} from '@site/static/usage/v7/${answers.name}/${answers.path}/index.md';\n\n<${playgroundName} />\n`
75+
`\nTo use this playground in a docs markdown file, include\nthe following:\n\n## ${playgroundName}\n\nimport ${playgroundName} from '@site/static/usage/v${answers.version}/${answers.name}/${answers.path}/index.md';\n\n<${playgroundName} />\n`
8176
);
8277

8378
return answers;

_templates/playground/new/index.md.ejs.t

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ import react_main_css from './react/main_css.md';
1212
import react from './react.md';
1313
<% } -%>
1414
import vue from './vue.md';
15-
<% if (css || angular_ts){ %>
15+
1616
import angular_example_component_html from './angular/example_component_html.md';
17-
<% } else { -%>
18-
import angular from './angular.md';
19-
<% } -%>
20-
<% if (angular_ts){ -%>
21-
import angular_example_component_ts from './angular/example_component_ts.md';
22-
<% } -%>
2317
<% if (css){ -%>
2418
import angular_example_component_css from './angular/example_component_css.md';
2519
<% } -%>
20+
import angular_example_component_ts from './angular/example_component_ts.md';
2621

2722
<Playground
2823
version="<%= version %>"
@@ -39,21 +34,15 @@ import angular_example_component_css from './angular/example_component_css.md';
3934
react,
4035
<% } -%>
4136
vue,
42-
<% if (angular_ts || css){ -%>
4337
angular: {
4438
files: {
4539
'src/app/example.component.html': angular_example_component_html,
46-
<% if (angular_ts){ -%>
47-
'src/app/example.component.ts': angular_example_component_ts,
48-
<% } -%>
4940
<% if (css){ -%>
5041
'src/app/example.component.css': angular_example_component_css,
5142
<% } -%>
43+
'src/app/example.component.ts': angular_example_component_ts,
5244
},
5345
},
54-
<% } else { -%>
55-
angular,
56-
<% } -%>
5746
}}
5847
src="usage/v<%= version %>/<%= name %>/<%= path %>/demo.html"
5948
/>

_templates/playground/new/react.md.ejs.t

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import './main.css';<% } %>
1111

1212
function Example() {
1313
return (
14-
<<%= pascalComponent %>></<%= pascalComponent %>>
14+
<>
15+
<<%= pascalComponent %>></<%= pascalComponent %>>
16+
</>
1517
);
1618
}
1719
export default Example;
1820
```
19-

0 commit comments

Comments
 (0)