@@ -3,7 +3,7 @@ import assert from 'node:assert'
33import { resolve , relative , join , basename } from 'path'
44import { pageBuilders } from './build-pages/index.js'
55import { TopBunDuplicatePageError } from './helpers/top-bun-error.js'
6- import { hasTS } from './helpers/has-ts.js'
6+ import { nodeHasTS } from './helpers/has-ts.js'
77
88/**
99 * @import { FWStats } from 'async-folder-walker'
@@ -22,57 +22,58 @@ const getFirstMatch = (/** @type {{ [basename: string]: WalkerFile }} */ files,
2222 }
2323}
2424
25- const jsPageNames = hasTS
25+ const jsPageNames = nodeHasTS
2626 ? [ 'page.ts' , 'page.mts' , 'page.cts' , 'page.js' , 'page.mjs' , 'page.cjs' ]
2727 : [ 'page.js' , 'page.mjs' , 'page.cjs' ]
2828
29- const jsPageDraftNames = hasTS
29+ const jsPageDraftNames = nodeHasTS
3030 ? [ 'page.draft.ts' , 'page.draft.mts' , 'page.draft.cts' , 'page.draft.js' , 'page.draft.mjs' , 'page.draft.cjs' ]
3131 : [ 'page.draft.js' , 'page.draft.mjs' , 'page.draft.cjs' ]
3232
33- const pageClientNames = hasTS
34- ? [ 'client.tsx' , 'client.ts' , 'client.mts' , 'client.cts' , 'client.jsx' , 'client.js' , 'client.mjs' , 'client.cjs' ]
35- : [ 'client.jsx' , 'client.js' , 'client.mjs' , 'client.cjs' ]
33+ const pageClientNames = [
34+ 'client.tsx' , 'client.ts' , 'client.mts' , 'client.cts' ,
35+ 'client.jsx' , 'client.js' , 'client.mjs' , 'client.cjs'
36+ ]
3637
37- const pageVarsNames = hasTS
38+ const pageVarsNames = nodeHasTS
3839 ? [ 'page.vars.ts' , 'page.vars.mts' , 'page.vars.cts' ,
3940 'page.vars.js' , 'page.vars.mjs' , 'page.vars.cjs' ]
4041 : [ 'page.vars.js' , 'page.vars.mjs' , 'page.vars.cjs' ]
4142
42- const layoutSuffixs = hasTS
43+ const layoutSuffixs = nodeHasTS
4344 ? [ '.layout.ts' , '.layout.mts' , '.layout.cts' , '.layout.js' , '.layout.mjs' , '.layout.cjs' ]
4445 : [ '.layout.js' , '.layout.mjs' , '.layout.cjs' ]
4546
46- const layoutClientSuffixs = hasTS
47- ? [
48- '.layout.client.ts' , '.layout.client.mts' , '.layout.client.cts' ,
49- '.layout.client.js ' , '.layout.client.mjs' , '.layout.client.cjs'
50- ]
51- : [ '.layout.client.js' , '.layout.client.mjs' , '.layout.client.cjs' ]
47+ const layoutClientSuffixs = [
48+ '.layout.client.tsx' , '.layout.client.ts' ,
49+ '.layout.client.mts' , '.layout.client.cts' ,
50+ '.layout.client.jsx ' , '.layout.client.js' ,
51+ '.layout.client.mjs' , '.layout.client.cjs'
52+ ]
5253
53- const layoutStyleSuffix = '.layout.css' // unchanged
54+ const layoutStyleSuffix = '.layout.css'
5455
55- const templateSuffixs = hasTS
56+ const templateSuffixs = nodeHasTS
5657 ? [ '.template.ts' , '.template.mts' , '.template.cts' , '.template.js' , '.template.mjs' , '.template.cjs' ]
5758 : [ '.template.js' , '.template.mjs' , '.template.cjs' ]
5859
59- const globalStyleNames = [ 'global.css' , 'global.style.css' ] // unchanged
60+ const globalStyleNames = [ 'global.css' , 'global.style.css' ]
6061
61- const globalClientNames = hasTS
62- ? [
63- 'global.client.ts' , 'global.client.mts' , 'global.client.cts' ,
64- 'global.client.js ' , 'global.client.mjs' , 'global.client.cjs'
65- ]
66- : [ 'global.client.js' , 'global.client.mjs' , 'global.client.cjs' ]
62+ const globalClientNames = [
63+ 'global.client.tsx' , 'global.client.ts' ,
64+ 'global.client.mts' , 'global.client.cts' ,
65+ 'global.client.jsx ' , 'global.client.js' ,
66+ 'global.client.mjs' , 'global.client.cjs'
67+ ]
6768
68- const globalVarsNames = hasTS
69+ const globalVarsNames = nodeHasTS
6970 ? [
7071 'global.vars.ts' , 'global.vars.mts' , 'global.vars.cts' ,
7172 'global.vars.js' , 'global.vars.mjs' , 'global.vars.cjs'
7273 ]
7374 : [ 'global.vars.js' , 'global.vars.mjs' , 'global.vars.cjs' ]
7475
75- const esbuildSettingsNames = hasTS
76+ const esbuildSettingsNames = nodeHasTS
7677 ? [
7778 'esbuild.settings.ts' , 'esbuild.settings.mts' , 'esbuild.settings.cts' ,
7879 'esbuild.settings.js' , 'esbuild.settings.mjs' , 'esbuild.settings.cjs'
0 commit comments