File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1414
1515 steps :
1616 - uses : actions/checkout@v5
17- - uses : actions/setup-node@v4
17+ - uses : actions/setup-node@v5
1818 with :
1919 node-version : 20
2020
4646
4747 steps :
4848 - uses : actions/checkout@v5
49- - uses : actions/setup-node@v4
49+ - uses : actions/setup-node@v5
5050 with :
5151 node-version : ${{ matrix.node }}
5252
7272 with :
7373 ref : ${{ github.head_ref }}
7474 token : ${{ secrets.GitHubToken }}
75- - uses : actions/setup-node@v4
75+ - uses : actions/setup-node@v5
7676 with :
7777 node-version : 20
7878
Original file line number Diff line number Diff line change 1212
1313 steps :
1414 - uses : actions/checkout@v5
15+ <<<<<<< HEAD
1516
1617 with :
1718 fetch-depth : 0
2122 git config user.email github-actions@github.com
2223
2324 - uses : actions/setup-node@v4
25+ =======
26+ - uses : actions/setup-node@v5
27+ >>>>>>> a267929 (v6.9.0...v6.10.0)
2428 with :
2529 node-version : 20
2630
Original file line number Diff line number Diff line change 11'use strict' ;
22
33module . exports = {
4+ < << < << < HEAD
45 spec : [ 'test/**/*-test.js' ] ,
56
7+ = === ===
8+ spec : [
9+ 'test/**/*-test.js' ,
10+ ] ,
11+ > >>> >>> a267929 ( v6 .9 .0 ...v6 .10 .0 )
612 ignore: [
713 'test/fixtures/**' ,
814 ] ,
Original file line number Diff line number Diff line change 1313 },
1414 {
1515 "name" : " @kellyselden/node-template" ,
16- "version" : " 6.9 .0" ,
16+ "version" : " 6.10 .0" ,
1717 "blueprints" : [
1818 {
1919 "name" : " @kellyselden/node-template" ,
Original file line number Diff line number Diff line change @@ -10,6 +10,14 @@ const saneNode = require('eslint-config-sane-node');
1010
1111module . exports = defineConfig ( [
1212 saneNode ,
13+ {
14+ files : [
15+ 'bin/*.js' ,
16+ ] ,
17+ rules : {
18+ 'no-console' : 'off' ,
19+ } ,
20+ } ,
1321 {
1422 ...mocha . configs . flat . recommended ,
1523 files : [
Original file line number Diff line number Diff line change 11{
22 "extends" : [
33 " standard"
4+ ],
5+ "packageRules" : [
6+ {
7+ "matchPackageNames" : [
8+ " standard-node-template" ,
9+ " @kellyselden/node-template"
10+ ],
11+ "separateMinorPatch" : true
12+ }
413 ]
514}
You can’t perform that action at this time.
0 commit comments