From a06fad974e66c8c5854985fe12fbadbb43cc9c7e Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 24 Dec 2016 11:10:18 +0800 Subject: Install vue and babel dependency --- webpackBaseConfig.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'webpackBaseConfig.js') diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 400db14b..5c715cc2 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -372,6 +372,10 @@ module.exports = { loaders: [{ test: /\.json$/, loader: 'json-loader' + }, { + test: /\.js$/, + loader: 'babel', + exclude: [/node_modules/, /public\/vendor/] }, { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader') -- cgit v1.3.1 From 99dd10772422b66b7f98f1483b5fa3225e3e86e0 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 24 Dec 2016 11:50:57 +0800 Subject: Basic setup for Vue app --- .editorconfig | 4 ++++ package.json | 2 ++ public/js/components/HelloWorld.vue | 21 +++++++++++++++++++++ public/js/cover.js | 6 ++++++ public/js/views/Cover.vue | 15 +++++++++++++++ public/views/index.ejs | 1 + webpackBaseConfig.js | 8 +++++++- 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 public/js/components/HelloWorld.vue create mode 100644 public/js/views/Cover.vue (limited to 'webpackBaseConfig.js') diff --git a/.editorconfig b/.editorconfig index 619c178d..b3e30251 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,10 @@ indent_size = 4 trim_trailing_whitespace = true insert_final_newline = true +[*.vue] +indent_style = space +indent_size = 2 + [*.md] trim_trailing_whitespace = false diff --git a/package.json b/package.json index 5ac7f554..d44313cd 100644 --- a/package.json +++ b/package.json @@ -116,6 +116,7 @@ "visibilityjs": "^1.2.4", "viz.js": "^1.4.1", "vue": "^2.1.6", + "vue-loader": "^10.0.2", "winston": "^2.3.0", "xss": "^0.3.2" }, @@ -162,6 +163,7 @@ "script-loader": "^0.7.0", "style-loader": "^0.13.1", "url-loader": "^0.5.7", + "vue-template-compiler": "^2.1.6", "webpack": "^1.14.0" } } diff --git a/public/js/components/HelloWorld.vue b/public/js/components/HelloWorld.vue new file mode 100644 index 00000000..d8e3007f --- /dev/null +++ b/public/js/components/HelloWorld.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/public/js/cover.js b/public/js/cover.js index 4696203e..b8886849 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -28,8 +28,14 @@ var saveAs = require('file-saver').saveAs; var List = require('list.js'); var S = require('string'); +import Cover from './views/Cover'; import Vue from 'vue'; +new Vue({ + el: '#cover-app', + render: (h) => h(Cover) +}) + var options = { valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'], item: '
  • \ diff --git a/public/js/views/Cover.vue b/public/js/views/Cover.vue new file mode 100644 index 00000000..767d087f --- /dev/null +++ b/public/js/views/Cover.vue @@ -0,0 +1,15 @@ + + + diff --git a/public/views/index.ejs b/public/views/index.ejs index adcdd34d..5b84f4fc 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -30,6 +30,7 @@
    +
    diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 5c715cc2..6c569c1e 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -338,7 +338,7 @@ module.exports = { path.resolve(__dirname, 'src'), path.resolve(__dirname, 'node_modules') ], - extensions: ["", ".js"], + extensions: ["", ".js", ".vue"], alias: { codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'), inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'), @@ -372,6 +372,12 @@ module.exports = { loaders: [{ test: /\.json$/, loader: 'json-loader' + }, { + test: /\.vue$/, + loader: 'vue', + options: { + // vue-loader options go here + } }, { test: /\.js$/, loader: 'babel', -- cgit v1.3.1 From 26d8942852f8d216d03138a6c3c1d350e6bc903e Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Sat, 21 Jan 2017 12:24:58 +0800 Subject: Revert experimental vue for now --- .editorconfig | 4 ---- package.json | 3 --- public/js/components/HelloWorld.vue | 21 --------------------- public/js/cover.js | 8 -------- public/js/views/Cover.vue | 15 --------------- public/views/index.ejs | 2 -- webpackBaseConfig.js | 8 +------- 7 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 public/js/components/HelloWorld.vue delete mode 100644 public/js/views/Cover.vue (limited to 'webpackBaseConfig.js') diff --git a/.editorconfig b/.editorconfig index b3e30251..619c178d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,10 +7,6 @@ indent_size = 4 trim_trailing_whitespace = true insert_final_newline = true -[*.vue] -indent_style = space -indent_size = 2 - [*.md] trim_trailing_whitespace = false diff --git a/package.json b/package.json index e22f9e73..1ed81c98 100644 --- a/package.json +++ b/package.json @@ -116,8 +116,6 @@ "velocity-animate": "^1.4.0", "visibilityjs": "^1.2.4", "viz.js": "^1.4.1", - "vue": "^2.1.6", - "vue-loader": "^10.0.2", "winston": "^2.3.0", "xss": "^0.3.3" }, @@ -164,7 +162,6 @@ "script-loader": "^0.7.0", "style-loader": "^0.13.1", "url-loader": "^0.5.7", - "vue-template-compiler": "^2.1.6", "webpack": "^1.14.0" } } diff --git a/public/js/components/HelloWorld.vue b/public/js/components/HelloWorld.vue deleted file mode 100644 index d8e3007f..00000000 --- a/public/js/components/HelloWorld.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/public/js/cover.js b/public/js/cover.js index 79b168d9..830564e8 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -29,14 +29,6 @@ import { saveAs } from 'file-saver'; import List from 'list.js'; import S from 'string'; -import Cover from './views/Cover'; -import Vue from 'vue'; - -new Vue({ - el: '#cover-app', - render: (h) => h(Cover) -}) - const options = { valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'], item: '
  • \ diff --git a/public/js/views/Cover.vue b/public/js/views/Cover.vue deleted file mode 100644 index 767d087f..00000000 --- a/public/js/views/Cover.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/public/views/index.ejs b/public/views/index.ejs index d258857c..b94daf5b 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -30,8 +30,6 @@
    -
    -

    diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index e618bffd..210001b1 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -338,7 +338,7 @@ module.exports = { path.resolve(__dirname, 'src'), path.resolve(__dirname, 'node_modules') ], - extensions: ["", ".js", ".vue"], + extensions: ["", ".js"], alias: { codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'), inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'), @@ -372,12 +372,6 @@ module.exports = { loaders: [{ test: /\.json$/, loader: 'json-loader' - }, { - test: /\.vue$/, - loader: 'vue', - options: { - // vue-loader options go here - } }, { test: /\.js$/, loader: 'babel', -- cgit v1.3.1 From 5ce5d4cd849f764cc563fc4cb1f3288ebb14a2a4 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Fri, 3 Feb 2017 22:04:43 +0800 Subject: Update to use babel-polyfill to support ES6 features in old browsers --- package.json | 1 + webpackBaseConfig.js | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'webpackBaseConfig.js') diff --git a/package.json b/package.json index f31c9da2..74de2c80 100644 --- a/package.json +++ b/package.json @@ -144,6 +144,7 @@ "babel-core": "^6.21.0", "babel-loader": "^6.2.10", "babel-plugin-transform-runtime": "^6.15.0", + "babel-polyfill": "^6.22.0", "babel-preset-es2015": "^6.18.0", "babel-runtime": "^6.20.0", "copy-webpack-plugin": "^4.0.1", diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 210001b1..419149c7 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -158,6 +158,7 @@ module.exports = { "bootstrap" ], cover: [ + "babel-polyfill", path.join(__dirname, 'public/js/cover.js') ], "cover-styles-pack": [ @@ -168,6 +169,7 @@ module.exports = { path.join(__dirname, 'node_modules/select2/select2-bootstrap.css'), ], "cover-pack": [ + "babel-polyfill", "bootstrap-validator", "script!listPagnation", "expose?select2!select2", @@ -176,6 +178,7 @@ module.exports = { path.join(__dirname, 'public/js/cover.js') ], index: [ + "babel-polyfill", "script!jquery-ui-resizable", "script!js-url", "expose?filterXSS!xss", @@ -221,6 +224,7 @@ module.exports = { path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') ], "index-pack": [ + "babel-polyfill", "expose?Spinner!spin.js", "script!jquery-ui-resizable", "bootstrap-validator", @@ -251,6 +255,7 @@ module.exports = { path.join(__dirname, 'public/js/index.js') ], pretty: [ + "babel-polyfill", "expose?filterXSS!xss", "flowchart.js", "js-sequence-diagrams", @@ -270,6 +275,7 @@ module.exports = { path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') ], "pretty-pack": [ + "babel-polyfill", "expose?jsyaml!js-yaml", "script!mermaid", "expose?moment!moment", @@ -285,6 +291,7 @@ module.exports = { path.join(__dirname, 'public/js/pretty.js') ], slide: [ + "babel-polyfill", "bootstrap-tooltip", "expose?filterXSS!xss", "flowchart.js", @@ -304,6 +311,7 @@ module.exports = { path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') ], "slide-pack": [ + "babel-polyfill", "expose?jQuery!expose?$!jquery", "velocity-animate", "imports?$=jquery!jquery-mousewheel", -- cgit v1.3.1