Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	.travis.yml

.travis.yml

@@ -6,15 +6,21 @@ os:
 language: node_js
 node_js:
   - 6.7.0
-python:
-  - "2.7"
+# python:
+#   - "2.7"
+before_install:
+  # pip already installed
+  # - curl -s https://bootstrap.pypa.io/get-pip.py | python 
+  # - pip install -U oss2
+  # - python -V
+  # - pip -V
 install:
   - npm install
   - cd script && npm install && cd ..
   - sh travis_before_script.sh
   # - sh travis_install_code_sign.sh
 # script: script/build --code-sign --compress-artifacts --deploy 
-script: echo "skip build"
+script: script/build
 cache:
   directories:
   - electron
@@ -37,4 +43,4 @@ cache:
 #   file: "FILE TO UPLOAD"
 #   skip_cleanup: true
 #   on:
-#     tags: true
+#     tags: true

full-build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-npm install 
+npm install --verbose  
 
 if [ $? == 0 ]; then
 	npm rebuild --runtime=electron --target=1.3.15 --disturl=https://atom.io/download/atom-shell --abi=49

package.json

@@ -2,7 +2,7 @@
   "name": "thera",
   "productName": "Thera",
   "version": "1.18.0-dev",
-  "theraVersion": "0.6.4-dev.8",
+  "theraVersion": "0.6.4",
   "description": "A Weex IDE",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -28,21 +28,21 @@
     "clear-cut": "^2.0.2",
     "coffee-script": "1.11.1",
     "color": "^0.7.3",
-    "console-panel": "git+https://github.com/TheraPackages/console-panel.git#v0.2.17",
+    "console-panel": "git+https://github.com/TheraPackages/console-panel.git#v0.2.22",
     "create-files": "git+https://github.com/TheraPackages/create-files.git#v0.0.2",
     "dedent": "^0.6.0",
     "devtron": "1.3.0",
     "atom-beautify": "git+https://github.com/TheraPackages/atom-beautify.git#v0.29.20",
-    "dumplings": "git+https://github.com/TheraPackages/dumplings.git#v2.0.15",
+    "dumplings": "git+https://github.com/TheraPackages/dumplings.git#v2.0.16",
     "linter": "git+https://github.com/TheraPackages/linter.git#v1.1.2",
     "we-syntax": "git+https://github.com/TheraPackages/we-syntax.git#v0.0.4",
     "autocomplete-weex": "git+https://github.com/TheraPackages/autocomplete-weex.git#v0.1.1",
     "autocomplete-weexvue": "git+https://github.com/TheraPackages/autocomplete-weexvue.git#v0.1.6",
     "atom-notifier": "git+https://github.com/TheraPackages/notifier.git#v0.5.4",
-    "symbols-tree-view": "git+https://github.com/TheraPackages/symbols-tree-view.git#v0.13.19",
+    "symbols-tree-view": "git+https://github.com/TheraPackages/symbols-tree-view.git#v0.13.27",
     "linter-weex": "git+https://github.com/TheraPackages/linter-weex.git#v0.1.4",
     "atom-ternjs": "git+https://github.com/TheraPackages/atom-ternjs.git#v0.18.3-beta.2",
-    "weex-run": "git+https://github.com/TheraPackages/weex-run.git#v1.1.53",
+    "weex-run": "git+https://github.com/TheraPackages/weex-run.git#v2.1.1",
     "event-kit": "^2.3.0",
     "find-parent-dir": "^0.3.0",
     "first-mate": "7.0.4",
@@ -57,12 +57,12 @@
     "jasmine-tagged": "^1.1.4",
     "jquery": "2.1.4",
     "key-path-helpers": "^0.4.0",
-    "one-dark-syntax": "git+https://github.com/TheraPackages/one-dark-syntax.git#v1.7.1-beta.2",
+    "one-dark-syntax": "git+https://github.com/TheraPackages/one-dark-syntax.git#v1.7.1-beta.3",
     "language-we": "git+https://github.com/TheraPackages/language-we.git#v0.0.8",
     "language-weexvue": "git+https://github.com/TheraPackages/language-weexvue.git#v0.2.4",
     "less-cache": "1.1.0",
     "line-top-index": "0.2.0",
-    "mainwindow": "git+https://github.com/TheraPackages/mainwindow.git#v0.1.21",
+    "mainwindow": "git+https://github.com/TheraPackages/mainwindow.git#v0.1.24",
     "marked": "^0.3.6",
     "minimatch": "^3.0.3",
     "mocha": "2.5.1",
@@ -89,33 +89,33 @@
     "text-buffer": "11.4.1",
     "thera-about": "0.1.1",
     "thera-background-tips": "git+https://github.com/TheraPackages/background-tips.git#v0.1.10",
-    "thera-debug-frontend": "git+https://github.com/TheraPackages/thera-debug-frontend.git#v0.2.20",
-    "thera-left-bar": "git+https://github.com/TheraPackages/thera-left-bar.git#v0.2.1",
-    "tool-bar": "git+https://github.com/TheraPackages/tool-bar.git#v1.0.14",
-    "tool-bar-main": "git+https://github.com/TheraPackages/tool-bar-main.git#v0.1.8",
+    "thera-debug-frontend": "git+https://github.com/TheraPackages/thera-debug-frontend.git#v0.2.23",
+    "thera-left-bar": "git+https://github.com/TheraPackages/thera-left-bar.git#v0.2.2",
+    "tool-bar": "git+https://github.com/TheraPackages/tool-bar.git#v2.0.8",
+    "tool-bar-main": "git+https://github.com/TheraPackages/tool-bar-main.git#v0.1.9",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "vue-template-compiler": "~2.1.8",
     "winreg": "^1.2.1",
-    "thera-autocomplete-plus-plus": "git+https://github.com/TheraPackages/thera-autocomplete-plus-plus.git#v0.1.7",
-    "thera-luaview": "git+https://github.com/TheraPackages/thera-luaview.git#v0.0.23",
+    "thera-autocomplete-plus-plus": "git+https://github.com/TheraPackages/thera-autocomplete-plus-plus.git#v0.1.8",
+    "thera-luaview": "git+https://github.com/TheraPackages/thera-luaview.git#v0.0.24",
     "yargs": "^3.23.0"
   },
   "packageDependencies": {
     "atom-beautify": "0.29.20",
-    "dumplings": "2.0.15",
+    "dumplings": "2.0.16",
     "linter": "1.1.2",
     "we-syntax": "0.0.4",
     "autocomplete-weex": "0.1.1",
     "autocomplete-weexvue": "0.1.6",
     "atom-notifier": "0.5.4",
-    "symbols-tree-view": "0.13.19",
+    "symbols-tree-view": "0.13.27",
     "linter-weex": "0.1.4",
     "atom-ternjs": "0.18.3-beta.2",
-    "weex-run": "1.1.53",
-    "thera-luaview": "0.0.23",
+    "weex-run": "2.1.1",
+    "thera-luaview": "0.0.24",
     "language-lua": "0.9.1",
-    "thera-left-bar": "0.2.1",
+    "thera-left-bar": "0.2.2",
     "language-we": "0.0.8",
     "language-weexvue": "0.2.4",
     "atom-dark-syntax": "0.28.0",
@@ -126,15 +126,15 @@
     "base16-tomorrow-light-theme": "1.5.0",
     "one-dark-ui": "1.10.4",
     "one-light-ui": "1.10.4",
-    "one-dark-syntax": "1.7.1-beta.2",
+    "one-dark-syntax": "1.7.1-beta.3",
     "one-light-syntax": "1.7.1",
     "solarized-dark-syntax": "1.1.2",
     "solarized-light-syntax": "1.1.2",
     "archive-view": "0.63.2",
     "autocomplete-atom-api": "0.10.1",
     "autocomplete-css": "0.16.1",
     "autocomplete-html": "0.7.3",
-    "thera-autocomplete-plus-plus": "0.1.7",
+    "thera-autocomplete-plus-plus": "0.1.8",
     "autocomplete-snippets": "1.11.0",
     "autoflow": "0.29.0",
     "autosave": "0.24.3",
@@ -205,15 +205,15 @@
     "language-toml": "0.18.1",
     "language-xml": "0.35.0",
     "language-yaml": "0.29.0",
-    "thera-debug-frontend": "0.2.20",
+    "thera-debug-frontend": "0.2.23",
     "thera-about": "0.1.1",
     "chart-d3": "0.0.0",
-    "console-panel": "0.2.17",
+    "console-panel": "0.2.22",
     "create-files": "0.0.2",
-    "mainwindow": "0.1.21",
+    "mainwindow": "0.1.24",
     "thera-debugger": "1.3.1",
-    "tool-bar": "1.0.14",
-    "tool-bar-main": "0.1.8",
+    "tool-bar": "2.0.8",
+    "tool-bar-main": "0.1.9",
     "thera-background-tips": "0.1.10"
   },
   "private": true,

script/lib/install-application.js

@@ -40,7 +40,7 @@ module.exports = function (packagedAppPath, installDir) {
   } else {
     const atomExecutableName = CONFIG.channel === 'beta' ? 'atom-beta' : 'atom'
     const apmExecutableName = CONFIG.channel === 'beta' ? 'apm-beta' : 'apm'
-    const appName = CONFIG.channel === 'beta' ? 'Atom Beta' : 'Atom'
+    const appName = CONFIG.channel === 'beta' ? 'Thera Beta' : 'Thera'
     const appDescription = CONFIG.appMetadata.description
     const prefixDirPath = installDir !== '' ? handleTilde(installDir) : path.join('/usr', 'local')
     const shareDirPath = path.join(prefixDirPath, 'share')

src/main-process/atom-window.coffee

@@ -25,7 +25,7 @@ class AtomWindow
 
     options =
       show: false
-      title: 'Atom'
+      title: 'Thera'
       # Add an opaque backgroundColor (instead of keeping the default
       # transparent one) to prevent subpixel anti-aliasing from being disabled.
       # We believe this is a regression introduced with Electron 0.37.3, and