Skip to content

Commit

Permalink
Merge pull request #102 from nodelib/the_next_major
Browse files Browse the repository at this point in the history
The next major
  • Loading branch information
mrmlnc committed Jul 28, 2023
2 parents 66a8bf3 + 6ae2e84 commit 3dda47f
Show file tree
Hide file tree
Showing 50 changed files with 73 additions and 78 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node_version: [14.17, 14, 16.0.0, 16, 18, 20]
node_version: [16.14.0, 16, 18, 20]
os:
- ubuntu-latest
- macos-latest
Expand All @@ -40,14 +40,11 @@ jobs:
run: npm run compile
- name: Run hygiene checks
run: npm run lint
if: ${{ !contains(fromJson('["14.17", "16.0.0"]'), matrix.node_version) }}
- name: Run dependencies checks
run: npm run lint:dependencies
if: ${{ !contains(fromJson('["14.17", "16.0.0"]'), matrix.node_version) }}
- name: Run size limit check
run: npm run lint:size
env:
TOOLS_SIZE_LIMIT_SKIP: '1'
if: ${{ !contains(fromJson('["14.17", "16.0.0"]'), matrix.node_version) }}
- name: Run unit tests
run: npm run test
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "A collection of standard libraries for Node.js",
"license": "MIT",
"engines": {
"node": "^14.17.0 || >=16.0.0"
"node": ">=16.14.0"
},
"scripts": {
"preversion": "npm run lint:size",
Expand All @@ -23,17 +23,17 @@
"@nodelib-internal/tools.size-limit": "file:tools/size-limit",
"@times-components/depend": "2.3.0",
"@types/mocha": "^10.0.1",
"@types/node": "^14.18.42",
"@types/node": "^16.18.39",
"@types/sinon": "^10.0.14",
"bencho": "^0.1.1",
"eslint": "^8.38.0",
"eslint-config-mrmlnc": "^3.0.0",
"eslint": "^8.45.0",
"eslint-config-mrmlnc": "^4.0.1",
"execa": "^7.1.1",
"hereby": "^1.8.1",
"lerna": "^5.6.2",
"mocha": "^10.2.0",
"rimraf": "^5.0.0",
"sinon": "^15.0.3",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
}
}
2 changes: 1 addition & 1 deletion packages/fs/fs.macchiato/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dirent"
],
"engines": {
"node": "^14.17.0 || >=16.0.0"
"node": ">=16.14.0"
},
"files": [
"out/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.macchiato/src/dirent.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as fs from 'fs';
import * as assert from 'node:assert';
import * as fs from 'node:fs';

import { Dirent, DirentType } from './dirent';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.macchiato/src/dirent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs';
import * as fs from 'node:fs';

// https://github.com/nodejs/node/blob/6675505686310771b8016805a381945826aad887/typings/internalBinding/constants.d.ts#L139-L146
export enum DirentType {
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.macchiato/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import { Dirent, Stats } from '.';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.macchiato/src/stats.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as fs from 'fs';
import * as assert from 'node:assert';
import * as fs from 'node:fs';

import * as sinon from 'sinon';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.macchiato/src/stats.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs';
import * as fs from 'node:fs';

import type { PrepareOptionsFromClass } from './types';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dirent"
],
"engines": {
"node": "^14.17.0 || >=16.0.0"
"node": ">=16.14.0"
},
"files": [
"out/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/adapters/fs.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import { Stats } from '@nodelib/fs.macchiato';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/adapters/fs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs';
import * as fs from 'node:fs';

import type * as fsStat from '@nodelib/fs.stat';
import type { Dirent, ErrnoException } from '../types';
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.scandir/src/benchmark/suites/async.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from 'path';
import * as util from 'util';
import * as path from 'node:path';
import * as util from 'node:util';

import * as bencho from 'bencho';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/benchmark/suites/sync.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as path from 'path';
import * as path from 'node:path';

import * as bencho from 'bencho';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/benchmark/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { performance } from 'perf_hooks';
import { performance } from 'node:perf_hooks';

import * as bencho from 'bencho';

Expand Down
6 changes: 3 additions & 3 deletions packages/fs/fs.scandir/src/providers/async.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as assert from 'assert';
import * as path from 'path';
import * as util from 'util';
import * as assert from 'node:assert';
import * as path from 'node:path';
import * as util from 'node:util';

import * as sinon from 'sinon';
import { Dirent, DirentType, Stats, StatsMode } from '@nodelib/fs.macchiato';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/providers/common.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as common from './common';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.scandir/src/providers/sync.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as path from 'path';
import * as assert from 'node:assert';
import * as path from 'node:path';

import * as sinon from 'sinon';
import { Dirent, DirentType, Stats, StatsMode } from '@nodelib/fs.macchiato';
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.scandir/src/scandir.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as fs from 'fs';
import * as assert from 'node:assert';
import * as fs from 'node:fs';

import * as rimraf from 'rimraf';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.scandir/src/settings.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as path from 'path';
import * as assert from 'node:assert';
import * as path from 'node:path';

import { Stats } from '@nodelib/fs.macchiato';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/settings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as path from 'path';
import * as path from 'node:path';

import * as fsStat from '@nodelib/fs.stat';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type * as fs from 'fs';
import type * as fs from 'node:fs';

export interface Entry {
dirent: Dirent;
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/utils/fs.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import { Stats } from '@nodelib/fs.macchiato';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.scandir/src/utils/fs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs';
import * as fs from 'node:fs';

import type { Dirent } from '../types';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"stat"
],
"engines": {
"node": "^14.17.0 || >=16.0.0"
"node": ">=16.14.0"
},
"files": [
"out/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/adapters/fs.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import { Stats } from '@nodelib/fs.macchiato';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/adapters/fs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as fs from 'fs';
import * as fs from 'node:fs';

import type { ErrnoException } from '../types';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/providers/async.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as sinon from 'sinon';
import { Stats, StatsMode } from '@nodelib/fs.macchiato';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/providers/sync.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as sinon from 'sinon';
import { Stats, StatsMode } from '@nodelib/fs.macchiato';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/settings.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import { Stats } from '@nodelib/fs.macchiato';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.stat/src/stat.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as fs from 'fs';
import * as assert from 'node:assert';
import * as fs from 'node:fs';

import * as rimraf from 'rimraf';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.stat/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type * as fs from 'fs';
import type * as fs from 'node:fs';

export type Stats = fs.Stats;
export type ErrnoException = NodeJS.ErrnoException;
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"crawler"
],
"engines": {
"node": "^14.17.0 || >=16.0.0"
"node": ">=16.14.0"
},
"files": [
"out/**",
Expand All @@ -40,7 +40,7 @@
},
"dependencies": {
"@nodelib/fs.scandir": "2.1.5",
"fastq": "^1.13.0"
"fastq": "^1.15.0"
},
"devDependencies": {
"@nodelib/fs.macchiato": "1.0.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/src/benchmark/suites/async.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from 'path';
import * as util from 'util';
import * as path from 'node:path';
import * as util from 'node:util';

import * as bencho from 'bencho';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/src/benchmark/suites/stream.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as path from 'path';
import * as path from 'node:path';

import * as bencho from 'bencho';

import * as utils from '../utils';

import type { Readable } from 'stream';
import type { Readable } from 'node:stream';
import type { Options } from '@nodelib/fs.walk.previous';

type WalkImplementation = 'current' | 'previous';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/benchmark/suites/sync.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as path from 'path';
import * as path from 'node:path';

import * as bencho from 'bencho';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/benchmark/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { performance } from 'perf_hooks';
import { performance } from 'node:perf_hooks';

import * as bencho from 'bencho';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/providers/async.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as sinon from 'sinon';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/src/providers/stream.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import { Readable } from 'stream';
import * as assert from 'node:assert';
import { Readable } from 'node:stream';

import * as tests from '../tests';
import { StreamProvider } from './stream';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/providers/stream.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Readable } from 'stream';
import { Readable } from 'node:stream';

import type { IAsyncReader } from '../readers';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/providers/sync.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as tests from '../tests';
import { SyncProvider } from './sync';
Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/src/readers/async.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as path from 'path';
import * as assert from 'node:assert';
import * as path from 'node:path';

import { Settings } from '../settings';
import * as tests from '../tests';
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/readers/async.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';

import * as fastq from 'fastq';

Expand Down
4 changes: 2 additions & 2 deletions packages/fs/fs.walk/src/readers/common.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as path from 'path';
import * as assert from 'node:assert';
import * as path from 'node:path';

import { Settings } from '../settings';
import * as tests from '../tests';
Expand Down
6 changes: 3 additions & 3 deletions packages/fs/fs.walk/src/readers/sync.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as assert from 'assert';
import * as path from 'path';
import * as assert from 'node:assert';
import * as path from 'node:path';

import { Settings } from '../settings';
import * as tests from '../tests';
import { SyncReader } from './sync';

import type * as sinon from 'sinon';
import type { IFileSystemAdapter } from '../adapters/fs';
import type * as sinon from 'sinon';

class TestReader extends SyncReader {
public readonly fs: sinon.SinonStubbedInstance<IFileSystemAdapter>;
Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/settings.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as assert from 'assert';
import * as assert from 'node:assert';

import * as fsScandir from '@nodelib/fs.scandir';

Expand Down
2 changes: 1 addition & 1 deletion packages/fs/fs.walk/src/settings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as path from 'path';
import * as path from 'node:path';

import * as fsScandir from '@nodelib/fs.scandir';

Expand Down
6 changes: 3 additions & 3 deletions packages/fs/fs.walk/src/walk.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as assert from 'assert';
import * as fs from 'fs';
import * as assert from 'node:assert';
import * as fs from 'node:fs';

import * as rimraf from 'rimraf';

import { walk, walkSync, walkStream } from './walk';
import { Settings } from './settings';

import type { Readable } from 'stream';
import type { Readable } from 'node:stream';
import type { ErrnoException, Entry } from './types';

const entryFilter = (entry: Entry): boolean => !entry.dirent.isDirectory();
Expand Down

0 comments on commit 3dda47f

Please sign in to comment.