Merge remote-tracking branch 'origin/develop' into aviraldg-babelrc

Add plugin that makes babel 6 not break everything
Merge pull request #2472 from vector-im/revert-2461-aviraldg-babelrc
2016-10-17 15:40:37 +01:00 · 2016-10-17 15:37:31 +01:00 · 2016-10-14 18:51:02 +01:00 · 2016-10-14 18:50:22 +01:00 · 2016-10-14 18:21:26 +01:00 · 2016-10-14 18:19:43 +01:00
3 changed files with 22 additions and 7 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["react", "es2015", "es2016"],
+  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-generator", "transform-runtime", "add-module-exports"]
+}
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.6.3",
-    "matrix-react-sdk": "0.7.4",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
    "modernizr": "^3.1.0",
    "q": "^1.4.1",
    "react": "^15.2.1",
@@ -61,9 +61,20 @@
    "url": "^0.11.0"
  },
  "devDependencies": {
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
+    "babel-cli": "^6.5.2",
+    "babel-core": "^6.14.0",
+    "babel-eslint": "^6.1.0",
+    "babel-loader": "^6.2.5",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-async-to-generator": "^6.16.0",
+    "babel-plugin-transform-class-properties": "^6.16.0",
+    "babel-plugin-transform-object-rest-spread": "^6.16.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-es2016": "^6.16.0",
+    "babel-preset-es2017": "^6.16.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-2": "^6.17.0",
    "catw": "^1.0.1",
    "cpx": "^1.3.2",
    "css-raw-loader": "^0.1.1",
--- a/vector/config.sample.json
+++ b/vector/config.sample.json
@@ -2,8 +2,8 @@
    "default_hs_url": "https://matrix.org",
    "default_is_url": "https://vector.im",
    "brand": "Riot",
-    "integrations_ui_url": "http://localhost:8081/",
-    "integrations_rest_url": "http://localhost:5050",
+    "integrations_ui_url": "https://scalar.vector.im/",
+    "integrations_rest_url": "https://scalar.vector.im/api",
    "enableLabs": true,
    "roomDirectory": {
        "servers": [
Author	SHA1	Message	Date
David Baker	faa5a4df9d	Merge remote-tracking branch 'origin/develop' into aviraldg-babelrc	2016-10-17 15:40:37 +01:00
David Baker	28ddde28b9	Add plugin that makes babel 6 not break everything	2016-10-17 15:37:31 +01:00
David Baker	740ab7e479	Merge pull request #2472 from vector-im/revert-2461-aviraldg-babelrc Revert "Switch to babel 6"	2016-10-14 18:51:02 +01:00
David Baker	ea09a25563	Revert "Switch to babel 6"	2016-10-14 18:50:22 +01:00
David Baker	5a08c62f1b	Use the default integrations URLs in the sample localhost is not a sensible default	2016-10-14 18:21:26 +01:00
David Baker	be1d7781c5	Merge pull request #2461 from vector-im/aviraldg-babelrc Switch to babel 6	2016-10-14 18:19:43 +01:00
David Baker	40ac80a3e9	Replace stage & es2017 with specific plugins Also sort out regenerator runtime as it turns out importing babel-polyfill in your code is insufficient if using webpack because it's imported too late, so use both that and regenerator-runtime. Sigh.	2016-10-14 18:03:22 +01:00
David Baker	5f747e1a90	Remove transform-runtime We use instance methods (or at least, draft.js does) so we need babel-polyfill instead.	2016-10-13 10:57:10 +01:00
David Baker	0c3537ac1a	Remove presets from karma.conf seemt o be picked up from .babelrc	2016-10-13 09:51:10 +01:00
David Baker	e6caf9ece4	move babelcheck.js to scripts/	2016-10-13 09:50:40 +01:00
David Baker	34c60c69d8	shebang	2016-10-13 09:41:09 +01:00
David Baker	5ff915476a	Reminder to restore links + stage2, not stage 0	2016-10-12 18:08:52 +01:00
David Baker	e5d2ebc57c	Add babelcheck.js As per `4bea0c0818`	2016-10-12 17:46:11 +01:00
David Baker	64815b1b0b	Remove babel-polyfill Should be no need for it if we're using transform-runtime (and we definitely don't need it twice...)	2016-10-12 17:23:01 +01:00
David Baker	59120d3019	Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc	2016-10-12 17:17:10 +01:00
David Baker	9245ab01f1	js-sdk & react-sdk develop	2016-10-12 11:52:18 +01:00
Aviral Dasgupta	9174b32ef1	Upgrade to babel6 and enable some presets.	2016-10-02 17:28:24 +05:30