[@types/glob-stream] Switch from @types/glob to glob (#65258)

* Switch `glob-stream` from `@types/glob` to `glob`

* Update config of `gulp` accordingly

* Downgrade gulp to v3 for types which don't use gulp

* Upgradde target for types which use `gulp`

* Edit somw type tests to use gulp v3

* Upgrade TS version of `gulp-svg-sprite`

* Add myself as a type author

* Rename `ES2015` to `es6`
This commit is contained in:
Manuel Thalmann
2023-05-10 22:57:24 +02:00
committed by GitHub
parent 9f677cc075
commit 7aef2f3bb2
117 changed files with 318 additions and 19 deletions

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -2,10 +2,10 @@
// Project: https://github.com/wearefractal/glob-stream
// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
// mrmlnc <https://github.com/mrmlnc>
// Manuel Thalmann <https://github.com/manuth>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
/// <reference types="node" />
/// <reference types="glob" />
import glob = require('glob');
@@ -22,7 +22,7 @@ declare namespace GlobStream {
export type UniqueByStringPredicate = 'cwd' | 'base' | 'path';
export type UniqueByFunctionPredicate = (entry: Entry) => string;
export interface Options extends glob.IOptions {
export interface Options extends glob.GlobOptions {
/**
* Whether or not to error upon an empty singular glob.
*/

View File

@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
"@types/glob": "~7.2.0"
"glob": "^10.2.1"
}
}

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -17,6 +17,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
}

View File

@@ -10,6 +10,9 @@
],
"jsx": "react",
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noImplicitAny": true,
"noImplicitThis": true,
"strictNullChecks": true,

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -14,6 +14,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -7,7 +7,7 @@ gulp.task('connect', () => {
connect.server();
});
gulp.task('default', gulp.series(['connect']));
gulp.task('default', ['connect']);
// LiveReload
gulp.task('connect', () => {
@@ -23,10 +23,10 @@ gulp.task('html', () => {
});
gulp.task('watch', () => {
gulp.watch(['./app/*.html'], gulp.series(['html']));
gulp.watch(['./app/*.html'], gulp.task('html'));
});
gulp.task('default', gulp.series(['connect', 'watch']));
gulp.task('default', ['connect', 'watch']);
// Start and stop server
gulp.task('jenkins-tests', () => {
@@ -70,11 +70,11 @@ gulp.task('stylus', () => {
});
gulp.task('watch', () => {
gulp.watch(['./app/*.html'], gulp.series(['html']));
gulp.watch(['./app/stylus/*.styl'], gulp.series(['stylus']));
gulp.watch(['./app/*.html'], ['html']);
gulp.watch(['./app/stylus/*.styl'], ['stylus']);
});
gulp.task('default', gulp.series(['connectDist', 'connectDev', 'watch']));
gulp.task('default', ['connectDist', 'connectDev', 'watch']);
// Barebones middleware example from Readme
gulp.task('connect', () => {

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -14,6 +14,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -9,6 +9,9 @@
"baseUrl": "../",
"typeRoots": ["../"],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -18,7 +18,8 @@
],
"clean-css/*": [
"clean-css/v3/*"
]
],
"gulp": ["gulp/v3"]
},
"types": [],
"noEmit": true,

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -17,21 +17,21 @@ var opt = {
distFolder: 'dist'
}
gulp.task("revision", gulp.parallel("dist:css", "dist:js", () =>
gulp.task("revision", () =>
gulp.src(["dist/**/*.css", "dist/**/*.js"])
.pipe(rev())
.pipe(gulp.dest(opt.distFolder))
.pipe(rev.manifest())
.pipe(gulp.dest(opt.distFolder))
));
);
gulp.task("revreplace", gulp.parallel("revision", () => {
gulp.task("revreplace", () => {
var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
return gulp.src(opt.srcFolder + "/index.html")
.pipe(revReplace({ manifest: manifest }))
.pipe(gulp.dest(opt.distFolder));
}));
});
function replaceJsIfMap(filename: string): string {
@@ -41,7 +41,7 @@ function replaceJsIfMap(filename: string): string {
return filename;
}
gulp.task("revreplace", gulp.parallel("revision", () => {
gulp.task("revreplace", () => {
var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
return gulp.src(opt.distFolder + '**/*.js')
@@ -51,4 +51,4 @@ gulp.task("revreplace", gulp.parallel("revision", () => {
modifyReved: replaceJsIfMap
}))
.pipe(gulp.dest(opt.distFolder));
}));
});

View File

@@ -18,6 +18,9 @@
],
"clean-css/*": [
"clean-css/v3/*"
],
"gulp": [
"gulp/v3"
]
},
"types": [],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -2,7 +2,7 @@
// Project: https://github.com/jkphl/gulp-svg-sprite
// Definitions by: Qubo <https://github.com/tkqubo>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.2
// TypeScript Version: 4.4
/// <reference types="node" />

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -12,6 +12,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true,
"strictFunctionTypes": true

View File

@@ -1,6 +1,7 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
],

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -13,6 +13,9 @@
"../"
],
"types": [],
"paths": {
"gulp": ["gulp/v3"]
},
"noEmit": true,
"forceConsistentCasingInFileNames": true
},

View File

@@ -18,6 +18,9 @@
],
"clean-css/*": [
"clean-css/v3/*"
],
"gulp": [
"gulp/v3"
]
},
"types": [],

Some files were not shown because too many files have changed in this diff Show More