mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 15:51:16 +02:00
Code Issues Releases Wiki Activity

Upgrade to flarum-gulp 0.2.0 / Babel 6

Browse Source
This commit is contained in:
Toby Zerner
2016-03-18 09:31:01 +10:30
parent f7e2e14909
commit b45bd3a581
7 changed files with 2991 additions and 7225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/admin/Gulpfile.js
View File

@@ -1,12 +1,10 @@
var gulp = require('flarum-gulp'); var gulp = require('flarum-gulp');
var nodeDir = 'node_modules';
var bowerDir = '../bower_components'; var bowerDir = '../bower_components';
gulp({ gulp({
includeHelpers: true,
files: [ files: [
nodeDir + '/babel-core/external-helpers.js',
bowerDir + '/es6-micro-loader/dist/system-polyfill.js', bowerDir + '/es6-micro-loader/dist/system-polyfill.js',
bowerDir + '/mithril/mithril.js', bowerDir + '/mithril/mithril.js',

3546
framework/core/js/admin/dist/app.js vendored
View File

File diff suppressed because it is too large Load Diff

5
framework/core/js/admin/package.json
View File

@@ -1,8 +1,7 @@
{ {
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"gulp": "^3.8.11", "gulp": "^3.9.1",
"flarum-gulp": "git+https://github.com/flarum/gulp.git", "flarum-gulp": "^0.2.0"
"babel-core": "^5.0.0"
} }
} }

4
framework/core/js/forum/Gulpfile.js
View File

@@ -1,12 +1,10 @@
var gulp = require('flarum-gulp'); var gulp = require('flarum-gulp');
var nodeDir = 'node_modules';
var bowerDir = '../bower_components'; var bowerDir = '../bower_components';
gulp({ gulp({
includeHelpers: true,
files: [ files: [
nodeDir + '/babel-core/external-helpers.js',
bowerDir + '/es6-micro-loader/dist/system-polyfill.js', bowerDir + '/es6-micro-loader/dist/system-polyfill.js',
bowerDir + '/mithril/mithril.js', bowerDir + '/mithril/mithril.js',

6650
framework/core/js/forum/dist/app.js vendored
View File

File diff suppressed because it is too large Load Diff

5
framework/core/js/forum/package.json
View File

@@ -1,8 +1,7 @@
{ {
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"gulp": "^3.8.11", "gulp": "^3.9.1",
"flarum-gulp": "git+https://github.com/flarum/gulp.git", "flarum-gulp": "^0.2.0"
"babel-core": "^5.0.0"
} }
} }

2
framework/core/views/app.blade.php
View File

@@ -37,7 +37,7 @@
@endif @endif
var app = System.get('flarum/app').default; var app = System.get('flarum/app').default;
babelHelpers._extends(app, {!! json_encode($app) !!}); babelHelpers.extends(app, {!! json_encode($app) !!});
@foreach ($bootstrappers as $bootstrapper) @foreach ($bootstrappers as $bootstrapper)
System.get('{{ $bootstrapper }}'); System.get('{{ $bootstrapper }}');