Skip to content

Commit ea09a25

Browse files
dbkrdbkr
authored
Revert "Switch to babel 6"
1 parent 5a08c62 commit ea09a25

File tree

7 files changed

+41
-114
lines changed

7 files changed

+41
-114
lines changed

‎.babelrc‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@
1010
/vector/config.json
1111
/vector/olm.js
1212
.DS_Store
13-
npm-debug.log

‎karma.conf.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,13 @@ module.exports = function (config) {
9292
test: /\.js$/, loader: "babel",
9393
include: [path.resolve('./src'),
9494
path.resolve('./test'),
95-
]
95+
],
96+
query: {
97+
// we're using babel 5, for consistency with
98+
// the release build, which doesn't use the
99+
// presets.
100+
// presets: ['react', 'es2015'],
101+
},
96102
},
97103
],
98104
noParse: [

‎package.json‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
2020
"build:bundle:dev": "webpack --optimize-occurence-order lib/vector/index.js vector/bundle.js",
2121
"build:staticfiles": "cpx -v node_modules/olm/olm.js vector/",
22-
"build": "node scripts/babelcheck.js && npm run build:staticfiles && npm run build:emojione && npm run build:css && npm run build:compile && npm run build:bundle",
22+
"build": "npm run build:staticfiles && npm run build:emojione && npm run build:css && npm run build:compile && npm run build:bundle",
2323
"build:dev": "npm run build:staticfiles && npm run build:emojione && npm run build:css && npm run build:compile && npm run build:bundle:dev",
2424
"package": "scripts/package.sh",
2525
"start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w",
@@ -28,7 +28,7 @@
2828
"start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",
2929
"start:staticfiles": "cpx -Lwv node_modules/olm/olm.js vector/",
3030
"//cache": "Note the -c 1 below due to https://code.google.com/p/chromium/issues/detail?id=508270",
31-
"start": "node scripts/babelcheck.js && parallelshell \"npm run start:staticfiles\" \"npm run start:emojione\" \"npm run start:js\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
31+
"start": "parallelshell \"npm run start:staticfiles\" \"npm run start:emojione\" \"npm run start:js\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
3232
"start:prod": "parallelshell \"npm run start:staticfiles\" \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\" \"http-server -c 1 vector\"",
3333
"clean": "rimraf lib vector/olm.js vector/bundle.css vector/bundle.js vector/bundle.js.map vector/webpack.css* vector/emojione",
3434
"prepublish": "npm run build:css && npm run build:compile",
@@ -37,7 +37,6 @@
3737
},
3838
"dependencies": {
3939
"babel-polyfill": "^6.5.0",
40-
"babel-runtime": "^6.11.6",
4140
"browser-request": "^0.3.3",
4241
"classnames": "^2.1.2",
4342
"draft-js": "^0.8.1",
@@ -62,19 +61,9 @@
6261
"url": "^0.11.0"
6362
},
6463
"devDependencies": {
65-
"babel-cli": "^6.5.2",
66-
"babel-core": "^6.14.0",
67-
"babel-eslint": "^6.1.0",
68-
"babel-loader": "^6.2.5",
69-
"babel-plugin-transform-async-to-generator": "^6.16.0",
70-
"babel-plugin-transform-class-properties": "^6.16.0",
71-
"babel-plugin-transform-object-rest-spread": "^6.16.0",
72-
"babel-plugin-transform-runtime": "^6.15.0",
73-
"babel-preset-es2015": "^6.16.0",
74-
"babel-preset-es2016": "^6.16.0",
75-
"babel-preset-es2017": "^6.16.0",
76-
"babel-preset-react": "^6.16.0",
77-
"babel-preset-stage-2": "^6.17.0",
64+
"babel": "^5.8.23",
65+
"babel-core": "^5.8.25",
66+
"babel-loader": "^5.3.2",
7867
"catw": "^1.0.1",
7968
"cpx": "^1.3.2",
8069
"css-raw-loader": "^0.1.1",

‎scripts/babelcheck.js‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/component-index.js‎

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -26,61 +26,32 @@ limitations under the License.
2626

2727
module.exports.components = require('matrix-react-sdk/lib/component-index').components;
2828

29-
import structures$BottomLeftMenu from './components/structures/BottomLeftMenu';
30-
module.exports.components['structures.BottomLeftMenu'] = structures$BottomLeftMenu;
31-
import structures$CompatibilityPage from './components/structures/CompatibilityPage';
32-
module.exports.components['structures.CompatibilityPage'] = structures$CompatibilityPage;
33-
import structures$LeftPanel from './components/structures/LeftPanel';
34-
module.exports.components['structures.LeftPanel'] = structures$LeftPanel;
35-
import structures$RightPanel from './components/structures/RightPanel';
36-
module.exports.components['structures.RightPanel'] = structures$RightPanel;
37-
import structures$RoomDirectory from './components/structures/RoomDirectory';
38-
module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory;
39-
import structures$RoomSubList from './components/structures/RoomSubList';
40-
module.exports.components['structures.RoomSubList'] = structures$RoomSubList;
41-
import structures$SearchBox from './components/structures/SearchBox';
42-
module.exports.components['structures.SearchBox'] = structures$SearchBox;
43-
import structures$ViewSource from './components/structures/ViewSource';
44-
module.exports.components['structures.ViewSource'] = structures$ViewSource;
45-
import views$context_menus$MessageContextMenu from './components/views/context_menus/MessageContextMenu';
46-
module.exports.components['views.context_menus.MessageContextMenu'] = views$context_menus$MessageContextMenu;
47-
import views$context_menus$NotificationStateContextMenu from './components/views/context_menus/NotificationStateContextMenu';
48-
module.exports.components['views.context_menus.NotificationStateContextMenu'] = views$context_menus$NotificationStateContextMenu;
49-
import views$context_menus$RoomTagContextMenu from './components/views/context_menus/RoomTagContextMenu';
50-
module.exports.components['views.context_menus.RoomTagContextMenu'] = views$context_menus$RoomTagContextMenu;
51-
import views$dialogs$ChangelogDialog from './components/views/dialogs/ChangelogDialog';
52-
module.exports.components['views.dialogs.ChangelogDialog'] = views$dialogs$ChangelogDialog;
53-
import views$directory$NetworkDropdown from './components/views/directory/NetworkDropdown';
54-
module.exports.components['views.directory.NetworkDropdown'] = views$directory$NetworkDropdown;
55-
import views$elements$ImageView from './components/views/elements/ImageView';
56-
module.exports.components['views.elements.ImageView'] = views$elements$ImageView;
57-
import views$elements$Spinner from './components/views/elements/Spinner';
58-
module.exports.components['views.elements.Spinner'] = views$elements$Spinner;
59-
import views$globals$GuestWarningBar from './components/views/globals/GuestWarningBar';
60-
module.exports.components['views.globals.GuestWarningBar'] = views$globals$GuestWarningBar;
61-
import views$globals$MatrixToolbar from './components/views/globals/MatrixToolbar';
62-
module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar;
63-
import views$globals$NewVersionBar from './components/views/globals/NewVersionBar';
64-
module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar;
65-
import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog';
66-
module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog;
67-
import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter';
68-
module.exports.components['views.login.VectorLoginFooter'] = views$login$VectorLoginFooter;
69-
import views$login$VectorLoginHeader from './components/views/login/VectorLoginHeader';
70-
module.exports.components['views.login.VectorLoginHeader'] = views$login$VectorLoginHeader;
71-
import views$messages$DateSeparator from './components/views/messages/DateSeparator';
72-
module.exports.components['views.messages.DateSeparator'] = views$messages$DateSeparator;
73-
import views$messages$MessageTimestamp from './components/views/messages/MessageTimestamp';
74-
module.exports.components['views.messages.MessageTimestamp'] = views$messages$MessageTimestamp;
75-
import views$rooms$DNDRoomTile from './components/views/rooms/DNDRoomTile';
76-
module.exports.components['views.rooms.DNDRoomTile'] = views$rooms$DNDRoomTile;
77-
import views$rooms$RoomDropTarget from './components/views/rooms/RoomDropTarget';
78-
module.exports.components['views.rooms.RoomDropTarget'] = views$rooms$RoomDropTarget;
79-
import views$rooms$RoomTooltip from './components/views/rooms/RoomTooltip';
80-
module.exports.components['views.rooms.RoomTooltip'] = views$rooms$RoomTooltip;
81-
import views$rooms$SearchBar from './components/views/rooms/SearchBar';
82-
module.exports.components['views.rooms.SearchBar'] = views$rooms$SearchBar;
83-
import views$settings$IntegrationsManager from './components/views/settings/IntegrationsManager';
84-
module.exports.components['views.settings.IntegrationsManager'] = views$settings$IntegrationsManager;
85-
import views$settings$Notifications from './components/views/settings/Notifications';
86-
module.exports.components['views.settings.Notifications'] = views$settings$Notifications;
29+
module.exports.components['structures.BottomLeftMenu'] = require('./components/structures/BottomLeftMenu');
30+
module.exports.components['structures.CompatibilityPage'] = require('./components/structures/CompatibilityPage');
31+
module.exports.components['structures.LeftPanel'] = require('./components/structures/LeftPanel');
32+
module.exports.components['structures.RightPanel'] = require('./components/structures/RightPanel');
33+
module.exports.components['structures.RoomDirectory'] = require('./components/structures/RoomDirectory');
34+
module.exports.components['structures.RoomSubList'] = require('./components/structures/RoomSubList');
35+
module.exports.components['structures.SearchBox'] = require('./components/structures/SearchBox');
36+
module.exports.components['structures.ViewSource'] = require('./components/structures/ViewSource');
37+
module.exports.components['views.context_menus.MessageContextMenu'] = require('./components/views/context_menus/MessageContextMenu');
38+
module.exports.components['views.context_menus.NotificationStateContextMenu'] = require('./components/views/context_menus/NotificationStateContextMenu');
39+
module.exports.components['views.context_menus.RoomTagContextMenu'] = require('./components/views/context_menus/RoomTagContextMenu');
40+
module.exports.components['views.dialogs.ChangelogDialog'] = require('./components/views/dialogs/ChangelogDialog');
41+
module.exports.components['views.directory.NetworkDropdown'] = require('./components/views/directory/NetworkDropdown');
42+
module.exports.components['views.elements.ImageView'] = require('./components/views/elements/ImageView');
43+
module.exports.components['views.elements.Spinner'] = require('./components/views/elements/Spinner');
44+
module.exports.components['views.globals.GuestWarningBar'] = require('./components/views/globals/GuestWarningBar');
45+
module.exports.components['views.globals.MatrixToolbar'] = require('./components/views/globals/MatrixToolbar');
46+
module.exports.components['views.globals.NewVersionBar'] = require('./components/views/globals/NewVersionBar');
47+
module.exports.components['views.login.VectorCustomServerDialog'] = require('./components/views/login/VectorCustomServerDialog');
48+
module.exports.components['views.login.VectorLoginFooter'] = require('./components/views/login/VectorLoginFooter');
49+
module.exports.components['views.login.VectorLoginHeader'] = require('./components/views/login/VectorLoginHeader');
50+
module.exports.components['views.messages.DateSeparator'] = require('./components/views/messages/DateSeparator');
51+
module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
52+
module.exports.components['views.rooms.DNDRoomTile'] = require('./components/views/rooms/DNDRoomTile');
53+
module.exports.components['views.rooms.RoomDropTarget'] = require('./components/views/rooms/RoomDropTarget');
54+
module.exports.components['views.rooms.RoomTooltip'] = require('./components/views/rooms/RoomTooltip');
55+
module.exports.components['views.rooms.SearchBar'] = require('./components/views/rooms/SearchBar');
56+
module.exports.components['views.settings.IntegrationsManager'] = require('./components/views/settings/IntegrationsManager');
57+
module.exports.components['views.settings.Notifications'] = require('./components/views/settings/Notifications');

‎src/vector/index.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ limitations under the License.
1818

1919
// for ES6 stuff like startsWith() that Safari doesn't handle
2020
// and babel doesn't do by default
21-
// Note we use this, as well as the babel transform-runtime plugin
22-
// since transform-runtime does not cover instance methods
23-
// such as "foobar".includes("foo") which bits of our library
24-
// code use, but the babel transform-runtime plugin allows the
25-
// regenerator runtime to be injected early enough in the process
26-
// (it can't be here as it's too late: the alternative is to put
27-
// the babel-polyfill as the first 'entry' in the webpack config).
28-
// https://babeljs.io/docs/plugins/transform-runtime/
2921
require('babel-polyfill');
3022

3123
// CSS requires: just putting them here for now as CSS is going to be

0 commit comments

Comments
 (0)