Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: import path for global styles #28

Merged
merged 9 commits into from
Nov 13, 2024
Merged

feat: import path for global styles #28

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06e1c8f
feat:import path for global styles
iamwangqing Nov 12, 2024
71b129b
fix:sync format
iamwangqing Nov 13, 2024
f0dbb86
feat:add overrides file to write
iamwangqing Nov 13, 2024
f489c12
feat:add overrides file to write
iamwangqing Nov 13, 2024
0e5f90d
feat:add overrides file to write
iamwangqing Nov 13, 2024
64f53f0
Merge branch 'feature_global_style1' of https://github.com/WangQ98/tn…
iamwangqing Nov 13, 2024
959f53c
fix:remove overrides import temporarily, pending further discussion
iamwangqing Nov 13, 2024
38e5949
fix:sync format
iamwangqing Nov 13, 2024
292a896
Update .changeset/stupid-tomatoes-work.md
sorrycc Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ export async function sync(opts: SyncOptions) {
},
} as Config);

// Check for existing global styles (.css or .less) and set the import path
const globalStylesPath = path.join(cwd, 'src/global');
const styleExtensions = ['.css', '.less'];
const ext = styleExtensions.find((ext) =>
fs.existsSync(`${globalStylesPath}${ext}`),
);
const globalStyleImportPath = ext ? `import '../global${ext}';` : '';

// tailwindcss
let tailwindcssPath: string | undefined;
if (config?.tailwindcss && !opts.runAgain) {
Expand All @@ -71,6 +79,7 @@ import {
} from '@umijs/tnf/router';
import { routeTree } from './routeTree.gen';
${tailwindcssPath ? `import '${tailwindcssPath}'` : ''}
${globalStyleImportPath}
const router = createRouter({
routeTree,
defaultPreload: ${config?.router?.defaultPreload ? `'${config.router.defaultPreload}'` : 'false'},
Expand Down
Loading