jenkins-bot has submitted this change and it was merged.
Change subject: dist: Put cssUrlEmbed after cssjanus now this is possible so it
works for dist
......................................................................
dist: Put cssUrlEmbed after cssjanus now this is possible so it works for dist
cssUrlEmbed doesn't concat if given a list of files so it must
come after conct. This means a few files don't get embedded as they
have a different relative path, but these images were already broken
in dist and the paths should be fixed separately.
We can now run janus before embed safely and thus load rtl icons
where required.
Change-Id: Icb704c15404f29fdc47fb277e3ee931e454e2d87
---
M Gruntfile.js
1 file changed, 17 insertions(+), 10 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 2626d4f..847ad7f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,12 +44,6 @@
clean: {
dist: [ 'dist/*', 'test-coverage/*' ]
},
- cssUrlEmbed: {
- dist: {
- dest: 'dist/visualEditor.css',
- src: coreBuildFiles.styles
- }
- },
concat: {
options: {
banner: grunt.file.read( 'build/banner.txt' )
@@ -60,13 +54,26 @@
},
css: {
dest: 'dist/visualEditor.css',
- src: ['dist/visualEditor.css']
+ src: coreBuildFiles.styles
}
},
cssjanus: {
dist: {
- src: 'dist/visualEditor.css',
- dest: 'dist/visualEditor.rtl.css'
+ dest: 'dist/visualEditor.rtl.css',
+ src: 'dist/visualEditor.css'
+ }
+ },
+ cssUrlEmbed: {
+ options: {
+ // TODO: A few image paths aren't relative to
src/ui/styles
+ failOnMissingUrl: false,
+ baseDir: 'src/ui/styles'
+ },
+ dist: {
+ files: {
+ 'dist/visualEditor.css':
'dist/visualEditor.css',
+ 'dist/visualEditor.rtl.css':
'dist/visualEditor.rtl.css'
+ }
}
},
copy: {
@@ -205,7 +212,7 @@
}
} );
- grunt.registerTask( 'build', [ 'clean', 'cssUrlEmbed', 'concat',
'cssjanus', 'copy', 'buildloader' ] );
+ grunt.registerTask( 'build', [ 'clean', 'concat', 'cssjanus',
'cssUrlEmbed', 'copy', 'buildloader' ] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'banana' ] );
grunt.registerTask( 'unit', [ 'karma:main' ] );
grunt.registerTask( 'test', [ 'git-build', 'build', 'lint', 'unit' ] );
--
To view, visit https://gerrit.wikimedia.org/r/183143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb704c15404f29fdc47fb277e3ee931e454e2d87
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
