Skip to content

Commit

Permalink
Fix references to files and split index.css back out from the compile…
Browse files Browse the repository at this point in the history
…d file since vue wants it to be there. (#1871)
  • Loading branch information
bbpennel authored Jan 28, 2025
1 parent 1ee7109 commit df7f184
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ build-access-concat:
static/css/cdrui_styles.css \
static/build/access/cdr-ui.css \
static/css/fontawesome.min.css \
static/js/vue-cdr-access/dist/assets/index.css \
> static/build/access/cdr-access.css

cp static/build/access/cdr-access.css static/assets/access/
Expand All @@ -102,7 +101,8 @@ build-access-npm:
# npm install minify -g
# minify static/plugins/pdfjs/web/viewer.js > static/plugins/pdfjs/web/viewer.min.js

cp static/js/vue-cdr-access/dist/assets/vue-access-index.js static/assets/access/vue-access-index.js
cp static/js/vue-cdr-access/dist/assets/access/vue-access-index.js static/assets/access/vue-access-index.js
cp static/js/vue-cdr-access/dist/assets/access/index.css static/assets/access/index.css

SUSPEND = "n"

Expand Down
3 changes: 1 addition & 2 deletions static/js/vue-cdr-access/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/versions/bulma-no-dark-mode.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css">
<link rel="stylesheet" type="text/css" href="/static/css/cdr_access.css" />
<link rel="stylesheet" type="text/css" href="/static/assets/access/cdr-access.css" />

<meta name="description" content="Digital Collections Repository" />
<meta name="keywords" content="Digital Collections Repository" />
Expand Down
6 changes: 3 additions & 3 deletions static/js/vue-cdr-access/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export default defineConfig({
minify: false,
rollupOptions: {
output: {
entryFileNames: `assets/vue-access-[name].js`,
chunkFileNames: `assets/vue-access-[name].js`,
assetFileNames: `assets/[name].[ext]`
entryFileNames: `assets/access/vue-access-[name].js`,
chunkFileNames: `assets/access/vue-access-[name].js`,
assetFileNames: `assets/access/[name].[ext]`
}
}
},
Expand Down

0 comments on commit df7f184

Please sign in to comment.