From 68ea1576a8e90840dadf966e91985ff4e98a6726 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 28 Apr 2016 22:21:08 +0300 Subject: [PATCH] Fix periodical build fails: bundle prism.js to one file in correct order --- build/tasks/build.js | 35 +++++++++++++++++++++++++++++++++-- lib/utils/pipes.js | 21 +-------------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/build/tasks/build.js b/build/tasks/build.js index ef14693b..6897c0a0 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -28,8 +28,7 @@ gulp.task('buildDev', function (callback) { ); }); - -gulp.task('bundle', ['buildStatic', 'concatDeps']); +gulp.task('bundle', ['concatPrism', 'buildStatic', 'concatDeps']); gulp.task('bundleProd', ['bundle', 'buildStaticMin', 'concatDepsMin']); gulp.task('inlineTemplates', ['sass'], function() { @@ -101,3 +100,35 @@ function bundle(outputFile, minify, cb) { cb(new Error(err)); }); } + +gulp.task('concatPrism', function() { + require('../../system.config.js'); + var prismFolder = System.normalizeSync('prismjs').substring(8); + prismFolder = prismFolder.substring(0, prismFolder.length -3); + var prismFiles = [ + 'prism.js', + 'components/prism-actionscript.js', + 'components/prism-c.js', + 'components/prism-cpp.js', + 'components/prism-csharp.js', + 'components/prism-php.js', + 'components/prism-coffeescript.js', + 'components/prism-go.js', + 'components/prism-haskell.js', + 'components/prism-java.js', + 'components/prism-lua.js', + 'components/prism-matlab.js', + 'components/prism-perl.js', + 'components/prism-python.js', + 'components/prism-r.js', + 'components/prism-ruby.js', + 'components/prism-bash.js', + 'components/prism-swift.js', + 'components/prism-objectivec.js', + 'components/prism-scala.js' + ].map(file => path.join(prismFolder, file)); + + gulp.src(prismFiles) + .pipe(concat(path.join(paths.tmp, 'prismjs-bundle.js'))) + .pipe(gulp.dest('.')) +}); diff --git a/lib/utils/pipes.js b/lib/utils/pipes.js index 917f2279..29940a77 100644 --- a/lib/utils/pipes.js +++ b/lib/utils/pipes.js @@ -5,26 +5,7 @@ import {isString, stringify, isBlank} from 'angular2/src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; import {JsonPointer} from './JsonPointer'; -import Prism from 'prismjs'; -import 'prismjs/components/prism-actionscript.js'; -import 'prismjs/components/prism-c.js'; -import 'prismjs/components/prism-cpp.js'; -import 'prismjs/components/prism-csharp.js'; -import 'prismjs/components/prism-php.js'; -import 'prismjs/components/prism-coffeescript.js'; -import 'prismjs/components/prism-go.js'; -import 'prismjs/components/prism-haskell.js'; -import 'prismjs/components/prism-java.js'; -import 'prismjs/components/prism-lua.js'; -import 'prismjs/components/prism-matlab.js'; -import 'prismjs/components/prism-perl.js'; -import 'prismjs/components/prism-python.js'; -import 'prismjs/components/prism-r.js'; -import 'prismjs/components/prism-ruby.js'; -import 'prismjs/components/prism-bash.js'; -import 'prismjs/components/prism-swift.js'; -import 'prismjs/components/prism-objectivec.js'; -import 'prismjs/components/prism-scala.js'; +import Prism from '../../prismjs-bundle'; import 'prismjs/themes/prism-dark.css!css'; import 'hint.css/hint.base.css!css';