Skip to content

Commit f5fb601

Browse files
committed
fix: now supports custom webpack package through config.webpackPackageName
1 parent c5e32a0 commit f5fb601

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

lib/definitions/project.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ interface INsConfig {
159159
buildPath?: string;
160160
shared?: boolean;
161161
overridePods?: string;
162+
webpackPackageName?: string;
162163
webpackConfigPath?: string;
163164
ios?: INsConfigIOS;
164165
android?: INsConfigAndroid;

lib/services/webpack/webpack-compiler-service.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -599,14 +599,10 @@ export class WebpackCompilerService
599599

600600
private getWebpackExecutablePath(projectData: IProjectData): string {
601601
if (this.isWebpack5(projectData)) {
602-
let packagePath = resolvePackagePath("@akylas/nativescript-webpack", {
602+
const packageName = projectData.nsConfig.webpackPackageName || WEBPACK_PLUGIN_NAME;
603+
let packagePath = resolvePackagePath(packageName, {
603604
paths: [projectData.projectDir],
604605
});
605-
if (!packagePath) {
606-
packagePath = resolvePackagePath(WEBPACK_PLUGIN_NAME, {
607-
paths: [projectData.projectDir],
608-
});
609-
}
610606

611607
if (packagePath) {
612608
return path.resolve(packagePath, "dist", "bin", "index.js");
@@ -625,14 +621,10 @@ export class WebpackCompilerService
625621
}
626622

627623
private isWebpack5(projectData: IProjectData): boolean {
628-
let packageJSONPath = resolvePackageJSONPath("@akylas/nativescript-webpack", {
624+
const packageName = projectData.nsConfig.webpackPackageName || WEBPACK_PLUGIN_NAME;
625+
const packageJSONPath = resolvePackageJSONPath(packageName, {
629626
paths: [projectData.projectDir],
630627
});
631-
if (!packageJSONPath) {
632-
packageJSONPath = resolvePackageJSONPath(WEBPACK_PLUGIN_NAME, {
633-
paths: [projectData.projectDir],
634-
});
635-
}
636628

637629
if (packageJSONPath) {
638630
const packageData = this.$fs.readJson(packageJSONPath);

0 commit comments

Comments
 (0)