Skip to content

Commit

Permalink
Merge branch 'develop' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
qayrat-sultan authored Nov 22, 2023
2 parents b1d671f + 300e4c1 commit b160ced
Show file tree
Hide file tree
Showing 30 changed files with 4,153 additions and 9,950 deletions.
3 changes: 0 additions & 3 deletions .babelrc.js

This file was deleted.

1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ module.exports = {
"keyword-spacing": [error, {"before": true}],
"linebreak-style": [error, "unix"],
"no-confusing-arrow": error,
"no-console": error,
"no-else-return": error,
"no-eval": error,
"no-implied-eval": error,
Expand Down
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
registries: "*"
open-pull-requests-limit: 1000 # we don't want to limit PRs
schedule:
interval: "weekly" # runs once a week
day: "sunday"
time: "19:00"
timezone: "Europe/Paris"
labels:
- "dependencies" # default dependabot label
- "javascript" # default dependabot label
15 changes: 15 additions & 0 deletions .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Auto approve PRs by dependabot

# Trigger the workflow on pull request
on: pull_request_target

jobs:
autoapprove:
name: Auto-Approve a PR by dependabot
runs-on: ubuntu-latest
steps:
- name: Auto approve
uses: cognitedata/auto-approve-dependabot-action@v3.0.1
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
41 changes: 41 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Coverage
on:
pull_request:
branches: [ develop ]
jobs:
check:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16.x, 18.x, 20.x ]

steps:
- uses: actions/checkout@v2

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

- name: Install
run: npm install

- name: Instrument coverage
run: npm run coverage:instrument

- name: Check coverage
run: npm run coverage:check

- name: Check coverage
if: failure()
run: npm run coverage:report

- name: Exporting report
uses: actions/upload-artifact@v3
if: failure()
with:
name: coverage
path: |
./coverage
if-no-files-found: ignore
29 changes: 0 additions & 29 deletions .github/workflows/gulp.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Lint
on:
pull_request:
branches: [ develop ]
jobs:
check:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16.x, 18.x, 20.x ]

steps:
- uses: actions/checkout@v2

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

- name: Install
run: npm install

- name: Eslint
run: npm run lint
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Test
on:
pull_request:
branches: [ develop ]
jobs:
check:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16.x, 18.x, 20.x ]

steps:
- uses: actions/checkout@v2

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

- name: Install
run: npm install

- name: Build
run: npm run build

- name: Jasmine
run: npm run test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ coverage/
dist/
/languages.js
/languages.unmin.js
.nyc_output/
6 changes: 6 additions & 0 deletions .nycrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"all": true,
"include": [
"src/**/*.js"
]
}
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### Next

### 2.4.0

- Update a ton of dependencies. Thanks @BenjaminVanRyseghem
- Update the tool-chain. Thanks @BenjaminVanRyseghem

### 2.3.6

- Fix spacing issue with en-GB currency. Thanks @DamienCassou
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "numbro",
"repo": "BenjaminVanRyseghem/numbro",
"version": "2.3.6",
"version": "2.4.0",
"description": "Format and manipulate numbers.",
"keywords": [
"numeral",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "numbro",
"repo": "BenjaminVanRyseghem/numbro",
"version": "2.3.6",
"version": "2.4.0",
"description": "Format and manipulate numbers.",
"keywords": [
"numeral",
Expand Down
2 changes: 1 addition & 1 deletion eslint_rules/ensure-test-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

const path = require("path");
const fs = require("fs");
const minimatch = require("minimatch");
const {minimatch} = require("minimatch");

const MESSAGE = "No test file found for \"{{file}}\", expecting \"{{testFile}}\" to exists.";
const LOADING_MESSAGE = "A test file should load its matching source file (\"{{file}}\").";
Expand Down
Loading

0 comments on commit b160ced

Please sign in to comment.