Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
39 changes: 39 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: CI

on:
push:
branches:
- '**'
tags-ignore:
- 'v*'

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout 🛎️
uses: actions/checkout@v4

- name: pnpm 🧰
uses: pnpm/action-setup@v4
with:
version: 10.4.0

- name: Node 🧰
uses: actions/setup-node@v4
with:
node-version: 22.x
cache: 'pnpm'

- name: Install 📦
run: pnpm install

- name: Lint 🔎
run: pnpm -filter organization-config lint

- name: Test 🐛
run: pnpm -filter organization-config test

- name: Build 🛠
run: pnpm -filter organization-config build
9 changes: 0 additions & 9 deletions packages/organization-config/.eslintrc.cjs

This file was deleted.

32 changes: 32 additions & 0 deletions packages/organization-config/biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": []
},
"formatter": {
"enabled": true,
"indentStyle": "space",
"indentWidth": 2,
"formatWithErrors": true
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"semicolons": "asNeeded"
}
}
}
23 changes: 11 additions & 12 deletions packages/organization-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"url": "https://github.com/commercelayer/common-utils/issues"
},
"scripts": {
"lint": "eslint src --ext .ts,.tsx",
"lint:fix": "eslint src --ext .ts,.tsx --fix",
"lint": "pnpm biome check src",
"lint:fix": "pnpm biome check src --write",
"test": "pnpm run lint && vitest run --silent",
"test:verbose": "pnpm run lint && vitest run --silent=false",
"bench": "vitest bench",
Expand All @@ -45,18 +45,17 @@
"generate:types": "node src/schema/generate.js"
},
"devDependencies": {
"@commercelayer/eslint-config-ts": "workspace:^",
"@types/lodash": "^4.17.6",
"@types/node": "^22.10.5",
"@types/lodash": "^4.17.16",
"@biomejs/biome": "^1.9.4",
"@types/node": "^22.15.16",
"deepmerge": "^4.3.1",
"deepmerge-ts": "^7.0.3",
"eslint": "^8.57.0",
"json-schema-to-typescript": "^15.0.3",
"deepmerge-ts": "^7.1.5",
"json-schema-to-typescript": "^15.0.4",
"lodash": "^4.17.21",
"tsup": "^8.1.0",
"type-fest": "^4.32.0",
"typescript": "^5.5.2",
"vitest": "^1.6.0"
"tsup": "^8.4.0",
"type-fest": "^4.41.0",
"typescript": "^5.8.3",
"vitest": "^3.1.3"
},
"dependencies": {
"merge-anything": "^5.1.7"
Expand Down
30 changes: 15 additions & 15 deletions packages/organization-config/src/getMfeConfig.benchmark.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
import dm from 'deepmerge'
import { deepmerge as dmts } from 'deepmerge-ts'
import merge from 'lodash/merge'
import { merge as anything } from 'merge-anything'
import { bench, describe } from 'vitest'
import { defaultConfig, overrideConfig } from './getMfeConfig.test.js'
import dm from "deepmerge"
import { deepmerge as dmts } from "deepmerge-ts"
import merge from "lodash/merge"
import { merge as anything } from "merge-anything"
import { bench, describe } from "vitest"
import { defaultConfig, overrideConfig } from "./testHelper"

describe('merging', () => {
describe("merging", () => {
bench(
'lodash',
"lodash",
() => {
merge(JSON.parse(JSON.stringify(defaultConfig)), overrideConfig)
},
{ time: 1000 }
{ time: 1000 },
)

bench(
'deepmerge',
"deepmerge",
() => {
dm(defaultConfig, overrideConfig)
},
{ time: 1000 }
{ time: 1000 },
)

bench(
'deepmerge-ts',
"deepmerge-ts",
() => {
dmts(defaultConfig, { ...overrideConfig })
},
{ time: 1000 }
{ time: 1000 },
)

bench(
'merge-anything',
"merge-anything",
() => {
anything(defaultConfig, { ...overrideConfig })
},
{ time: 1000 }
{ time: 1000 },
)
})
Loading