tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 17:39:30 +02:00
Code Issues Projects Releases Wiki Activity

Partially reverted b1b85b5

Browse Source 
We still require copying thirdparty components from node_modules on tiny_mce
This commit is contained in:
Ingo Schommer 2016-04-04 08:15:27 +12:00
parent c2b6f6199c
commit c4e5074f67
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gulpfile.js
View File

@ -91,6 +91,18 @@ var jquerySizesConfig = {
files: ['/lib/jquery.sizes.js'] files: ['/lib/jquery.sizes.js']
}; };
var tinymceConfig = {
src: PATHS.MODULES + '/tinymce',
dest: PATHS.FRAMEWORK_THIRDPARTY + '/tinymce',
files: [
'/tinymce.min.js', // Exclude unminified file to keep repository size down
'/jquery.tinymce.min.js',
'/themes/**',
'/skins/**',
'/plugins/**'
]
};
/** /**
* Copies files from a source directory to a destination directory. * Copies files from a source directory to a destination directory.
* *
@ -177,10 +189,8 @@ gulp.task('bundle-leftandmain', function bundleLeftAndMain() {
ignore: /(thirdparty)/, ignore: /(thirdparty)/,
comments: false comments: false
})) }))
.external('config')
.external('jQuery') .external('jQuery')
.external('i18n') .external('i18n')
.external('router')
.bundle() .bundle()
.on('update', bundleLeftAndMain) .on('update', bundleLeftAndMain)
.on('error', notify.onError({ message: 'Error: <%= error.message %>' })) .on('error', notify.onError({ message: 'Error: <%= error.message %>' }))
@ -199,10 +209,8 @@ gulp.task('bundle-lib', function bundleLib() {
ignore: /(thirdparty)/, ignore: /(thirdparty)/,
comments: false comments: false
})) }))
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/config.js', { expose: 'config' })
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' }) .require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' })
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' }) .require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/router.js', { expose: 'router' })
.bundle() .bundle()
.on('update', bundleLib) .on('update', bundleLib)
.on('error', notify.onError({ message: 'Error: <%= error.message %>' })) .on('error', notify.onError({ message: 'Error: <%= error.message %>' }))
@ -236,6 +244,7 @@ gulp.task('sanity', function () {
diffFiles(blueimpLoadImageConfig); diffFiles(blueimpLoadImageConfig);
diffFiles(blueimpTmplConfig); diffFiles(blueimpTmplConfig);
diffFiles(jquerySizesConfig); diffFiles(jquerySizesConfig);
diffFiles(tinymceConfig);
}); });
gulp.task('thirdparty', function () { gulp.task('thirdparty', function () {
@ -283,7 +292,7 @@ gulp.task('css', ['compile:css'], function () {
rootCompileFolders.forEach(function (folder) { rootCompileFolders.forEach(function (folder) {
gulp.watch(folder + '/scss/**/*.scss', ['compile:css']); gulp.watch(folder + '/scss/**/*.scss', ['compile:css']);
}); });
// Watch the .scss files in react components // Watch the .scss files in react components
gulp.watch('./admin/javascript/src/**/*.scss', ['compile:css']); gulp.watch('./admin/javascript/src/**/*.scss', ['compile:css']);
} }