Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
laurence79 committed Jan 16, 2025
2 parents 187bdc2 + a3da7ff commit b7e45bc
Show file tree
Hide file tree
Showing 102 changed files with 3,325 additions and 9,070 deletions.
5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

39 changes: 0 additions & 39 deletions .eslintrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ runs:
- uses: google/wireit@setup-github-actions-caching/v2

- run: npm ci
shell: bash
shell: bash
47 changes: 47 additions & 0 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build and test

on:
push:
branches:
- main
- next

pull_request:
branches:
- main
- next

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-node
- run: npm run lint

build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-node
- run: npm run build

test:
strategy:
matrix:
version: [18, 20, 22]
name: Test on node v${{ matrix.version }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.version }}
cache: npm

- uses: google/wireit@setup-github-actions-caching/v2
- run: npm ci
- run: npm run test
24 changes: 0 additions & 24 deletions .github/workflows/main_build.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/pull_request_build.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- run: npm run build

- name: Semantic Release
uses: cycjimmy/semantic-release-action@v3.4.2
uses: cycjimmy/semantic-release-action@v4.1.1
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ node_modules

# caches
.eslintcache
.wireit

# misc
.DS_Store
npm-debug.log*

# build output
lib
dist
/.tshy/
/.tshy-build/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/iron
5 changes: 0 additions & 5 deletions .prettierignore

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc → .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"arrowParens": "avoid",
"semi": true,
"trailingComma": "none",
Expand Down
4 changes: 1 addition & 3 deletions .releaserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ plugins:
- "@semantic-release/commit-analyzer"
- "@semantic-release/release-notes-generator"
- - "@semantic-release/github"
- assets:
- "dist/**/*.*"
- - "@semantic-release/npm"
- npmPublish: true
- - "@semantic-release/changelog"
Expand All @@ -22,4 +20,4 @@ plugins:
- assets:
- CHANGELOG.md
- package.json
- package-lock.json
- package-lock.json
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"autoBarrel.ignoreFilePathContainingAnyOf": ".spec,.test,.stories",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
},
Expand All @@ -14,11 +13,12 @@
"**/lib": true
},
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.referencesCodeLens.enabled": true,
"javascript.preferences.importModuleSpecifier": "relative",
"javascript.preferences.quoteStyle": "single",
"typescript.preferences.importModuleSpecifier": "relative",
"typescript.preferences.quoteStyle": "single",
"taskExplorer.pathToMake": "make",
"cSpell.language": "en-GB",
"cSpell.words": [
"cume",
"rivr",
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## [2.2.4-next.4](https://github.com/laurence79/ts-array-extensions/compare/2.2.4-next.3...2.2.4-next.4) (2025-01-16)


### Bug Fixes

* Missing file extensions on compact and compactMap ([947af23](https://github.com/laurence79/ts-array-extensions/commit/947af237e69aa9054cb876e6e4b40e7eef919f42))

## [2.2.4-next.3](https://github.com/laurence79/ts-array-extensions/compare/2.2.4-next.2...2.2.4-next.3) (2025-01-16)


### Bug Fixes

* Types not included in package ([54f6f44](https://github.com/laurence79/ts-array-extensions/commit/54f6f4416f50d29d4eafbc268349cdff258c4128))

## [2.2.4-next.2](https://github.com/laurence79/ts-array-extensions/compare/2.2.4-next.1...2.2.4-next.2) (2025-01-16)


### Bug Fixes

* Files not exported ([a73812f](https://github.com/laurence79/ts-array-extensions/commit/a73812fa5b65756d8333956f4680d4b470b717f0))

## [2.2.4-next.1](https://github.com/laurence79/ts-array-extensions/compare/2.2.3...2.2.4-next.1) (2025-01-16)


### Bug Fixes

* Individual functions are not exported ([#36](https://github.com/laurence79/ts-array-extensions/issues/36)) ([316690e](https://github.com/laurence79/ts-array-extensions/commit/316690ed8a4dc06a61f923bc47bd4681e26682e0))
68 changes: 68 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// @ts-check

import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import eslintPluginImportX from 'eslint-plugin-import-x';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import globals from 'globals';
import jest from 'eslint-plugin-jest';

export default tseslint.config(
{
ignores: ['dist/**/*.*', '.tshy/**/*.*', '.wireit/**/*.*']
},

eslint.configs.recommended,

...tseslint.configs.strictTypeChecked,
...tseslint.configs.stylisticTypeChecked,

eslintPluginImportX.flatConfigs.recommended,
eslintPluginImportX.flatConfigs.typescript,

{
rules: {
'import-x/order': 'error',
'@typescript-eslint/array-type': 'off',
'@typescript-eslint/no-unnecessary-condition': 'off',
'import-x/no-named-as-default-member': 'off',
'@typescript-eslint/unified-signatures': 'off',
'@typescript-eslint/consistent-type-definitions': 'off',
'@typescript-eslint/no-unnecessary-type-parameters': 'off'
}
},

{
languageOptions: {
parserOptions: {
projectService: {
allowDefaultProject: ['*.js', '*.cjs'],
defaultProject: 'tsconfig.json'
},
tsconfigRootDir: import.meta.dirname
},
globals: globals.node
}
},

eslintPluginPrettierRecommended,

{
files: ['**/*.js'],
rules: {
'@typescript-eslint/no-require-imports': 'off'
}
},

{
files: ['**/*.spec.*', '**/jest.*'],
plugins: { jest: jest },
languageOptions: {
globals: {
...globals.jest,
...globals.node,
...jest.environments.globals.globals
}
}
}
);
14 changes: 14 additions & 0 deletions jest.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/** @type {import('jest').Config} */
const config = {
roots: ['<rootDir>/src'],
testEnvironment: 'node',
transform: {
'^.+\\.(t|j)sx?$': '@swc/jest'
},
moduleNameMapper: {
'^(\\.{1,2}/.*)\\.js$': '$1'
},
extensionsToTreatAsEsm: ['.ts']
};

module.exports = config;
5 changes: 0 additions & 5 deletions jest.config.js

This file was deleted.

Loading

0 comments on commit b7e45bc

Please sign in to comment.