Skip to content

Commit 61f3abc

Browse files
authored
v1.95 (#206)
* feat: detect out folder for adding Capacitor to NextJS projects * feat: support for serve, build, start scripts and plugin repos
1 parent 6ce5919 commit 61f3abc

File tree

6 files changed

+20
-4
lines changed

6 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Changelog
22

3+
### Version 1.95
4+
5+
- Support for NextJS projects using static exports with an `out` folder
6+
- Support for Non-Ionic projects using `serve`, `build` and `start` scripts
7+
- Support for Capacitor Plugin monorepos
8+
39
### Version 1.94
410

511
- Options for running in the web browser, VS Code editor, Nexus browser added as icons

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ionic",
33
"displayName": "Ionic",
44
"description": "Official extension for Ionic and Capacitor development",
5-
"version": "1.94.2",
5+
"version": "1.95.0",
66
"icon": "media/ionic.png",
77
"publisher": "Ionic",
88
"keywords": [

src/capacitor-config-file.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ export function getCapacitorConfigDistFolder(folder: string): string {
4242
result = 'dist';
4343
} else if (existsSync(join(folder, 'build'))) {
4444
result = 'build';
45+
} else if (existsSync(join(folder, 'out'))) {
46+
result = 'out';
4547
}
4648
}
4749
if (!result) {

src/ionic-build.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ function guessBuildCommand(project: Project): string | undefined {
110110
const packageFile = JSON.parse(readFileSync(filename, 'utf8'));
111111
if (packageFile.scripts['ionic:build']) {
112112
return npmRun('ionic:build');
113+
} else if (packageFile.scripts['build']) {
114+
return npmRun('build');
113115
}
114116
}
115117
return undefined;

src/ionic-serve.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,15 @@ function guessServeCommand(project: Project): string | undefined {
124124
const packageFile = JSON.parse(readFileSync(filename, 'utf8'));
125125
if (packageFile.scripts['ionic:serve']) {
126126
return npmRun('ionic:serve');
127-
}
128-
if (packageFile.scripts?.serve) {
127+
} else if (packageFile.scripts?.serve) {
129128
return npmRun('serve');
129+
} else if (packageFile.scripts?.start) {
130+
return npmRun('start');
130131
}
131132
}
132133
return undefined;
133134
}
135+
134136
async function findNextPort(port: number, host: string | undefined): Promise<number> {
135137
let availablePort = port;
136138
while (await isPortInUse(availablePort, host)) {

src/monorepo.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,11 @@ function checkFolder(filename: string): FolderType {
393393
pck?.dependencies?.['@capacitor/android'] ||
394394
pck?.dependencies?.['@angular/core']
395395
);
396-
return isIonic ? FolderType.hasIonic : pck.dependencies ? FolderType.hasDependencies : FolderType.unknown;
396+
return isIonic
397+
? FolderType.hasIonic
398+
: pck.dependencies || pck.devDependencies
399+
? FolderType.hasDependencies
400+
: FolderType.unknown;
397401
} catch {
398402
return FolderType.unknown;
399403
}

0 commit comments

Comments
 (0)