djencks commented on a change in pull request #3912:
URL: https://github.com/apache/camel/pull/3912#discussion_r440402164
##########
File path: docs/gulpfile.js
##########
@@ -14,343 +14,427 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-const { dest, series, parallel, src, symlink } = require('gulp');
-const del = require('del');
-const filter = require('gulp-filter');
-const inject = require('gulp-inject');
+/* eslint-disable-next-line no-unused-vars */
+const { dest, series, parallel, src, symlink } = require('gulp')
+const del = require('del')
+const filter = require('gulp-filter')
+const inject = require('gulp-inject')
const map = require('map-stream')
-const path = require('path');
-const rename = require('gulp-rename');
-const replace = require('gulp-replace');
-const sort = require('gulp-sort');
-const through2 = require('through2');
+const path = require('path')
+const rename = require('gulp-rename')
+const replace = require('gulp-replace')
+const sort = require('gulp-sort')
+const through2 = require('through2')
const File = require('vinyl')
-const fs = require('fs');
+const fs = require('fs')
-function deleteComponentSymlinks() {
- return del(['components/modules/ROOT/pages/*',
'!components/modules/ROOT/pages/index.adoc']);
+function deleteComponentSymlinks () {
+ return del(['components/modules/ROOT/pages/*',
'!components/modules/ROOT/pages/index.adoc'])
}
-function deleteComponentImageSymlinks() {
- return del(['components/modules/ROOT/assets/images/*']);
+function deleteComponentImageSymlinks () {
+ return del(['components/modules/ROOT/assets/images/*'])
}
-function createComponentSymlinks() {
- return src(['../core/camel-base/src/main/docs/*-component.adoc',
'../components/{*,*/*}/src/main/docs/*-component.adoc',
'../components/{*,*/*}/src/main/docs/*-summary.adoc'])
- .pipe(map((file, done) => {
- // this flattens the output to just .../pages/....adoc
- // instead of .../pages/camel-.../src/main/docs/....adoc
- file.base = path.dirname(file.path);
- done(null, file);
- }))
- // Antora disabled symlinks, there is an issue open
- // https://gitlab.com/antora/antora/issues/188
- // to reinstate symlink support, until that's resolved
- // we'll simply copy over instead of creating symlinks
- // .pipe(symlink('components/modules/ROOT/pages/', {
- // relativeSymlinks: true
- // }));
- // uncomment above .pipe() and remove the .pipe() below
- // when antora#188 is resolved
- .pipe(insertSourceAttribute())
- .pipe(dest('components/modules/ROOT/pages/'));
+function createComponentSymlinks () {
+ return (
+ src([
+ '../core/camel-base/src/main/docs/*-component.adoc',
+ '../components/{*,*/*}/src/main/docs/*-component.adoc',
+ '../components/{*,*/*}/src/main/docs/*-summary.adoc',
+ ])
+ .pipe(
+ map((file, done) => {
+ // this flattens the output to just .../pages/....adoc
+ // instead of .../pages/camel-.../src/main/docs/....adoc
+ file.base = path.dirname(file.path)
+ done(null, file)
+ })
+ )
+ // Antora disabled symlinks, there is an issue open
+ // https://gitlab.com/antora/antora/issues/188
+ // to reinstate symlink support, until that's resolved
+ // we'll simply copy over instead of creating symlinks
+ // .pipe(symlink('components/modules/ROOT/pages/', {
+ // relativeSymlinks: true
+ // }));
+ // uncomment above .pipe() and remove the .pipe() below
+ // when antora#188 is resolved
+ .pipe(insertSourceAttribute())
+ .pipe(dest('components/modules/ROOT/pages/'))
+ )
}
-function createComponentOthersSymlinks() {
- const f = filter(['**','!**/*-language.adoc', '!**/*-dataformat.adoc',
'!**/*-component.adoc', '!**/*-summary.adoc'])
- return
src(['../core/camel-base/src/main/docs/*.adoc','../core/camel-main/src/main/docs/*.adoc','../components/{*,*/*}/src/main/docs/*.adoc'])
- .pipe(f)
- .pipe(map((file, done) => {
- // this flattens the output to just .../pages/....adoc
- // instead of .../pages/camel-.../src/main/docs/....adoc
- file.base = path.dirname(file.path);
- done(null, file);
- }))
- // Antora disabled symlinks, there is an issue open
- // https://gitlab.com/antora/antora/issues/188
- // to reinstate symlink support, until that's resolved
- // we'll simply copy over instead of creating symlinks
- // .pipe(symlink('components/modules/ROOT/pages/', {
- // relativeSymlinks: true
- // }));
- // uncomment above .pipe() and remove the .pipe() below
- // when antora#188 is resolved
- .pipe(insertSourceAttribute())
- .pipe(dest('components/modules/others/pages/'));
+function createComponentOthersSymlinks () {
+ const f = filter([
+ '**',
+ '!**/*-language.adoc',
+ '!**/*-dataformat.adoc',
+ '!**/*-component.adoc',
+ '!**/*-summary.adoc',
+ ])
+ return (
+ src(['../core/camel-base/src/main/docs/*.adoc',
'../components/{*,*/*}/src/main/docs/*.adoc'])
Review comment:
Yes, that's the merge conflict.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
