Skip to content

Commit e83d0c5

Browse files
phatedphated
committed
chore!: upgrade scaffold, dropping node <10 support
1 parent eb2c439 commit e83d0c5

13 files changed

+259
-315
lines changed

‎.ci/.azure-pipelines-steps.yml

-34
This file was deleted.

‎.ci/.azure-pipelines.yml

-65
This file was deleted.

‎.github/workflows/dev.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: dev
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- master
7+
env:
8+
CI: true
9+
10+
jobs:
11+
prettier:
12+
name: Format code
13+
runs-on: ubuntu-latest
14+
if: ${{ github.event_name == 'push' }}
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
20+
- name: Prettier
21+
uses: gulpjs/prettier_action@v3.0
22+
with:
23+
commit_message: 'Build: Run prettier'
24+
prettier_options: '--write .'
25+
26+
test:
27+
name: Tests for Node ${{ matrix.node }} on ${{ matrix.os }}
28+
runs-on: ${{ matrix.os }}
29+
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
node: [10, 12, 14]
34+
os: [ubuntu-latest, windows-latest, macos-latest]
35+
36+
steps:
37+
- name: Clone repository
38+
uses: actions/checkout@v2
39+
40+
- name: Set Node.js version
41+
uses: actions/setup-node@v1
42+
with:
43+
node-version: ${{ matrix.node }}
44+
45+
- run: node --version
46+
- run: npm --version
47+
48+
- name: Install npm dependencies
49+
run: npm install
50+
51+
- name: Run lint
52+
run: npm run lint
53+
54+
- name: Run tests
55+
run: npm test
56+
57+
- name: Coveralls
58+
uses: coverallsapp/github-action@v1.1.0
59+
with:
60+
github-token: ${{ secrets.GITHUB_TOKEN }}
61+
flag-name: ${{matrix.os}}-node-${{ matrix.node }}
62+
parallel: true
63+
64+
coveralls:
65+
needs: test
66+
name: Finish up
67+
68+
runs-on: ubuntu-latest
69+
steps:
70+
- name: Coveralls Finished
71+
uses: coverallsapp/github-action@v1.1.0
72+
with:
73+
github-token: ${{ secrets.github_token }}
74+
parallel-finished: true

‎.prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage/
2+
.nyc_output/

‎.travis.yml

-8
This file was deleted.

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The ISC License
22

3-
Copyright (c) 2015, 2019 Elan Shanker
3+
Copyright (c) 2015, 2019 Elan Shanker, 2021 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors
44

55
Permission to use, copy, modify, and/or distribute this software for any
66
purpose with or without fee is hereby granted, provided that the above

‎README.md

+14-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# glob-parent
88

9-
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Azure Pipelines Build Status][azure-pipelines-image]][azure-pipelines-url] [![Travis Build Status][travis-image]][travis-url] [![AppVeyor Build Status][appveyor-image]][appveyor-url] [![Coveralls Status][coveralls-image]][coveralls-url] [![Gitter chat][gitter-image]][gitter-url]
9+
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][ci-image]][ci-url] [![Coveralls Status][coveralls-image]][coveralls-url]
1010

1111
Extract the non-magic parent path from a glob string.
1212

@@ -114,24 +114,19 @@ globParent('./foo \\[bar]*') // '.'
114114

115115
ISC
116116

117-
[expand-braces]: https://github.com/jonschlinkert/expand-braces
118-
[expand-brackets]: https://github.com/jonschlinkert/expand-brackets
119-
120-
[downloads-image]: https://img.shields.io/npm/dm/glob-parent.svg
121-
[npm-url]: https://www.npmjs.com/package/glob-parent
122-
[npm-image]: https://img.shields.io/npm/v/glob-parent.svg
123-
124-
[azure-pipelines-url]: https://dev.azure.com/gulpjs/gulp/_build/latest?definitionId=2&branchName=master
125-
[azure-pipelines-image]: https://dev.azure.com/gulpjs/gulp/_apis/build/status/glob-parent?branchName=master
117+
<!-- prettier-ignore-start -->
118+
[downloads-image]: https://img.shields.io/npm/dm/glop-parent.svg?style=flat-square
119+
[npm-url]: https://www.npmjs.com/package/glop-parent
120+
[npm-image]: https://img.shields.io/npm/v/glop-parent.svg?style=flat-square
126121

127-
[travis-url]: https://travis-ci.org/gulpjs/glob-parent
128-
[travis-image]: https://img.shields.io/travis/gulpjs/glob-parent.svg?label=travis-ci
122+
[ci-url]: https://github.com/gulpjs/glop-parent/actions?query=workflow:dev
123+
[ci-image]: https://img.shields.io/github/workflow/status/gulpjs/glop-parent/dev?style=flat-square
129124

130-
[appveyor-url]: https://ci.appveyor.com/project/gulpjs/glob-parent
131-
[appveyor-image]: https://img.shields.io/appveyor/ci/gulpjs/glob-parent.svg?label=appveyor
125+
[coveralls-url]: https://coveralls.io/r/gulpjs/glop-parent
126+
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/glop-parent/master.svg?style=flat-square
127+
<!-- prettier-ignore-end -->
132128

133-
[coveralls-url]: https://coveralls.io/r/gulpjs/glob-parent
134-
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/glob-parent/master.svg
135-
136-
[gitter-url]: https://gitter.im/gulpjs/gulp
137-
[gitter-image]: https://badges.gitter.im/gulpjs/gulp.svg
129+
<!-- prettier-ignore-start -->
130+
[expand-braces]: https://github.com/jonschlinkert/expand-braces
131+
[expand-brackets]: https://github.com/jonschlinkert/expand-brackets
132+
<!-- prettier-ignore-end -->

‎appveyor.yml

-24
This file was deleted.

‎index.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ var isWin32 = require('os').platform() === 'win32';
66

77
var slash = '/';
88
var backslash = /\\/g;
9-
var enclosure = /[\{\[].*[\}\]]$/;
10-
var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
11-
var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
9+
var enclosure = /[{[].*[}\]]$/;
10+
var globby = /(^|[^\\])([{[]|\([^)]+$)/;
11+
var escaped = /\\([!*?|[\](){}])/g;
1212

1313
/**
1414
* @param {string} str
1515
* @param {Object} opts
1616
* @param {boolean} [opts.flipBackslashes=true]
17-
* @returns {string}
1817
*/
1918
module.exports = function globParent(str, opts) {
2019
var options = Object.assign({ flipBackslashes: true }, opts);

‎package.json

+16-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"repository": "gulpjs/glob-parent",
1111
"license": "ISC",
1212
"engines": {
13-
"node": ">= 6"
13+
"node": ">=10.13.0"
1414
},
1515
"main": "index.js",
1616
"files": [
@@ -20,20 +20,26 @@
2020
"scripts": {
2121
"lint": "eslint .",
2222
"pretest": "npm run lint",
23-
"test": "nyc mocha --async-only",
24-
"azure-pipelines": "nyc mocha --async-only --reporter xunit -O output=test.xunit",
25-
"coveralls": "nyc report --reporter=text-lcov | coveralls"
23+
"test": "nyc mocha --async-only"
2624
},
2725
"dependencies": {
2826
"is-glob": "^4.0.1"
2927
},
3028
"devDependencies": {
31-
"coveralls": "^3.0.11",
32-
"eslint": "^2.13.1",
33-
"eslint-config-gulp": "^3.0.1",
34-
"expect": "^1.20.2",
35-
"mocha": "^6.0.2",
36-
"nyc": "^13.3.0"
29+
"eslint": "^7.0.0",
30+
"eslint-config-gulp": "^5.0.0",
31+
"expect": "^26.0.1",
32+
"mocha": "^7.1.2",
33+
"nyc": "^15.0.1"
34+
},
35+
"nyc": {
36+
"reporter": [
37+
"lcov",
38+
"text-summary"
39+
]
40+
},
41+
"prettier": {
42+
"singleQuote": true
3743
},
3844
"keywords": [
3945
"glob",

‎test/.eslintrc

-3
This file was deleted.

‎test/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)