Merge pull request #42 from dart-native/bugfix/exception_fix

yulingtianxia · web-flow · commit 170e2833f5ed · 2020-08-30T23:40:22.000+08:00
fix error and exception.
diff --git a/lib/main.js b/lib/main.js
@@ -112,7 +112,7 @@ function formatDartFile(dartPath) {
 }
 
 function createFlutterPackage(template, projectName) {
-    var command = 'flutter create --template=' + template + ' --project-name ' + projectName + ' ' + outputDir
+    var command = 'flutter create --platforms=android,ios --template=' + template + ' --project-name ' + projectName + ' ' + outputDir
     execSync(command, { stdio: 'inherit' })
 }
 
@@ -130,7 +130,7 @@ function writeDependencyToPubSpec(filePath) {
 
 function generateDartWithWorker(content, path, script) {
     return new Promise((resolve, reject) => {
-        if (this.isMainThread) {
+        if (this.isMainThread || !isSupportWorkerThreads) {
             const convert = require(script).convert
             convert(content, (result, error) => {
                 resolve({ result: result, error: error })

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ function formatDartFile(dartPath) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`function createFlutterPackage(template, projectName) {`
`115`		`- var command = 'flutter create --template=' + template + ' --project-name ' + projectName + ' ' + outputDir`
	`115`	`+ var command = 'flutter create --platforms=android,ios --template=' + template + ' --project-name ' + projectName + ' ' + outputDir`
`116`	`116`	`execSync(command, { stdio: 'inherit' })`
`117`	`117`	`}`
`118`	`118`
`@@ -130,7 +130,7 @@ function writeDependencyToPubSpec(filePath) {`
`130`	`130`
`131`	`131`	`function generateDartWithWorker(content, path, script) {`
`132`	`132`	`return new Promise((resolve, reject) => {`
`133`		`- if (this.isMainThread) {`
	`133`	`+ if (this.isMainThread \|\| !isSupportWorkerThreads) {`
`134`	`134`	`const convert = require(script).convert`
`135`	`135`	`convert(content, (result, error) => {`
`136`	`136`	`resolve({ result: result, error: error })`