Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: Normalize repository, dropping node <10.13 support #101

Merged
merged 6 commits into from
Oct 31, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: dev
on:
pull_request:
push:
branches:
- master
env:
CI: true

jobs:
prettier:
name: Format code
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Prettier
uses: gulpjs/prettier_action@v3.0
with:
commit_message: 'Build: Run prettier'
prettier_options: '--write .'

test:
name: Tests for Node ${{ matrix.node }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
node: [10, 12, 14]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Clone repository
uses: actions/checkout@v2

- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- run: node --version
- run: npm --version

- name: Install npm dependencies
run: npm install

- name: Run lint
run: npm run lint

- name: Run tests
run: npm test

- name: Coveralls
uses: coverallsapp/github-action@v1.1.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: ${{matrix.os}}-node-${{ matrix.node }}
parallel: true

coveralls:
needs: test
name: Finish up

runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v1.1.0
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
46 changes: 42 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,67 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

# Garbage files
.DS_Store

# Test results
test.xunit
3 changes: 0 additions & 3 deletions .jscsrc

This file was deleted.

1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage/
.nyc_output/
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors
Copyright (c) 2015-2020 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

# glob-stream

[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![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]
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][ci-image]][ci-url] [![Coveralls Status][coveralls-image]][coveralls-url]

A [Readable Stream][readable-stream-url] interface over [node-glob][node-glob-url].

## Usage

```javascript
```js
var gs = require('glob-stream');

var readable = gs('./files/**/*.coffee', { /* options */ });
Expand Down Expand Up @@ -131,23 +131,19 @@ The maintainers of glob-stream and thousands of other packages are working with

MIT

<!-- prettier-ignore-start -->
[node-glob-url]: https://github.com/isaacs/node-glob
[glob-parent-url]: https://github.com/es128/glob-parent
[allow-empty-url]: #optionsallowempty
[readable-stream-url]: https://nodejs.org/api/stream.html#stream_readable_streams

[downloads-image]: http://img.shields.io/npm/dm/glob-stream.svg
[downloads-image]: https://img.shields.io/npm/dm/glob-stream.svg?style=flat-square
[npm-url]: https://www.npmjs.com/package/glob-stream
[npm-image]: http://img.shields.io/npm/v/glob-stream.svg

[travis-url]: https://travis-ci.org/gulpjs/glob-stream
[travis-image]: http://img.shields.io/travis/gulpjs/glob-stream.svg?label=travis-ci
[npm-image]: https://img.shields.io/npm/v/glob-stream.svg?style=flat-square

[appveyor-url]: https://ci.appveyor.com/project/gulpjs/glob-stream
[appveyor-image]: https://img.shields.io/appveyor/ci/gulpjs/glob-stream.svg?label=appveyor
[ci-url]: https://github.com/gulpjs/glob-stream/actions?query=workflow:dev
[ci-image]: https://img.shields.io/github/workflow/status/gulpjs/glob-stream/dev?style=flat-square

[coveralls-url]: https://coveralls.io/r/gulpjs/glob-stream
[coveralls-image]: http://img.shields.io/coveralls/gulpjs/glob-stream.svg

[gitter-url]: https://gitter.im/gulpjs/gulp
[gitter-image]: https://badges.gitter.im/gulpjs/gulp.svg
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/glob-stream/master.svg?style=flat-square
<!-- prettier-ignore-end -->
25 changes: 0 additions & 25 deletions appveyor.yml

This file was deleted.

33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "glob-stream",
"version": "6.1.0",
"description": "A Readable Stream interface over node-glob.",
"author": "Gulp Team <team@gulpjs.com> (http://gulpjs.com/)",
"author": "Gulp Team <team@gulpjs.com> (https://gulpjs.com/)",
"contributors": [
"Eric Schoffstall <yo@contra.io>",
"Blaine Bublitz <blaine.bublitz@gmail.com>"
],
"repository": "gulpjs/glob-stream",
"license": "MIT",
"engines": {
"node": ">= 0.10"
"node": ">=10.13.0"
},
"main": "index.js",
"files": [
Expand All @@ -19,11 +19,9 @@
"LICENSE"
],
"scripts": {
"lint": "eslint . && jscs index.js readable.js test/",
"lint": "eslint .",
"pretest": "npm run lint",
"test": "mocha --async-only",
"cover": "istanbul cover _mocha --report lcovonly",
"coveralls": "npm run cover && istanbul-coveralls"
"test": "nyc mocha --async-only"
},
"dependencies": {
"extend": "^3.0.0",
Expand All @@ -38,15 +36,22 @@
"unique-stream": "^2.0.2"
},
"devDependencies": {
"eslint": "^1.10.3",
"eslint-config-gulp": "^2.0.0",
"expect": "^1.19.0",
"istanbul": "^0.4.3",
"istanbul-coveralls": "^1.0.3",
"jscs": "^2.4.0",
"jscs-preset-gulp": "^1.0.0",
"eslint": "^7.0.0",
"eslint-config-gulp": "^5.0.0",
"expect": "^26.0.1",
"mississippi": "^1.2.0",
"mocha": "^2.4.5"
"mocha": "^7.1.2",
"nyc": "^15.0.1",
"sinon": "^9.2.3"
},
"nyc": {
"reporter": [
"lcov",
"text-summary"
]
},
"prettier": {
"singleQuote": true
},
"keywords": [
"glob",
Expand Down
3 changes: 0 additions & 3 deletions test/.eslintrc

This file was deleted.

Empty file added test/.gitkeep
Empty file.
22 changes: 11 additions & 11 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ describe('glob-stream', function() {

function assert(pathObjs) {
expect(pathObjs.length).toEqual(3);
expect(pathObjs).toInclude(expected[0]);
expect(pathObjs).toInclude(expected[1]);
expect(pathObjs).toInclude(expected[2]);
expect(pathObjs).toContainEqual(expected[0]);
expect(pathObjs).toContainEqual(expected[1]);
expect(pathObjs).toContainEqual(expected[2]);
}

pipe([
Expand Down Expand Up @@ -397,8 +397,8 @@ describe('glob-stream', function() {

function assert(pathObjs) {
expect(pathObjs.length).toEqual(2);
expect(pathObjs).toInclude(expected[0]);
expect(pathObjs).toInclude(expected[1]);
expect(pathObjs).toContainEqual(expected[0]);
expect(pathObjs).toContainEqual(expected[1]);
}

pipe([
Expand Down Expand Up @@ -608,7 +608,7 @@ describe('glob-stream', function() {

it('emits an error when file not found on singular path', function(done) {
function assert(err) {
expect(err).toMatch(/File not found with singular glob/);
expect(err.toString()).toMatch(/File not found with singular glob/);
done();
}

Expand All @@ -620,7 +620,7 @@ describe('glob-stream', function() {

it('does not emit an error when file not found on glob containing {}', function(done) {
function assert(err) {
expect(err).toNotExist();
expect(err).not.toEqual(expect.anything());
done();
}

Expand All @@ -632,7 +632,7 @@ describe('glob-stream', function() {

it('does not emit an error on singular path when allowEmpty is true', function(done) {
function assert(err) {
expect(err).toNotExist();
expect(err).not.toEqual(expect.anything());
done();
}

Expand All @@ -644,7 +644,7 @@ describe('glob-stream', function() {

it('emits an error when a singular path in multiple paths not found', function(done) {
function assert(err) {
expect(err).toMatch(/File not found with singular glob/);
expect(err.toString()).toMatch(/File not found with singular glob/);
done();
}

Expand All @@ -656,7 +656,7 @@ describe('glob-stream', function() {

it('emits an error when a singular path in multiple paths/globs not found', function(done) {
function assert(err) {
expect(err).toMatch(/File not found with singular glob/);
expect(err.toString()).toMatch(/File not found with singular glob/);
done();
}

Expand Down Expand Up @@ -700,7 +700,7 @@ describe('options', function() {

var stream = globStream(dir + '/fixtures/stuff/run.dmc', opts);
expect(Object.keys(opts).length).toEqual(0);
expect(opts).toNotEqual(defaultedOpts);
expect(opts).not.toEqual(defaultedOpts);

pipe([
stream,
Expand Down
Loading