Skip to content

Commit 08ee86c

Browse files
committed
Merge remote-tracking branch 'makenew/public' into eslint-v10
2 parents 3ff2b43 + e047444 commit 08ee86c

File tree

13 files changed

+2389
-1330
lines changed

13 files changed

+2389
-1330
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
name: ${{ needs.build.outputs.artifact_name }}
8484
path: .
8585
- name: Find packages
86-
uses: tj-actions/glob@v21
86+
uses: tj-actions/glob@v22
8787
id: packages
8888
with:
8989
files: '*.tgz'

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Format
3333
run: npm run format
3434
- name: Commit
35-
uses: stefanzweifel/git-auto-commit-action@v5
35+
uses: stefanzweifel/git-auto-commit-action@v6
3636
if: always()
3737
with:
3838
commit_message: 'ci: Format code'

.github/workflows/generate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Normalize package-lock.json
3535
run: npm install
3636
- name: Commit
37-
uses: stefanzweifel/git-auto-commit-action@v5
37+
uses: stefanzweifel/git-auto-commit-action@v6
3838
with:
3939
commit_message: 'ci: Generate code'
4040
commit_user_name: ${{ secrets.GIT_USER_NAME }}

.github/workflows/semantic-release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ run-name: Semantic Release from ${{ github.ref_name }}
66
on:
77
push:
88
branches:
9-
- '**'
9+
- 'main'
10+
- 'next'
11+
- 'next-major'
12+
- 'beta'
13+
- 'alpha'
14+
- '*.x'
1015

1116
concurrency:
1217
group: ${{ github.workflow }}-${{ github.ref_name }}

.gitignore

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ package
2828
# Temporary development files
2929
tmp
3030

31-
# Yarn lockfile (only package-lock.json supported)
31+
# Other lockfiles (only package-lock.json supported)
32+
pnpm-lock.yaml
3233
yarn.lock
3334

3435
# Logs
@@ -38,7 +39,6 @@ npm-debug.log*
3839
yarn-debug.log*
3940
yarn-error.log*
4041
lerna-debug.log*
41-
.pnpm-debug.log*
4242

4343
# Diagnostic reports (https://nodejs.org/api/report.html)
4444
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -90,12 +90,6 @@ web_modules/
9090
# Optional stylelint cache
9191
.stylelintcache
9292

93-
# Microbundle cache
94-
.rpt2_cache/
95-
.rts2_cache_cjs/
96-
.rts2_cache_es/
97-
.rts2_cache_umd/
98-
9993
# Optional REPL history
10094
.node_repl_history
10195

@@ -107,10 +101,8 @@ web_modules/
107101

108102
# dotenv environment variable files
109103
.env
110-
.env.development.local
111-
.env.test.local
112-
.env.production.local
113-
.env.local
104+
.env.*
105+
!.env.example
114106

115107
# parcel-bundler cache (https://parceljs.org/)
116108
.cache
@@ -137,6 +129,15 @@ dist
137129
.temp
138130
.cache
139131

132+
# Sveltekit cache directory
133+
.svelte-kit/
134+
135+
# vitepress build output
136+
**/.vitepress/dist
137+
138+
# vitepress cache directory
139+
**/.vitepress/cache
140+
140141
# Docusaurus cache and generated files
141142
.docusaurus
142143

@@ -149,18 +150,27 @@ dist
149150
# DynamoDB Local files
150151
.dynamodb/
151152

153+
# Firebase cache directory
154+
.firebase/
155+
152156
# TernJS port file
153157
.tern-port
154158

155159
# Stores VSCode versions used for testing VSCode extensions
156160
.vscode-test
157161

158-
# yarn v2
159-
.yarn/cache
160-
.yarn/unplugged
161-
.yarn/build-state.yml
162-
.yarn/install-state.gz
162+
# yarn v3
163163
.pnp.*
164+
.yarn/*
165+
!.yarn/patches
166+
!.yarn/plugins
167+
!.yarn/releases
168+
!.yarn/sdks
169+
!.yarn/versions
170+
171+
# Vite logs files
172+
vite.config.js.timestamp-*
173+
vite.config.ts.timestamp-*
164174

165175
# Windows
166176

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021-2024 Seam Labs, Inc.
3+
Copyright (c) 2021-2025 Seam Labs, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

eslint.config.ts

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import { globalIgnores } from 'eslint/config'
2+
import importPlugin from 'eslint-plugin-import'
3+
import simpleImportSort from 'eslint-plugin-simple-import-sort'
4+
import unusedImports from 'eslint-plugin-unused-imports'
5+
import neostandard, { resolveIgnoresFromGitignore } from 'neostandard'
6+
7+
const files = ['**/*.{ts,tsx}']
8+
9+
export default [
10+
globalIgnores(resolveIgnoresFromGitignore()),
11+
...neostandard({ ts: true, noStyle: true }),
12+
{
13+
files,
14+
rules: {
15+
'no-console': 'error',
16+
'@typescript-eslint/no-non-null-assertion': 'error',
17+
},
18+
},
19+
{
20+
files,
21+
plugins: {
22+
'unused-imports': unusedImports,
23+
import: importPlugin,
24+
},
25+
rules: {
26+
'@typescript-eslint/no-unused-vars': 'off',
27+
'@typescript-eslint/no-import-type-side-effects': 'error',
28+
'@typescript-eslint/consistent-type-imports': [
29+
'error',
30+
{
31+
fixStyle: 'inline-type-imports',
32+
},
33+
],
34+
'import/extensions': ['error', 'ignorePackages'],
35+
'import/no-duplicates': ['error', { 'prefer-inline': true }],
36+
'import/no-relative-parent-imports': 'error',
37+
'unused-imports/no-unused-imports': 'error',
38+
'unused-imports/no-unused-vars': [
39+
'error',
40+
{
41+
vars: 'all',
42+
varsIgnorePattern: '^_',
43+
args: 'after-used',
44+
argsIgnorePattern: '^_',
45+
ignoreRestSiblings: true,
46+
},
47+
],
48+
},
49+
},
50+
{
51+
files,
52+
plugins: {
53+
'simple-import-sort': simpleImportSort,
54+
},
55+
rules: {
56+
'simple-import-sort/imports': [
57+
'error',
58+
{
59+
groups: [
60+
['^\\u0000'],
61+
['^node:'],
62+
['^@?\\w'],
63+
['@seamapi/smith'],
64+
['^lib/'],
65+
['^'],
66+
['^\\.'],
67+
],
68+
},
69+
],
70+
'simple-import-sort/exports': 'error',
71+
},
72+
},
73+
]

examples/blueprint.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
handlebarsHelpers,
1515
} from '@seamapi/smith'
1616

17-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
1817
interface Options {}
1918

2019
export const command: Command = 'blueprint'

0 commit comments

Comments
 (0)