Этот коммит содержится в:
Christopher Speller
2016-05-18 10:42:25 -04:00
коммит произвёл Joram Wilander
родитель 02f8691fa4
Коммит 880ef25ab1
5 изменённых файлов: 13 добавлений и 1500 удалений

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@@ -1,5 +1,5 @@
{ {
"name": "mattermost", "name": "mattermost-webapp",
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
@@ -17,6 +17,7 @@
"jquery": "2.2.3", "jquery": "2.2.3",
"keymirror": "0.1.1", "keymirror": "0.1.1",
"marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca", "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
"mattermost": "mattermost/mattermost-javascript#master",
"match-at": "0.1.0", "match-at": "0.1.0",
"object-assign": "4.1.0", "object-assign": "4.1.0",
"perfect-scrollbar": "0.6.11", "perfect-scrollbar": "0.6.11",

Просмотреть файл

@@ -1,7 +1,7 @@
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import Client from '../client/client.jsx'; import Client from '../node_modules/mattermost/client.jsx';
import jqd from 'jquery-deferred'; import jqd from 'jquery-deferred';
class TestHelperClass { class TestHelperClass {

Просмотреть файл

@@ -1,7 +1,7 @@
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import Client from '../client/client.jsx'; import Client from 'mattermost/client.jsx';
import TeamStore from '../stores/team_store.jsx'; import TeamStore from '../stores/team_store.jsx';
import BrowserStore from '../stores/browser_store.jsx'; import BrowserStore from '../stores/browser_store.jsx';
import * as GlobalActions from 'action_creators/global_actions.jsx'; import * as GlobalActions from 'action_creators/global_actions.jsx';

Просмотреть файл

@@ -42,6 +42,15 @@ var config = {
cacheDirectory: DEV cacheDirectory: DEV
} }
}, },
{
test: /node_modules\/mattermost\/client\.jsx?$/,
loader: 'babel',
query: {
presets: ['react', 'es2015-webpack', 'stage-0'],
plugins: ['transform-runtime'],
cacheDirectory: DEV
}
},
{ {
test: /\.json$/, test: /\.json$/,
loader: 'json' loader: 'json'