Merge pull request #15390 from Snuffleupagus/rm-bower

Remove Bower support in `pdfjs-dist`
This commit is contained in:
Tim van der Meij 2022-09-03 13:21:28 +02:00 committed by GitHub
commit d16f591183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1803,9 +1803,8 @@ gulp.task(
"generic", "generic",
"types", "types",
function createTypesTest() { function createTypesTest() {
const [packageJsonSrc] = packageBowerJson();
return merge([ return merge([
packageJsonSrc.pipe(gulp.dest(TYPESTEST_DIR)), packageJson().pipe(gulp.dest(TYPESTEST_DIR)),
gulp gulp
.src([ .src([
GENERIC_DIR + "build/pdf.js", GENERIC_DIR + "build/pdf.js",
@ -2148,7 +2147,7 @@ gulp.task(
) )
); );
function packageBowerJson() { function packageJson() {
const VERSION = getVersionJSON().version; const VERSION = getVersionJSON().version;
const DIST_NAME = "pdfjs-dist"; const DIST_NAME = "pdfjs-dist";
@ -2195,18 +2194,10 @@ function packageBowerJson() {
}, },
}; };
const bowerManifest = { return createStringSource(
name: DIST_NAME, "package.json",
version: VERSION, JSON.stringify(npmManifest, null, 2)
main: ["build/pdf.js", "build/pdf.worker.js"], );
ignore: [],
keywords: DIST_KEYWORDS,
};
return [
createStringSource("package.json", JSON.stringify(npmManifest, null, 2)),
createStringSource("bower.json", JSON.stringify(bowerManifest, null, 2)),
];
} }
gulp.task( gulp.task(
@ -2234,12 +2225,8 @@ gulp.task(
console.log("### Overwriting all files"); console.log("### Overwriting all files");
rimraf.sync(path.join(DIST_DIR, "*")); rimraf.sync(path.join(DIST_DIR, "*"));
// Rebuilding manifests
const [packageJsonSrc, bowerJsonSrc] = packageBowerJson();
return merge([ return merge([
packageJsonSrc.pipe(gulp.dest(DIST_DIR)), packageJson().pipe(gulp.dest(DIST_DIR)),
bowerJsonSrc.pipe(gulp.dest(DIST_DIR)),
vfs vfs
.src("external/dist/**/*", { base: "external/dist", stripBOM: false }) .src("external/dist/**/*", { base: "external/dist", stripBOM: false })
.pipe(gulp.dest(DIST_DIR)), .pipe(gulp.dest(DIST_DIR)),