Skip to content

Commit 6769a81

Browse files
FatmeFatme
committed
chore: fix lint errors
1 parent 762fcd6 commit 6769a81

File tree

6 files changed

+66
-94
lines changed

6 files changed

+66
-94
lines changed

‎lib/commands/appstore-upload.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class PublishIOS implements ICommand {
6363
ipaFilePath = await this.$buildPlatformService.buildPlatform(nativePlatformData, this.$projectData, buildPlatformData);
6464
} else {
6565
this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
66-
ipaFilePath = await this.$mainController.buildPlatform(platform, this.$projectData.projectDir, { ...this.$options, buildForAppStore: true })
66+
ipaFilePath = await this.$mainController.buildPlatform(platform, this.$projectData.projectDir, { ...this.$options, buildForAppStore: true });
6767
this.$logger.info(`Export at: ${ipaFilePath}`);
6868
}
6969
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
157157
envValue = [envValue];
158158
}
159159

160-
envValue.map((value: any) => args.push(`--env.${item}=${value}`))
160+
envValue.map((value: any) => args.push(`--env.${item}=${value}`));
161161
}
162162
});
163163

‎lib/services/workflow/workflow-data-service.ts‎

Lines changed: 37 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,43 @@ export type AddPlatformData = Pick<any, 'platformParam'> & Partial<Pick<IOptions
22
export type PreparePlatformData = Pick<any, 'nativePrepare'> & Pick<IOptions, 'env' | 'release'>;
33
export type IOSPrepareData = PreparePlatformData & Pick<IOptions, 'teamId' | 'provision'> & Pick<any, 'mobileProvisionData'>;
44

5+
export class BuildPlatformDataBase {
6+
constructor(protected options: IOptions | any) { }
7+
8+
public release = this.options.release;
9+
public clean = this.options.clean;
10+
public device = this.options.device;
11+
public iCloudContainerEnvironment = this.options.iCloudContainerEnvironment;
12+
public buildForDevice = this.options.forDevice;
13+
public buildOutputStdio = this.options.buildOutputStdio || "inherit";
14+
}
15+
16+
export class IOSBuildData extends BuildPlatformDataBase {
17+
constructor(options: IOptions) { super(options); }
18+
19+
public teamId = this.options.teamId;
20+
public provision = this.options.provision;
21+
public buildForAppStore = this.options.buildForAppStore;
22+
}
23+
24+
export class AndroidBuildData extends BuildPlatformDataBase {
25+
constructor(options: IOptions) { super(options); }
26+
27+
public keyStoreAlias = this.options.keyStoreAlias;
28+
public keyStorePath = this.options.keyStorePath;
29+
public keyStoreAliasPassword = this.options.keyStoreAliasPassword;
30+
public keyStorePassword = this.options.keyStorePassword;
31+
public androidBundle = this.options.aab;
32+
}
33+
34+
export class DeployPlatformData {
35+
constructor(private options: IOptions) { }
36+
37+
public clean = this.options.clean;
38+
public release = this.options.release;
39+
public forceInstall = true;
40+
}
41+
542
export class WorkflowDataService {
643
constructor(
744
private $injector: IInjector,
@@ -85,64 +122,3 @@ export class WorkflowData {
85122
public liveSyncData: any;
86123
public restartOnDeviceData: any;
87124
}
88-
89-
// export class AddPlatformData {
90-
// constructor(private platform: string, private options: IOptions | any) { }
91-
92-
// public platformParam = this.options.platformParam || this.platform;
93-
// public frameworkPath = this.options.frameworkPath;
94-
// public nativePrepare = this.options.nativePrepare;
95-
// }
96-
97-
// export class PreparePlatformData {
98-
// constructor(protected options: IOptions | any) { }
99-
100-
// public env = this.options.env;
101-
// public release = this.options.release;
102-
// public nativePrepare = this.options.nativePrepare;
103-
// }
104-
105-
// export class IOSPrepareData extends PreparePlatformData {
106-
// constructor(options: IOptions | any) { super(options); }
107-
108-
// public teamId = this.options.teamId;
109-
// public provision = this.options.provision;
110-
// public mobileProvisionData = this.options.mobileProvisionData;
111-
// }
112-
113-
export class BuildPlatformDataBase {
114-
constructor(protected options: IOptions | any) { }
115-
116-
public release = this.options.release;
117-
public clean = this.options.clean;
118-
public device = this.options.device;
119-
public iCloudContainerEnvironment = this.options.iCloudContainerEnvironment;
120-
public buildForDevice = this.options.forDevice;
121-
public buildOutputStdio = this.options.buildOutputStdio || "inherit";
122-
}
123-
124-
export class IOSBuildData extends BuildPlatformDataBase {
125-
constructor(options: IOptions) { super(options); }
126-
127-
public teamId = this.options.teamId;
128-
public provision = this.options.provision;
129-
public buildForAppStore = this.options.buildForAppStore;
130-
}
131-
132-
export class AndroidBuildData extends BuildPlatformDataBase {
133-
constructor(options: IOptions) { super(options); }
134-
135-
public keyStoreAlias = this.options.keyStoreAlias;
136-
public keyStorePath = this.options.keyStorePath;
137-
public keyStoreAliasPassword = this.options.keyStoreAliasPassword;
138-
public keyStorePassword = this.options.keyStorePassword;
139-
public androidBundle = this.options.aab;
140-
}
141-
142-
export class DeployPlatformData {
143-
constructor(private options: IOptions) { }
144-
145-
public clean = this.options.clean;
146-
public release = this.options.release;
147-
public forceInstall = true;
148-
}

‎test/controllers/run-on-devices-controller.ts‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,32 @@ import { WorkflowDataService } from "../../lib/services/workflow/workflow-data-s
99

1010
let isBuildPlatformCalled = false;
1111
const appIdentifier = "org.nativescript.myCoolApp";
12+
const projectDir = "path/to/my/projectDir";
13+
const projectData = { projectDir, projectIdentifiers: { ios: appIdentifier, android: appIdentifier }};
14+
const buildOutputPath = `${projectDir}/platform/ios/build/myproject.app`;
15+
16+
const iOSDevice = <any>{ deviceInfo: { identifier: "myiOSDevice", platform: "ios" } };
17+
const iOSDeviceDescriptor = { identifier: "myiOSDevice", buildAction: async () => buildOutputPath };
18+
const androidDevice = <any>{ deviceInfo: { identifier: "myAndroidDevice", platform: "android" } };
19+
const androidDeviceDescriptor = { identifier: "myAndroidDevice", buildAction: async () => buildOutputPath };
20+
21+
const map: IDictionary<{device: Mobile.IDevice, descriptor: ILiveSyncDeviceInfo}> = {
22+
ios: {
23+
device: iOSDevice,
24+
descriptor: iOSDeviceDescriptor
25+
},
26+
android: {
27+
device: androidDevice,
28+
descriptor: androidDeviceDescriptor
29+
}
30+
};
31+
32+
const liveSyncInfo = {
33+
projectDir,
34+
release: false,
35+
useHotModuleReload: false,
36+
env: {}
37+
};
1238

1339
function getFullSyncResult(): ILiveSyncResultInfo {
1440
return <any>{
@@ -75,33 +101,6 @@ function createTestInjector() {
75101
return injector;
76102
}
77103

78-
const projectDir = "path/to/my/projectDir";
79-
const projectData = { projectDir, projectIdentifiers: { ios: appIdentifier, android: appIdentifier }};
80-
const buildOutputPath = `${projectDir}/platform/ios/build/myproject.app`;
81-
82-
const iOSDevice = <any>{ deviceInfo: { identifier: "myiOSDevice", platform: "ios" } };
83-
const iOSDeviceDescriptor = { identifier: "myiOSDevice", buildAction: async () => buildOutputPath };
84-
const androidDevice = <any>{ deviceInfo: { identifier: "myAndroidDevice", platform: "android" } };
85-
const androidDeviceDescriptor = { identifier: "myAndroidDevice", buildAction: async () => buildOutputPath };
86-
87-
const map: IDictionary<{device: Mobile.IDevice, descriptor: ILiveSyncDeviceInfo}> = {
88-
ios: {
89-
device: iOSDevice,
90-
descriptor: iOSDeviceDescriptor
91-
},
92-
android: {
93-
device: androidDevice,
94-
descriptor: androidDeviceDescriptor
95-
}
96-
};
97-
98-
const liveSyncInfo = {
99-
projectDir,
100-
release: false,
101-
useHotModuleReload: false,
102-
env: {}
103-
};
104-
105104
describe("RunOnDevicesController", () => {
106105
let injector: IInjector = null;
107106
let runOnDevicesController: RunOnDevicesController = null;

‎test/services/platform/build-platform-service.ts‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎test/services/platform/platform-watcher-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe("PlatformWatcherService", () => {
7676

7777
const preparePlatformService = injector.resolve("preparePlatformService");
7878
preparePlatformService.prepareNativePlatform = async () => {
79-
const nativeFilesWatcher = (<any>platformWatcherService).watchersData[projectData.projectDir][platformData.platformNameLowerCase].nativeFilesWatcher;
79+
const nativeFilesWatcher = (<any>platformWatcherService).watchersData[projectData.projectDir][platform.toLowerCase()].nativeFilesWatcher;
8080
nativeFilesWatcher.emit("all", "change", "my/project/App_Resources/some/file");
8181
isNativePrepareCalled = true;
8282
return false;

0 commit comments

Comments
 (0)