Skip to content

Commit 1fc3893

Browse files
committed
fix(plugin-build): invalid path argument
partially fixes #5387 This fixes the `ns plugin build` command, however `ns plugin create` will still fail - that's an issue with the plugin-seed - to be addressed separately.
1 parent becbe60 commit 1fc3893

File tree

2 files changed

+18
-24
lines changed

2 files changed

+18
-24
lines changed

.vscode/launch.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@
5252
},
5353
{
5454
"name": "Attach to Node Debugger",
55-
"port": 9229,
55+
"type": "node",
5656
"request": "attach",
57+
"port": 9229,
58+
"address": "127.0.0.1",
5759
"skipFiles": [
5860
"<node_internals>/**"
5961
],
60-
"type": "pwa-node"
62+
"sourceMaps": true
6163
}
6264
]
6365
}

lib/services/android-plugin-build-service.ts

+14-22
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RESOURCES_DIR,
77
AndroidBuildDefaults,
88
PLUGIN_BUILD_DATA_FILENAME,
9-
PlatformTypes,
9+
SCOPED_ANDROID_RUNTIME_NAME,
1010
} from "../constants";
1111
import { getShortPluginName, hook } from "../common/helpers";
1212
import { Builder, parseString } from "xml2js";
@@ -16,7 +16,6 @@ import {
1616
IAndroidToolsInfo,
1717
IWatchIgnoreListService,
1818
} from "../declarations";
19-
import { IBasePluginData } from "../definitions/plugins";
2019
import { IPlatformsDataService } from "../definitions/platform";
2120
import { IProjectDataService } from "../definitions/project";
2221
import {
@@ -440,16 +439,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
440439
}
441440

442441
if (!runtimeGradleVersions) {
443-
const runtimePackage = this.$projectDataService.getRuntimePackage(
444-
projectDir,
445-
PlatformTypes.android
446-
);
447-
const latestRuntimeVersion = await this.getLatestRuntimeVersion(
448-
runtimePackage
449-
);
442+
const latestRuntimeVersion = await this.getLatestRuntimeVersion();
450443
runtimeGradleVersions = await this.getGradleVersions(
451-
latestRuntimeVersion,
452-
runtimePackage
444+
latestRuntimeVersion
453445
);
454446
this.$logger.trace(
455447
`Got gradle versions ${JSON.stringify(
@@ -461,22 +453,23 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
461453
return runtimeGradleVersions || {};
462454
}
463455

464-
private async getLatestRuntimeVersion(
465-
runtimePackage: IBasePluginData
466-
): Promise<string> {
456+
private async getLatestRuntimeVersion(): Promise<string> {
467457
let runtimeVersion: string = null;
468458

469459
try {
470-
const result = await this.$packageManager.view(runtimePackage.name, {
471-
"dist-tags": true,
472-
});
460+
const result = await this.$packageManager.view(
461+
SCOPED_ANDROID_RUNTIME_NAME,
462+
{
463+
"dist-tags": true,
464+
}
465+
);
473466
runtimeVersion = result.latest;
474467
} catch (err) {
475468
this.$logger.trace(
476469
`Error while getting latest android runtime version from view command: ${err}`
477470
);
478471
const registryData = await this.$packageManager.getRegistryPackageData(
479-
runtimePackage.name
472+
SCOPED_ANDROID_RUNTIME_NAME
480473
);
481474
runtimeVersion = registryData["dist-tags"].latest;
482475
}
@@ -485,16 +478,15 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
485478
}
486479

487480
private async getGradleVersions(
488-
runtimeVersion: string,
489-
runtimePackage: IBasePluginData
481+
runtimeVersion: string
490482
): Promise<IRuntimeGradleVersions> {
491483
let runtimeGradleVersions: {
492484
gradle: { version: string; android: string };
493485
} = null;
494486

495487
try {
496488
const output = await this.$packageManager.view(
497-
`${runtimePackage.name}@${runtimeVersion}`,
489+
`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
498490
{ gradle: true }
499491
);
500492
runtimeGradleVersions = { gradle: output };
@@ -503,7 +495,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
503495
`Error while getting gradle data for android runtime from view command: ${err}`
504496
);
505497
const registryData = await this.$packageManager.getRegistryPackageData(
506-
runtimePackage.name
498+
SCOPED_ANDROID_RUNTIME_NAME
507499
);
508500
runtimeGradleVersions = registryData.versions[runtimeVersion];
509501
}

0 commit comments

Comments
 (0)