tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:doric run ios support devices

Browse Source
This commit is contained in:
pengfeizhou 2021-02-26 18:33:07 +08:00 committed by osborn
parent 130461769a
commit 6eee43df9b
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doric-cli/assets/_package.json
View File

@ -25,5 +25,8 @@
"@rollup/plugin-image": "^2.0.5", "@rollup/plugin-image": "^2.0.5",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.4.0" "@rollup/plugin-node-resolve": "^8.4.0"
},
"optionalDependencies": {
"ios-deploy": "^1.11.4"
} }
} }

28
doric-cli/src/run.ts
View File

@ -4,8 +4,6 @@ import { glob } from "./util";
import path from "path"; import path from "path";
import xml2js, { Element } from "xml-js"; import xml2js, { Element } from "xml-js";
import inquirer from "inquirer"; import inquirer from "inquirer";
import { constants } from "buffer";
import { blue } from "colors";
export async function run(platform: string) { export async function run(platform: string) {
switch (platform.toLowerCase()) { switch (platform.toLowerCase()) {
@ -183,7 +181,7 @@ async function runiOS() {
[ [
"-workspace", workspace, "-workspace", workspace,
"-scheme", scheme, "-scheme", scheme,
"-sdk", "iphonesimulator", ...selectedDevice.isSimulator ? ["-sdk", "iphonesimulator",] : [],
"-derivedDataPath", "build" "-derivedDataPath", "build"
], ],
{ {
@ -197,8 +195,9 @@ async function runiOS() {
console.log("Compile error".red); console.log("Compile error".red);
return; return;
} }
const iOSAPPs = await glob("**/*.app", { cwd: path.resolve(iOSDir, "build") }); const iOSAPPs = await glob(
`**/*${selectedDevice.isSimulator ? "iphonesimulator" : "iphoneos"}/*.app`,
{ cwd: path.resolve(iOSDir, "build") });
if (iOSAPPs?.length !== 1) { if (iOSAPPs?.length !== 1) {
console.log("Cannot find built app".red); console.log("Cannot find built app".red);
return; return;
@ -207,8 +206,23 @@ async function runiOS() {
console.log("Built iOS APP".green, iOSAPP.blue); console.log("Built iOS APP".green, iOSAPP.blue);
console.log("===================="); console.log("====================");
await Shell.exec("xcrun", ["instruments", "-w", selectedDevice.deviceId])
console.log("Installing APP to".green, selectedDevice.name.blue); console.log("Installing APP to".green, selectedDevice.name.blue);
if (selectedDevice.isSimulator) {
const pxjFile = path.resolve(iOSDir, (await glob("**/project.pbxproj", { cwd: iOSDir }))[0]);
const pxjContent = await fs.promises.readFile(pxjFile, "utf-8");
const bundleId = /PRODUCT_BUNDLE_IDENTIFIER\s=\s(\S*?);/g.exec(pxjContent)?.[1];
await Shell.exec("xcrun", ["instruments", "-w", selectedDevice.deviceId])
await Shell.exec("xcrun", ["simctl", "install", selectedDevice.deviceId, iOSAPP]); await Shell.exec("xcrun", ["simctl", "install", selectedDevice.deviceId, iOSAPP]);
await Shell.exec("xcrun", ["simctl", "launch", selectedDevice.deviceId, "pub.doric.ios.hellodoric"]); await Shell.exec("xcrun", ["simctl", "launch", selectedDevice.deviceId, bundleId || `pub.doric.ios.${scheme.toLowerCase()}`]);
} else {
const iosDeploy = path.resolve("node_modules", ".bin", "ios-deploy")
await Shell.exec(
iosDeploy,
[
"--id", selectedDevice.deviceId,
"--justlaunch",
"--debug",
"--bundle", iOSAPP
])
}
} }