Skip to content

Commit 77c2d31

Browse files
authored
chore(): sync with develop
chore(): sync with develop
2 parents f35ea72 + 44e51b3 commit 77c2d31

13 files changed

Lines changed: 215 additions & 33 deletions

File tree

.github/workflows/cd.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
timeout-minutes: 30
1313
steps:
1414
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
15-
- uses: actions/setup-node@v1
15+
- uses: actions/setup-node@v3
1616
with:
1717
node-version: 14.x
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121
- name: Restore Dependency Cache
22-
uses: actions/cache@v1
22+
uses: actions/cache@v3
2323
with:
2424
path: ~/.npm
2525
key: ${{ runner.OS }}-dependency-cache-${{ hashFiles('**/package.json') }}
@@ -35,9 +35,7 @@ jobs:
3535
- name: Sleep while npm takes its time
3636
run: sleep 20
3737
- name: GitHub Container Registry Login
38-
run: echo ${GH_TOKEN} | docker login ghcr.io -u ionitron --password-stdin
39-
env:
40-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
38+
run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
4139
- name: Build Container
4240
run: |
4341
docker build \

.github/workflows/docker-image.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
- name: GitHub Container Registry Login
17-
run: echo ${GH_TOKEN} | docker login ghcr.io -u ionitron --password-stdin
18-
env:
19-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
20-
17+
run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
2118
- name: Build Container
2219
run: |
2320
docker build \
@@ -28,4 +25,4 @@ jobs:
2825
- name: Push Container as latest
2926
run: docker push ghcr.io/${{ github.repository }}:latest
3027
- name: Push Container as version
31-
run: docker push ghcr.io/${{ github.repository }}:$(npm info @ionic/cli dist-tags.latest)
28+
run: docker push ghcr.io/${{ github.repository }}:$(npm info @ionic/cli dist-tags.latest)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"docs": "node packages/cli-scripts/bin/ionic-cli-scripts docs",
1515
"docs:watch": "chokidar 'packages/cli-scripts/dist/docs/**/*.js' -c 'npm run docs'",
1616
"publish:testing": "lerna publish prerelease --preid=testing --exact --no-git-tag-version --no-push --dist-tag=testing",
17-
"publish:ci": "lerna publish -m 'chore(release): publish [skip ci]' --exact --conventional-commits"
17+
"publish:ci": "lerna publish -m 'chore(release): publish [skip ci]' --exact --conventional-commits --no-verify-access"
1818
},
1919
"devDependencies": {
2020
"chokidar-cli": "^2.0.0",

packages/@ionic/cli/CHANGELOG.md

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,87 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [6.20.9](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.8...@ionic/cli@6.20.9) (2023-03-17)
7+
8+
9+
### Bug Fixes
10+
11+
* **cli:** native solution preview should no longer be hidden ([#4962](https://github.com/ionic-team/ionic-cli/issues/4962)) ([a2eb4b2](https://github.com/ionic-team/ionic-cli/commit/a2eb4b2cf46e0f2004c1850acfdeada46fb211b5))
12+
13+
14+
15+
16+
17+
## [6.20.9](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.8...@ionic/cli@6.20.9) (2023-03-17)
18+
19+
20+
### Bug Fixes
21+
22+
* **cli:** native solution preview should no longer be hidden ([#4962](https://github.com/ionic-team/ionic-cli/issues/4962)) ([a2eb4b2](https://github.com/ionic-team/ionic-cli/commit/a2eb4b2cf46e0f2004c1850acfdeada46fb211b5))
23+
24+
25+
26+
27+
28+
## [6.20.8](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.7...@ionic/cli@6.20.8) (2023-01-13)
29+
30+
**Note:** Version bump only for package @ionic/cli
31+
32+
33+
34+
35+
36+
## [6.20.7](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.7...@ionic/cli@6.20.7) (2023-01-13)
37+
38+
**Note:** Version bump only for package @ionic/cli
39+
40+
41+
42+
43+
44+
## [6.20.7](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.6...@ionic/cli@6.20.7) (2023-01-13)
45+
46+
47+
### Bug Fixes
48+
49+
* **capacitor:** forward --inline to Capacitor CLI on copy and sync ([#4928](https://github.com/ionic-team/ionic-cli/issues/4928)) ([f5f75fa](https://github.com/ionic-team/ionic-cli/commit/f5f75fa27cffee37571813a2827cfc02baf0cb9a))
50+
* **cli:** Deprecate doctor and lab commands ([#4945](https://github.com/ionic-team/ionic-cli/issues/4945)) ([6fcf882](https://github.com/ionic-team/ionic-cli/commit/6fcf882b9ee9c31fcea38a6390b3c181c4df5ca6))
51+
* deploy manifest error if no capacitor CLI ([#4940](https://github.com/ionic-team/ionic-cli/issues/4940)) ([f586a18](https://github.com/ionic-team/ionic-cli/commit/f586a18805ead288850f18d8981db4f0ad8848ed))
52+
53+
54+
55+
56+
57+
## [6.20.6](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.5...@ionic/cli@6.20.6) (2022-12-20)
58+
59+
60+
### Bug Fixes
61+
62+
* **cli:** capacitor recognize multi-project ([#4937](https://github.com/ionic-team/ionic-cli/issues/4937)) ([553ea79](https://github.com/ionic-team/ionic-cli/commit/553ea794f916f17db131d359caba9b6c1b31b919))
63+
64+
65+
66+
67+
68+
## [6.20.5](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.4...@ionic/cli@6.20.5) (2022-12-13)
69+
70+
**Note:** Version bump only for package @ionic/cli
71+
72+
73+
74+
75+
76+
## [6.20.4](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.3...@ionic/cli@6.20.4) (2022-11-15)
77+
78+
79+
### Bug Fixes
80+
81+
* **capacitor:** Error if no emulators or devices are found on run ([#4931](https://github.com/ionic-team/ionic-cli/issues/4931)) ([7ec24c0](https://github.com/ionic-team/ionic-cli/commit/7ec24c04043b760ff9940d24c9ac281dce3aa21f))
82+
83+
84+
85+
86+
687
## [6.20.3](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@6.20.2...@ionic/cli@6.20.3) (2022-10-06)
788

889

packages/@ionic/cli/assets/oauth/success/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
font-weight: 400;
8888
}
8989

90-
.ad-box{
90+
.native-solutions{
9191
display:block;
9292
text-align:center;
9393
padding-top:30px;
9494
}
9595

96-
.ad-box>ion-card{
96+
.native-solutions>ion-card{
9797
width:300px;
9898
display:inline-block;
9999
}
@@ -125,7 +125,7 @@ <h1 class="wizardtext1" style="display:none;">Your app is now building in your t
125125
<h1 class="errortext1" style="display:none;">There was an error logging in. Please return to the terminal.</h1>
126126
<p class="errortext2" style="display:none;">In the meantime, check out our Native Solutions.</p>
127127

128-
<div class="ad-box">
128+
<div class="native-solutions">
129129
<ion-card>
130130
<ion-card-content>
131131
<svg width="123" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M35.28 6.64h-1.94V18h1.94V6.64zm7.8 4.14a3.07 3.07 0 00-2.65-1.28c-2.45 0-3.84 1.97-3.84 4.36 0 2.36 1.4 4.33 3.84 4.33 1.3 0 2.27-.51 2.8-1.37V18H45V6h-1.9v4.78zm.09 3.08c0 1.48-.88 2.65-2.34 2.65-1.44 0-2.33-1.17-2.33-2.65 0-1.52.9-2.68 2.33-2.68 1.46 0 2.34 1.16 2.34 2.68zm11.15.54l.01-.6c0-2.42-1.61-4.3-4.08-4.3-2.46 0-4.13 1.92-4.13 4.34 0 2.48 1.64 4.35 4.15 4.35 1.93 0 3.4-1.17 3.9-2.81h-1.92c-.3.73-1.05 1.18-1.93 1.18-1.33 0-2.18-.85-2.32-2.16h6.32zm-4.07-3.34c1.23 0 2.03.78 2.2 1.93h-4.42c.2-1.13 1-1.93 2.22-1.93zM57.2 9.7h-1.76V18h1.9v-4.82c0-1.3.75-2.04 1.95-2.04 1.14 0 1.65.75 1.65 1.88V18h1.9v-5.22c0-1.93-1.07-3.28-3.08-3.28-1.36 0-2.21.64-2.56 1.3V9.7zm9.44 1.52h1.4V9.7h-1.4V7.54h-1.9V9.7h-1.26v1.52h1.26V18h1.9v-6.78zm3-2.92c.7 0 1.19-.48 1.19-1.16 0-.7-.5-1.2-1.18-1.2-.7 0-1.2.5-1.2 1.2 0 .68.5 1.16 1.2 1.16zM68.7 18h1.9V9.7h-1.9V18zm5.77-6.78h1.39V9.7h-1.4V7.54h-1.9V9.7H71.3v1.52h1.26V18h1.9v-6.78zm2.9 10.1h1.9L83.98 9.7H82l-2.28 6.01-2.26-6.01h-2.03l3.34 8.24-1.4 3.39zm18-14.68l-3.24 8.8h-.03l-3.22-8.8h-2.19L91.06 18h2.02l4.4-11.36h-2.13zm7.94 3.07v1.19c-.53-.87-1.5-1.38-2.8-1.38-2.45 0-3.84 1.97-3.84 4.34 0 2.36 1.4 4.33 3.84 4.33 1.3 0 2.27-.51 2.8-1.37V18h1.76V9.71h-1.76zm-4.73 4.15c0-1.5.9-2.66 2.33-2.66 1.46 0 2.34 1.17 2.34 2.66 0 1.48-.88 2.65-2.34 2.65-1.44 0-2.33-1.17-2.33-2.65zm11.74 2.65c-1.16 0-1.77-.64-1.77-1.93V9.7h-1.9v4.78c0 2.13.98 3.71 3.67 3.71 2.68 0 3.66-1.58 3.66-3.71V9.7h-1.9v4.88c0 1.3-.61 1.93-1.76 1.93zm7.14 1.49V6h-1.9v12h1.9zm3.87-6.78h1.4V9.7h-1.4V7.54h-1.9V9.7h-1.27v1.52h1.27V18h1.9v-6.78z" fill="#001A3A"></path><path d="M24 12c0 5.25-.9 8.32-3.07 10.05C19.05 23.55 16.13 24 12 24c-4.72 0-7.8-.6-9.68-2.7C.68 19.5 0 16.57 0 12c0-4.88.75-7.88 2.63-9.6C4.5.52 7.5 0 12 0c4.43 0 7.43.53 9.3 2.33C23.25 4.04 24 7.04 24 12z" fill="#0065D4"></path><path d="M12 20.03a7.95 7.95 0 01-7.95-7.95 7.95 7.95 0 0115.9.07c0 4.43-3.6 7.88-7.95 7.88zM12 5.1a7.04 7.04 0 10-.02 14.08A7.04 7.04 0 0012 5.1z" fill="#1F95FF"></path><path d="M11.17 11.33V3.68c0-.45.38-.83.83-.83.45 0 .82.38.82.83v7.65c0 .45-.37.82-.82.82a.83.83 0 01-.83-.82z" fill="url(#subnav-logo_svg__paint0_linear)"></path><path d="M19.65 15.68l-7.27-4.2a.85.85 0 00-1.13.3c-.22.37-.07.82.3 1.05l7.28 4.2c.37.22.9.07 1.12-.3.23-.3.08-.83-.3-1.05z" fill="url(#subnav-logo_svg__paint1_linear)"></path><path d="M4.35 15.68l7.28-4.2a.85.85 0 011.12.3c.22.37.07.82-.3 1.05l-7.28 4.2a.85.85 0 01-1.12-.3c-.23-.3-.08-.83.3-1.05z" fill="url(#subnav-logo_svg__paint2_linear)"></path><path d="M12 8.48a3.68 3.68 0 10.01 7.36A3.68 3.68 0 0012 8.48z" fill="#fff"></path><defs><linearGradient id="subnav-logo_svg__paint0_linear" x1="12" y1="8.81" x2="12" y2="3.04" gradientUnits="userSpaceOnUse"><stop stop-color="#80BDFE"></stop><stop offset="1" stop-color="#DFF1FB"></stop></linearGradient><linearGradient id="subnav-logo_svg__paint1_linear" x1="14.95" y1="13.88" x2="19.94" y2="16.77" gradientUnits="userSpaceOnUse"><stop stop-color="#80BDFE"></stop><stop offset="1" stop-color="#DFF1FB"></stop></linearGradient><linearGradient id="subnav-logo_svg__paint2_linear" x1="9.02" y1="13.91" x2="4.03" y2="16.71" gradientUnits="userSpaceOnUse"><stop stop-color="#80BDFE"></stop><stop offset="1" stop-color="#DFF1FB"></stop></linearGradient></defs></svg>

packages/@ionic/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/cli",
3-
"version": "6.20.3",
3+
"version": "6.20.9",
44
"description": "A tool for creating and developing Ionic Framework mobile apps.",
55
"homepage": "https://ionicframework.com",
66
"author": "Ionic Team <hi@ionic.io> (https://ionicframework.com) ",

packages/@ionic/cli/src/commands/capacitor/build.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ export class BuildCommand extends CapacitorCommand implements CommandPreRun {
3636
const footnotes: Footnote[] = [
3737
{
3838
id: 'capacitor-native-config-docs',
39-
url: 'https://capacitor.ionicframework.com/docs/basics/configuring-your-app',
39+
url: 'https://capacitorjs.com/docs/basics/configuring-your-app',
4040
shortUrl: 'https://ion.link/capacitor-native-config-docs',
4141
},
4242
{
4343
id: 'capacitor-ios-config-docs',
44-
url: 'https://capacitor.ionicframework.com/docs/ios/configuration',
44+
url: 'https://capacitorjs.com/docs/ios/configuration',
4545
shortUrl: 'https://ion.link/capacitor-ios-config-docs',
4646
},
4747
{
4848
id: 'capacitor-android-config-docs',
49-
url: 'https://capacitor.ionicframework.com/docs/android/configuration',
49+
url: 'https://capacitorjs.com/docs/android/configuration',
5050
shortUrl: 'https://ion.link/capacitor-android-config-docs',
5151
},
5252
];

packages/@ionic/cli/src/commands/capacitor/copy.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { CommandInstanceInfo, CommandLineInputs, CommandLineOptions, CommandMeta
44
import { input } from '../../lib/color';
55

66
import { CapacitorCommand } from './base';
7+
import * as semver from "semver";
78

89
export class CopyCommand extends CapacitorCommand implements CommandPreRun {
910
async getMetadata(): Promise<CommandMetadata> {
@@ -14,6 +15,12 @@ export class CopyCommand extends CapacitorCommand implements CommandPreRun {
1415
type: Boolean,
1516
default: true,
1617
},
18+
{
19+
name: 'inline',
20+
summary: 'Use inline source maps (only available on capacitor 4.2.0+)',
21+
type: Boolean,
22+
default: false
23+
}
1724
];
1825

1926
const runner = this.project && await this.project.getBuildRunner();
@@ -59,6 +66,11 @@ ${input('ionic capacitor copy')} will do the following:
5966

6067
const args = ['copy'];
6168

69+
const capVersion = await this.getCapacitorVersion();
70+
if(semver.gte(capVersion, "4.2.0") && options.inline) {
71+
args.push("--inline")
72+
}
73+
6274
if (platform) {
6375
args.push(platform);
6476
}

packages/@ionic/cli/src/commands/capacitor/run.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,16 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
205205
);
206206
}
207207
} else {
208-
options['target'] = await this.env.prompt({
209-
type: 'list',
210-
name: 'target',
211-
message: 'Which device would you like to target?',
212-
choices: targets.map(t => ({ name: `${t.name} (${t.id})`, value: t.id })),
213-
});
208+
if (targets.length > 0) {
209+
options['target'] = await this.env.prompt({
210+
type: 'list',
211+
name: 'target',
212+
message: 'Which device would you like to target?',
213+
choices: targets.map(t => ({ name: `${t.name} (${t.id})`, value: t.id })),
214+
});
215+
} else {
216+
throw new FatalException(`No devices or emulators found`);
217+
}
214218

215219
if (!inputs[0]) {
216220
throw new FatalException(`The ${input('platform')} argument is required.`);

packages/@ionic/cli/src/commands/capacitor/sync.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { FatalException } from '../../lib/errors';
66
import { Hook, HookDeps } from '../../lib/hooks';
77

88
import { CapacitorCommand } from './base';
9+
import * as semver from 'semver';
910

1011
export class SyncCommand extends CapacitorCommand implements CommandPreRun {
1112
async getMetadata(): Promise<CommandMetadata> {
@@ -16,6 +17,12 @@ export class SyncCommand extends CapacitorCommand implements CommandPreRun {
1617
type: Boolean,
1718
default: true,
1819
},
20+
{
21+
name: 'inline',
22+
summary: 'Use inline source maps (only available on capacitor 4.1.0+)',
23+
type: Boolean,
24+
default: false
25+
}
1926
];
2027

2128
const runner = this.project && await this.project.getBuildRunner();
@@ -67,6 +74,11 @@ ${input('ionic capacitor sync')} will do the following:
6774

6875
const args = ['sync'];
6976

77+
const capVersion = await this.getCapacitorVersion();
78+
if(semver.gte(capVersion, "4.1.0") && options.inline) {
79+
args.push("--inline")
80+
}
81+
7082
if (platform) {
7183
args.push(platform);
7284
}

0 commit comments

Comments
 (0)