Skip to content

Commit 7493f5c

Browse files
committed
Merge branch 'main' into public
2 parents b5a3b85 + 8a09e97 commit 7493f5c

File tree

12 files changed

+491
-1011
lines changed

12 files changed

+491
-1011
lines changed

.eslintrc.json

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
{
22
"root": true,
3-
"extends": ["standard-with-typescript", "prettier"],
43
"plugins": ["simple-import-sort", "unused-imports"],
54
"parserOptions": {
6-
"project": "./tsconfig.json"
5+
"sourceType": "module",
6+
"ecmaVersion": "latest"
77
},
88
"rules": {
9-
"no-console": "warn",
10-
"@typescript-eslint/consistent-type-imports": [
11-
"error",
12-
{
13-
"fixStyle": "inline-type-imports"
14-
}
15-
],
16-
"@typescript-eslint/no-unused-vars": "off",
9+
"no-console": "error",
1710
"unused-imports/no-unused-imports": "error",
1811
"unused-imports/no-unused-vars": [
1912
"error",
@@ -34,13 +27,36 @@
3427
["^\\u0000"],
3528
["^node:"],
3629
["^@?\\w"],
37-
["index.js"],
30+
["@seamapi/makenew-tsmodule"],
3831
["^lib/"],
3932
["^"],
4033
["^\\."]
4134
]
4235
}
4336
],
4437
"simple-import-sort/exports": "error"
45-
}
38+
},
39+
"overrides": [
40+
{
41+
"files": ["*.js", "*.mjs", "*.cjs"],
42+
"extends": ["standard", "prettier"]
43+
},
44+
{
45+
"files": ["*.ts", "*.tsx"],
46+
"extends": ["standard-with-typescript", "prettier"],
47+
"parserOptions": {
48+
"project": "./tsconfig.json"
49+
},
50+
"rules": {
51+
"@typescript-eslint/no-import-type-side-effects": "error",
52+
"@typescript-eslint/consistent-type-imports": [
53+
"error",
54+
{
55+
"fixStyle": "inline-type-imports"
56+
}
57+
],
58+
"@typescript-eslint/no-unused-vars": "off"
59+
}
60+
}
61+
]
4662
}

.github/workflows/_publish.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@ on:
88
description: The artifact name.
99
type: string
1010
required: true
11-
registry_host:
12-
description: The package registry host.
11+
registry_url:
12+
description: The package registry url.
1313
type: string
1414
required: true
1515
secrets:
1616
registry_token:
1717
description: The package registry token.
1818
required: true
19+
node_auth_token:
20+
description: The Node.js auth token.
21+
required: true
1922

2023
jobs:
2124
publish:
@@ -38,9 +41,9 @@ jobs:
3841
id: meta
3942
run: echo "tgz=$(ls *.tgz | head -n1)" >> $GITHUB_OUTPUT
4043
- name: Publish
41-
uses: rxfork/npm-publish@v1
44+
uses: JS-DevTools/npm-publish@v2
4245
with:
43-
access: public
44-
target: ${{ steps.meta.outputs.tgz }}
4546
token: ${{ secrets.registry_token }}
46-
registry: ${{ inputs.registry_host }}
47+
registry: ${{ inputs.registry_url }}
48+
package: ${{ steps.meta.outputs.tgz }}
49+
access: public

.github/workflows/check.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,3 @@ jobs:
133133
node_version: ${{ matrix.node }}
134134
- name: Check types
135135
run: npm run typecheck
136-
dependencies:
137-
name: Dependencies
138-
runs-on: ubuntu-latest
139-
timeout-minutes: 30
140-
steps:
141-
- name: Checkout
142-
uses: actions/checkout@v3
143-
- name: Setup
144-
uses: ./.github/actions/setup
145-
- name: Analyze dependencies
146-
run: npm run dependencies

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: stefanzweifel/git-auto-commit-action@v4
3636
if: always()
3737
with:
38-
commit_message: Run format
38+
commit_message: 'ci: Format code'
3939
commit_user_name: ${{ secrets.GIT_USER_NAME }}
4040
commit_user_email: ${{ secrets.GIT_USER_EMAIL }}
4141
commit_author: ${{ secrets.GIT_USER_NAME }} <${{ secrets.GIT_USER_EMAIL }}>

.github/workflows/generate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Commit
3737
uses: stefanzweifel/git-auto-commit-action@v4
3838
with:
39-
commit_message: Generate code
39+
commit_message: 'ci: Generate code'
4040
commit_user_name: ${{ secrets.GIT_USER_NAME }}
4141
commit_user_email: ${{ secrets.GIT_USER_EMAIL }}
4242
commit_author: ${{ secrets.GIT_USER_NAME }} <${{ secrets.GIT_USER_EMAIL }}>

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ jobs:
6161
needs: build
6262
with:
6363
artifact_name: ${{ needs.build.outputs.artifact_name }}
64-
registry_host: https://npm.pkg.github.com
64+
registry_url: https://npm.pkg.github.com
6565
secrets:
6666
registry_token: ${{ secrets.GITHUB_TOKEN }}

examples/todo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Builder, Command, Describe, Handler } from 'landlubber'
22

3-
import { todo } from 'index.js'
3+
import { todo } from '@seamapi/makenew-tsmodule'
44

55
interface Options {
66
x: string

makenew.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sh
1+
#!/usr/bin/env bash
22

33
set -e
44
set -u

0 commit comments

Comments
 (0)