Swap to vue via node_module; no staging.

galaxyproject · Dec 11, 2017 · 6eaa73e · 6eaa73e
1 parent 3d98924
commit 6eaa73e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/client/galaxy/scripts/apps/admin.js b/client/galaxy/scripts/apps/admin.js
@@ -10,7 +10,7 @@ import QueryStringParsing from "utils/query-string-parsing";
 import Router from "layout/router";
 import Utils from "utils/utils";
 import Page from "layout/page";
-import Vue from "libs/vue";
+import Vue from "vue";
 import UserAPIKeys from "components/UserAPIKeys.vue";
 
 window.app = function app(options, bootstrapped) {

diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js
@@ -22,7 +22,7 @@ import Ui from "mvc/ui/ui-misc";
 import DatasetError from "mvc/dataset/dataset-error";
 import DatasetEditAttributes from "mvc/dataset/dataset-edit-attributes";
 import Citations from "components/Citations.vue";
-import Vue from "libs/vue";
+import Vue from "vue";
 
 /** define the 'Analyze Data'/analysis/main/home page for Galaxy
  *  * has a masthead

diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js
@@ -7,7 +7,7 @@ import Deferred from "utils/deferred";
 import Ui from "mvc/ui/ui-misc";
 import FormBase from "mvc/form/form-view";
 import Citations from "components/Citations.vue";
-import Vue from "libs/vue";
+import Vue from "vue";
 export default FormBase.extend({
     initialize: function(options) {
         var self = this;

diff --git a/client/gulpfile.js b/client/gulpfile.js
@@ -34,8 +34,7 @@ var paths = {
         'jquery-mousewheel': [ 'jquery.mousewheel.js', 'jquery/jquery.mousewheel.js' ],
         'raven-js': ['dist/raven.js', 'raven.js'],
         'requirejs': [ 'require.js', 'require.js' ],
-        'underscore': [ 'underscore.js', 'underscore.js' ],
-        'vue': [ 'dist/vue.js', 'vue.js' ]
+        'underscore': [ 'underscore.js', 'underscore.js' ]
     },
     libs: ['galaxy/scripts/libs/**/*.js']
 };

diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -25,7 +25,7 @@ var commonLibs = [
     "libs/farbtastic",
     "libs/bootstrap",
     "libs/bootstrap-tour",
-    "libs/vue",
+    "vue",
     // mvc
     "libs/underscore",
     "libs/backbone",

diff --git a/static/scripts/libs/vue.js b/static/scripts/libs/vue.js