Skip to content

Commit d76c37f

Browse files
authored
Merge pull request #7 from simple-repository/feature/static-files-at-runtime
Be more specific with the vendoring, and use defered everywhere where loading JS
2 parents 73e7143 + ef45e1a commit d76c37f

File tree

12 files changed

+321
-74
lines changed

12 files changed

+321
-74
lines changed

.github/workflows/python-publish.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25+
- uses: actions/setup-node@v4
26+
with:
27+
node-version: 18
28+
29+
- name: Build JS assets
30+
run: |
31+
cd javascript
32+
npm install --include=dev
33+
npm run build
34+
2535
- uses: actions/setup-python@v5
2636
with:
2737
python-version: "3.x"

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
simple_repository_browser/static/js/simple-repository-browser.project.js.LICENSE.txt
2-
simple_repository_browser/static/js/simple-repository-browser.core.js.LICENSE.txt
3-
simple_repository_browser/static/js/simple-repository-browser.core.js
4-
simple_repository_browser/static/js/simple-repository-browser.project.js
1+
simple_repository_browser/static/vendored/
52

63
*/_version.py
74
node_modules

javascript/bootstrap.customized.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import './scss/app.scss';
2+
import 'bootstrap';

javascript/package-lock.json

Lines changed: 230 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

javascript/package.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,25 @@
44
"description": "A web application for a browsing a Python PEP-503 simple repository",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack",
8-
"test": "echo \"Error: no test specified\" && exit 1"
7+
"build": "mkdir -p ../simple_repository_browser/static/vendored; npm run -s build-bootstrap; npm run -s build-jquery; npm run -s build-fontawesome; npm run -s build-popper.js; npm run -s build-custom-bootstrap",
8+
"build-bootstrap": "npm run -s build-bootstrap-js && npm run -s build-bootstrap-css",
9+
"build-bootstrap-js": "cp node_modules/bootstrap/dist/js/bootstrap.bundle.min.js* ../simple_repository_browser/static/vendored/",
10+
"build.bootstrap-css": "cp node_modules/bootstrap/dist/css/bootstrap.min.css ../simple_repository_browser/static/vendored/",
11+
"build-jquery": "cp node_modules/jquery/dist/jquery.min.js ../simple_repository_browser/static/vendored/",
12+
"build-fontawesome": "npm run -s build-fontawesome-core && npm run -s build-fontawesome-solid && npm run -s build-fontawesome-regular",
13+
"build-fontawesome-core": "cp node_modules/@fortawesome/fontawesome-free/js/fontawesome.min.js ../simple_repository_browser/static/vendored/",
14+
"build-fontawesome-solid": "cp node_modules/@fortawesome/fontawesome-free/js/solid.min.js ../simple_repository_browser/static/vendored/",
15+
"build-fontawesome-regular": "cp node_modules/@fortawesome/fontawesome-free/js/regular.min.js ../simple_repository_browser/static/vendored/",
16+
"build-popper.js": "cp node_modules/popper.js/dist/umd/popper.min.js ../simple_repository_browser/static/vendored/",
17+
"build-custom-bootstrap": "webpack"
918
},
1019
"author": "",
1120
"license": "ISC",
1221
"devDependencies": {
1322
"@fortawesome/fontawesome-free": "^5.15.4",
1423
"autoprefixer": "^10.4.0",
1524
"css-loader": "^6.5.1",
25+
"mini-css-extract-plugin": "^2.9.2",
1626
"node-sass": "^6.0.1",
1727
"postcss-loader": "^6.2.1",
1828
"sass-loader": "^12.3.0",

javascript/scss/_variables.scss

Lines changed: 0 additions & 2 deletions
This file was deleted.

javascript/simple-repository-browser.core.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

javascript/simple-repository-browser.project.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)