Skip to content

Commit

Permalink
Merge pull request #196 from hildjj/update-deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
hildjj authored Oct 25, 2024
2 parents 8ba2510 + 6caf7f6 commit 7868c19
Show file tree
Hide file tree
Showing 124 changed files with 23,458 additions and 3,286 deletions.
24 changes: 0 additions & 24 deletions .eslintrc.js

This file was deleted.

53 changes: 18 additions & 35 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,39 @@ on:
branches: [master, main]
pull_request:
branches: [master, main]
workflow_call:
secrets:
codecov_token:
required: true

jobs:
build:

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
platform: [ubuntu-20.04, windows-latest]
node-version: [18.x, 20.x, 22.x]
platform: [ubuntu-latest, windows-latest]

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- run: corepack enable
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Cache pnpm modules
uses: actions/cache@v3
env:
cache-name: cache-pnpm-modules
with:
# pnpm cache files are stored in `~/.pnpm-store` on Linux/macOS
path: ~/.pnpm-store
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.5.0
run_install: |
- recursive: true
args: [--filter, '!*-demo', --filter, '!cbor-web']
cache: 'pnpm'
- name: Install dependencies
run: pnpm i -r --filter '!*-demo' --filter '!cbor-web'
- name: Test ${{ matrix.node-version }}
run: npm run coverage
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
with:
github-token: ${{ secrets.github_token }}
flag-name: node-${{ matrix.node-version }}
parallel: true
finish:
needs: build
runs-on: ubuntu-20.04
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
fail_ci_if_error: true
verbose: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ typings.json
shrinkwrap.yaml
npm-debug.log
t.js
pnpm-lock.yaml
yarn.lock
yarn-error.log
13 changes: 8 additions & 5 deletions .ncurc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
'use strict'
'use strict';

module.exports = {
reject: [
"marked",
"p-event",
]
}
'json-text-sequence',
'marked',
'nofilter',
'p-event',
'rimraf',
],
};
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
engine-strict=true
package-lock=false
strict-peer-dependencies=false
14 changes: 7 additions & 7 deletions ava.config.cjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
'use strict'
'use strict';

const path = require('path')
const path = require('node:path');
const config = {
files: ['./packages/*/test/*.ava.js'],
timeout: '5m',
}
};

if (process.env.CBOR_PACKAGE) {
const NODE_PATH = [
path.resolve(__dirname, 'packages', 'cbor', 'node_modules'),
]
];
if (process.env.NODE_PATH) {
NODE_PATH.push(...process.env.NODE_PATH.split(path.delimiter))
NODE_PATH.push(...process.env.NODE_PATH.split(path.delimiter));
}
config.environmentVariables = {
NODE_PATH: NODE_PATH.join(path.delimiter),
}
};
}
module.exports = config
module.exports = config;
52 changes: 52 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import ava from '@cto.af/eslint-config/ava.js';
import base from '@cto.af/eslint-config';
import globals from '@cto.af/eslint-config/globals.js';
import markdown from '@cto.af/eslint-config/markdown.js';

export default [
{
ignores: [
'packages/browserify-demo/dist/**',
'packages/cbor-bigdecimal/dist/**',
'packages/cbor-web/dist/**',
'packages/plain-demo/dist/**',
'packages/webpack-demo/dist/**',
'**/*.d.ts',
],
},
...base,
...markdown,
...ava,
{
files: [
'packages/cbor/lib/**',
'packages/cbor/test/**',
'packages/browserify-demo/src/**',
'packages/webpack-demo/src/**',
],
rules: {
'n/prefer-node-protocol': 'off',
},
},
{
files: [
'packages/cbor-cli/**',
],
rules: {
'no-console': 'off',
},
},
{
files: [
'packages/cbor-web/lib/**',
'packages/parcel-demo/src/**',
],
languageOptions: {
sourceType: 'module',
globals: globals.browser,
},
rules: {
'n/prefer-node-protocol': 'off',
},
},
];
52 changes: 30 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
"name": "Joe Hildebrand",
"email": "joe-github@cursive.net"
},
"workspaces": [
"./packages/*"
],
"scripts": {
"clean": "rimraf node_modules coverage .nyc_output packages/*/node_modules packages/*/coverage packages/*/.nyc_output",
"docs": "jsdoc -c .jsdoc.conf",
"lint": "eslint . --ext cjs,mjs,js,md",
"lint": "eslint .",
"test": "ava packages/*/test/*.ava.js",
"test:versions": "nve --continue --arch x64 --parallel 20,18,16,14 npm test",
"test:versions": "nve --continue --arch x64 --parallel 22,20,18 npm test",
"test:bigendian": "docker run --rm -it -v ${PWD}:/root/cbor -w /root/cbor s390x/node npm test",
"test:spot-check": "ava test/*.ava.js && CBOR_PACKAGE=${INIT_CWD}/packages/cbor-web/dist/cbor.js npm run test",
"test:web": "node packages/puppeteer-demo/index.js",
Expand All @@ -27,31 +24,42 @@
"copy": "pnpm -r copy"
},
"dependencies": {
"nofilter": "^3.1.0"
"nofilter": "^3.0.2"
},
"devDependencies": {
"@cto.af/eslint-config": "^1.1.2",
"ava": "^5.2.0",
"bignumber.js": "^9.1.1",
"@cto.af/eslint-config": "^5.0.1",
"ava": "5.2.0",
"bignumber.js": "^9.1.2",
"copyfiles": "2.4.1",
"docdash": "2.0.1",
"eslint": "^8.40.0",
"eslint-plugin-ava": "^14.0.0",
"eslint-plugin-jsdoc": "^44.2.3",
"eslint-plugin-markdown": "^3.0.0",
"docdash": "2.0.2",
"eslint": "^9.13.0",
"eslint-plugin-ava": "^15.0.1",
"eslint-plugin-jsdoc": "^50.4.3",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-node": "^11.1.0",
"jsdoc": "^4.0.2",
"lerna": "^6.6.2",
"jsdoc": "^4.0.4",
"lerna": "^8.1.8",
"light-server": "^2.9.1",
"minami": "*",
"nve": "^15.5.0",
"nyc": "^15.1.0",
"rimraf": "^5.0.0",
"typedoc": "0.24.7",
"typescript": "^5.0.4"
"nve": "^18.0.1",
"nyc": "^17.1.0",
"rimraf": "5.0.10",
"typedoc": "0.26.10",
"typescript": "^5.6.3"
},
"license": "MIT",
"packageManager": "pnpm@9.12.2",
"overrides": {
"@typescript-eslint/utils": "8.0.0-alpha.30",
"@typescript-eslint/parser": "8.0.0-alpha.30"
},
"pnpm": {
"overrides": {
"@typescript-eslint/utils": "8.0.0-alpha.30",
"@typescript-eslint/parser": "8.0.0-alpha.30"
}
},
"engines": {
"node": ">=16"
"node": ">=18"
}
}
10 changes: 5 additions & 5 deletions packages/browserify-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"author": "Joe Hildebrand <joe-github@cursive.net>",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.21.8",
"@babel/core": "^7.25.9",
"babelify": "^10.0.0",
"browserify": "^17.0.0",
"browserify": "^17.0.1",
"cbor-bigdecimal": "^9.0.0",
"copyfiles": "^2.4.1",
"node-inspect-extracted": "*",
"rimraf": "^5.0.0",
"terser": "^5.17.3"
"rimraf": "5.0.10",
"terser": "^5.36.0"
},
"engines": {
"node": ">=16"
"node": ">=18"
}
}
Loading

0 comments on commit 7868c19

Please sign in to comment.