Skip to content

Commit 63fae05

Browse files
committed
Merge branch 'main' into beta
2 parents c8dabc5 + 2986f0e commit 63fae05

File tree

11 files changed

+8699
-11756
lines changed

11 files changed

+8699
-11756
lines changed

.github/workflows/build-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: install
2323
run: yarn install
2424
- name: build
25-
run: yarn build
25+
run: yarn xy build
2626
# test:
2727
# runs-on: ubuntu-latest
2828
# env:

.vscode/extensions.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
4-
"streetsidesoftware.code-spell-checker"
4+
"streetsidesoftware.code-spell-checker",
5+
"kravets.vscode-publint"
56
]
67
}

.yarn/releases/yarn-4.6.0.cjs renamed to .yarn/releases/yarn-4.8.0.cjs

+346-345
Large diffs are not rendered by default.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ plugins:
88
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
99
spec: "https://mskelton.dev/yarn-outdated/v3"
1010

11-
yarnPath: .yarn/releases/yarn-4.6.0.cjs
11+
yarnPath: .yarn/releases/yarn-4.8.0.cjs

babel.config.json

-6
This file was deleted.

eslint.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { typescriptConfig,
99

1010
export default [
1111
{
12-
ignores: ['.yarn/**', 'jest.config.cjs', '**/dist/**', 'dist', 'build/**', 'node_modules/**', 'public', '.storybook', 'storybook-static', 'eslint.config.mjs', 'coverage'],
12+
ignores: ['.yarn/**', '**/dist/**', 'dist', 'build/**', 'node_modules/**', 'public', '.storybook', 'storybook-static', 'eslint.config.mjs', 'coverage'],
1313
},
1414
unicornConfig,
1515
workspacesConfig,

jest.config.cjs

-42
This file was deleted.

package.json

+13-41
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,29 @@
77
"license": "LGPL-3.0-only",
88
"author": "Arie Trouw",
99
"type": "module",
10-
"exports": {
11-
".": {
12-
"node": {
13-
"types": "./dist/node/index.d.ts",
14-
"default": "./dist/node/index.mjs"
15-
},
16-
"types": "./dist/node/index.d.ts",
17-
"default": "./dist/node/index.mjs"
18-
},
19-
"./package.json": "./package.json",
20-
"./README.md": "./README.md"
21-
},
22-
"module": "dist/node/index.mjs",
23-
"types": "dist/node/index.d.ts",
24-
"files": [
25-
"dist"
26-
],
2710
"scripts": {
28-
"deploy": "echo Deploy not allowed!",
29-
"deploy3": "echo Deploy3 not allowed!",
3011
"start": "nodemon",
31-
"start-esm": "node ./dist/node/index.mjs",
32-
"test": "jest --no-cache --forceExit",
33-
"test:ci": "jest --runInBand --coverage --forceExit --passWithNoTests"
12+
"start-esm": "node ./dist/node/index.mjs"
3413
},
3514
"dependencies": {
36-
"@xyo-network/node-app": "^3.2.3",
37-
"lodash-es": "^4.17.21"
15+
"@xyo-network/node-app": "^3.4.2"
3816
},
3917
"devDependencies": {
40-
"@babel/core": "^7.26.0",
41-
"@babel/preset-env": "^7.26.0",
42-
"@babel/preset-typescript": "^7.26.0",
43-
"@types/jest": "^29.5.14",
44-
"@types/node": "^22.10.2",
18+
"@types/node": "^22.14.0",
4519
"@types/source-map-support": "0.5.10",
46-
"@typescript-eslint/eslint-plugin": "^8.19.0",
47-
"@typescript-eslint/parser": "^8.19.0",
48-
"@xylabs/eslint-config-flat": "^4.2.6",
49-
"@xylabs/ts-scripts-yarn3": "^4.2.6",
50-
"@xylabs/tsconfig": "^4.2.6",
51-
"@xylabs/tsconfig-jest": "^4.1.0",
52-
"babel-jest": "^29.7.0",
20+
"@typescript-eslint/eslint-plugin": "^8.29.0",
21+
"@typescript-eslint/parser": "^8.29.0",
22+
"@xylabs/eslint-config-flat": "^6.2.1",
23+
"@xylabs/ts-scripts-yarn3": "^6.2.1",
24+
"@xylabs/tsconfig": "^6.2.1",
5325
"depcheck": "^1.4.7",
54-
"eslint": "^9.17.0",
55-
"eslint-import-resolver-typescript": "^3.7.0",
56-
"jest-extended": "^4.0.2",
26+
"eslint": "^9.24.0",
27+
"eslint-import-resolver-typescript": "^4.3.1",
28+
"knip": "^5.47.0",
5729
"nodemon": "^3.1.9",
58-
"typescript": "^5.7.2"
30+
"typescript": "^5.8.3"
5931
},
60-
"packageManager": "yarn@4.6.0",
32+
"packageManager": "yarn@4.8.0",
6133
"engines": {
6234
"node": ">=22"
6335
},

tsconfig.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
{
2-
"compilerOptions": {
3-
"emitDecoratorMetadata": true,
4-
"esModuleInterop": true,
5-
"experimentalDecorators": true,
6-
"typeRoots": []
7-
},
82
"exclude": ["./node_modules", "./**/node_modules", "./dist", "./**/dist", "./**/docs", ".*"],
9-
"extends": "@xylabs/tsconfig",
10-
"include": [
11-
"./src", "./**/src"
12-
]
3+
"extends": "@xylabs/tsconfig"
134
}

xy.config.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import type { XyTsupConfig } from '@xylabs/ts-scripts-yarn3'
2+
const config: XyTsupConfig = {
3+
compile: {
4+
browser: {},
5+
neutral: {},
6+
node: { src: true },
7+
},
8+
}
9+
10+
export default config

0 commit comments

Comments
 (0)