Skip to content

Commit

Permalink
Merge pull request #48 from keepgoingLikelion/develop
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
flareseek authored Feb 21, 2024
2 parents b8147c3 + 2c01647 commit 2210c92
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 18 deletions.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>머랭?!</title>
<script type="module" crossorigin src="https://keepgoinglikelion.github.io/meringue-FE/assets/index-kfHZ-iQH.js"></script>
<link rel="stylesheet" crossorigin href="https://keepgoinglikelion.github.io/meringue-FE/assets/index-Bx_8Ul5v.css">
<script type="module" crossorigin src="/meringue-FE/assets/index-C3WgXS1A.js"></script>
<link rel="stylesheet" crossorigin href="/meringue-FE/assets/index-Bx_8Ul5v.css">
</head>
<body>
<div id="root"></div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build": "tsc && vite build --base=/meringue-FE",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"server": "json-server --watch dummy.json"
Expand Down
13 changes: 0 additions & 13 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,4 @@ import path from 'path'
export default defineConfig({
plugins: [react()],
publicDir: path.resolve(__dirname, "src/assets"),
experimental: {
renderBuiltUrl(filename: string, { hostId, hostType, type }: { hostId: string, hostType: 'js' | 'css' | 'html', type: 'public' | 'asset' }) {
if (type === 'public') {
return 'https://keepgoinglikelion.github.io/meringue-FE/' + filename
}
else if (path.extname(hostId) === '.js') {
return { runtime: `window.__assetsPath(${JSON.stringify(filename)})` }
}
else {
return 'https://keepgoinglikelion.github.io/meringue-FE/' + filename
}
}
}
})

0 comments on commit 2210c92

Please sign in to comment.