Merge branch 'master' of https://github.com/alibaba/Thera

# Conflicts: # package.json
alibaba · Mar 30, 2017 · ce4bbc4 · ce4bbc4
2 parents a44e3d6 + 1479571
commit ce4bbc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -198,7 +198,8 @@
     "linter": "git+https://github.com/TheraPackages/linter.git#v1.0.8",
     "autocomplete-weex": "git+https://github.com/TheraPackages/autocomplete-weex.git",
     "atom-notifier": "git+https://github.com/TheraPackages/notifier.git#v0.5.3",
-    "weex-run": "git+https://github.com/TheraPackages/weex-run.git#v1.1.14"
+    "weex-run": "git+https://github.com/TheraPackages/weex-run.git#v1.1.14",
+    "atom-beautify": "git+https://github.com/TheraPackages/atom-beautify.git#v0.29.19"
   },
   "standard": {
     "ignore": [],

diff --git a/script/lib/package-application.js b/script/lib/package-application.js
@@ -130,11 +130,11 @@ function installAttachPackages (packagedAppPath, bundledResourcesPath) {
 
 function copyResourceInPackage (packagedAppPath, bundledResourcesPath) {
   console.log('copyResourceInPackage')
-  findAndMoveResourceInPackage(path.join(CONFIG.repositoryRootPath, 'node_modules', '*', 'package.json'), bundledResourcesPath)
-  findAndMoveResourceInPackage(path.join(bundledResourcesPath, 'attach-package', '*', 'package.json'), bundledResourcesPath)
+  findAndMoveResourceInPackage(path.join(CONFIG.repositoryRootPath, 'node_modules', '*', 'package.json'), bundledResourcesPath, false)
+  findAndMoveResourceInPackage(path.join(bundledResourcesPath, 'attach-package', '*', 'package.json'), bundledResourcesPath, true)
 }
 
-function findAndMoveResourceInPackage (searchPath, bundledResourcesPath) {
+function findAndMoveResourceInPackage (searchPath, bundledResourcesPath, remove) {
   glob.sync(searchPath)
   .map((packagePath) => {
     return {
@@ -155,8 +155,10 @@ function findAndMoveResourceInPackage (searchPath, bundledResourcesPath) {
     let toPath = path.join(bundledResourcesPath, 'attach-resources', dirName, info.obj.attachResource)
     console.log(`copy ${fromPath} to ${toPath}`)
     fs.copySync(fromPath, toPath, {recursive: true})
-    console.log(`remove ${fromPath}`)
-    fs.removeSync(fromPath)
+    if (remove) {
+      console.log(`remove ${fromPath}`)
+      fs.removeSync(fromPath)
+    }
   })
 }