Skip to content

Commit ba6115f

Browse files
BenjaminCharmesBenjaminCharmes
committed
First attempt to switch from vue-cli to vite
First attempt to switch from vue-cli to vite Remove a 'process' that I missed Fix a few thing to make vite work Fix a few thing to make vite work Fix a few thing to make vite work Downgrade Bokeh to 2.4.0 Downgrade tinymce to v5 Temp commit Update yarn build with vite Update yarn build with vite Update yarn build with vite Update yarn build with vite Update docker build for vite Add serve into package.json Update env variable fron VUE_ to VITE_
1 parent 7e63cdd commit ba6115f

24 files changed

+2169
-6781
lines changed

‎.docker/app_dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ ENV NODE_ENV=production
1515

1616
# These get replaced by the entrypoint script for production builds.
1717
# Set the real values in `.env` files or an external docker-compose.
18-
ARG VUE_APP_API_URL=magic-api-url
19-
ARG VUE_APP_LOGO_URL=magic-logo-url
20-
ARG VUE_APP_HOMEPAGE_URL=magic-homepage-url
21-
ARG VUE_APP_EDITABLE_INVENTORY=magic-setting
22-
ARG VUE_APP_WEBSITE_TITLE=magic-title
23-
ARG VUE_APP_QR_CODE_RESOLVER_URL=magic-qr-code-resolver-url
24-
ARG VUE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT=magic-generate-id-setting
18+
# ARG VITE_APP_API_URL=magic-api-url
19+
ARG VITE_APP_API_URL=$VITE_APP_API_URL
20+
ARG VITE_APP_LOGO_URL=magic-logo-url
21+
ARG VITE_APP_HOMEPAGE_URL=magic-homepage-url
22+
ARG VITE_APP_EDITABLE_INVENTORY=magic-setting
23+
ARG VITE_APP_WEBSITE_TITLE=magic-title
24+
ARG VITE_APP_QR_CODE_RESOLVER_URL=magic-qr-code-resolver-url
25+
ARG VITE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT=magic-generate-id-setting
2526

2627
COPY webapp ./
27-
RUN --mount=type=bind,target=/.git,src=./.git VUE_APP_GIT_VERSION=$(node scripts/get-version.js) /node_modules/.bin/vue-cli-service build
28+
RUN --mount=type=bind,target=/.git,src=./.git VITE_APP_GIT_VERSION=$(node scripts/get-version.js)
29+
30+
RUN yarn build
2831

2932
FROM node:20-bullseye AS production
3033

‎.docker/app_entrypoint.sh‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
set -e
99
ROOT_DIR=/app/dist
1010

11-
if [ -z "$VUE_APP_API_URL" ]; then
12-
echo "VUE_APP_API_URL is unset and we are in production mode. Exiting."
11+
if [ -z "$VITE_APP_API_URL" ]; then
12+
echo "VITE_APP_API_URL is unset and we are in production mode. Exiting."
1313
echo ""
1414
echo "Found settings:"
1515
echo ""
@@ -18,37 +18,37 @@ if [ -z "$VUE_APP_API_URL" ]; then
1818
exit 1
1919
fi
2020

21-
# If the VUE_APP_GIT_VERSION has not been overridden, set it to the default
21+
# If the VITE_APP_GIT_VERSION has not been overridden, set it to the default
2222
# from package.json; the real `.git` version, if available, should still
2323
# take precedence.
24-
if [ -z "$VUE_APP_GIT_VERSION" ]; then
25-
VUE_APP_GIT_VERSION="0.0.0-git"
24+
if [ -z "$VITE_APP_GIT_VERSION" ]; then
25+
VITE_APP_GIT_VERSION="0.0.0-git"
2626
fi
2727

2828
echo "Replacing env vars in Javascript files"
2929
echo "Settings:"
3030
echo ""
31-
echo " APP_VERSION: ${VUE_APP_GIT_VERSION}"
32-
echo " API_URL: ${VUE_APP_API_URL}"
33-
echo " LOGO_URL: ${VUE_APP_LOGO_URL}"
34-
echo " HOMEPAGE_URL: ${VUE_APP_HOMPAGE_URL}"
35-
echo " EDITABLE_INVENTORY: ${VUE_APP_EDITABLE_INVENTORY}"
36-
echo " WEBSITE_TITLE: ${VUE_APP_WEBSITE_TITLE}"
37-
echo " QR_CODE_RESOLVER_URL: ${VUE_APP_QR_CODE_RESOLVER_URL}"
38-
echo " AUTOMATICALLY_GENERATE_ID_DEFAULT: ${VUE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT}"
31+
echo " APP_VERSION: ${VITE_APP_GIT_VERSION}"
32+
echo " API_URL: ${VITE_APP_API_URL}"
33+
echo " LOGO_URL: ${VITE_APP_LOGO_URL}"
34+
echo " HOMEPAGE_URL: ${VITE_APP_HOMPAGE_URL}"
35+
echo " EDITABLE_INVENTORY: ${VITE_APP_EDITABLE_INVENTORY}"
36+
echo " WEBSITE_TITLE: ${VITE_APP_WEBSITE_TITLE}"
37+
echo " QR_CODE_RESOLVER_URL: ${VITE_APP_QR_CODE_RESOLVER_URL}"
38+
echo " AUTOMATICALLY_GENERATE_ID_DEFAULT: ${VITE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT}"
3939
echo ""
4040
echo "Patching..."
4141

4242
for file in $ROOT_DIR/js/app.*.js* $ROOT_DIR/*html; do
4343
echo "$file"
44-
sed -i "s|0.0.0-git|${VUE_APP_GIT_VERSION}|g" $file
45-
sed -i "s|magic-api-url|${VUE_APP_API_URL}|g" $file
46-
sed -i "s|magic-logo-url|${VUE_APP_LOGO_URL}|g" $file
47-
sed -i "s|magic-homepage-url|${VUE_APP_HOMEPAGE_URL}|g" $file
48-
sed -i "s|magic-setting|${VUE_APP_EDITABLE_INVENTORY}|g" $file
49-
sed -i "s|magic-title|${VUE_APP_WEBSITE_TITLE}|g" $file
50-
sed -i "s|magic-qr-code-resolver-url|${VUE_APP_QR_CODE_RESOLVER_URL}|g" $file
51-
sed -i "s|magic-generate-id-setting|${VUE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT}|g" $file
44+
sed -i "s|0.0.0-git|${VITE_APP_GIT_VERSION}|g" $file
45+
sed -i "s|magic-api-url|${VITE_APP_API_URL}|g" $file
46+
sed -i "s|magic-logo-url|${VITE_APP_LOGO_URL}|g" $file
47+
sed -i "s|magic-homepage-url|${VITE_APP_HOMEPAGE_URL}|g" $file
48+
sed -i "s|magic-setting|${VITE_APP_EDITABLE_INVENTORY}|g" $file
49+
sed -i "s|magic-title|${VITE_APP_WEBSITE_TITLE}|g" $file
50+
sed -i "s|magic-qr-code-resolver-url|${VITE_APP_QR_CODE_RESOLVER_URL}|g" $file
51+
sed -i "s|magic-generate-id-setting|${VITE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT}|g" $file
5252
done
5353

5454
echo "Done!"

‎CHANGELOG.md‎

Lines changed: 202 additions & 205 deletions
Large diffs are not rendered by default.

‎docker-compose.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ services:
99
- ./logs:/logs
1010
restart: unless-stopped
1111
environment:
12-
- VUE_APP_GIT_VERSION
13-
- VUE_APP_API_URL
14-
- VUE_APP_LOGO_URL
15-
- VUE_APP_HOMEPAGE_URL
16-
- VUE_APP_EDITABLE_INVENTORY
17-
- VUE_APP_WEBSITE_TITLE
18-
- VUE_APP_QR_CODE_RESOLVER_URL
19-
- VUE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT
12+
- VITE_APP_GIT_VERSION
13+
- VITE_APP_API_URL
14+
- VITE_APP_LOGO_URL
15+
- VITE_APP_HOMEPAGE_URL
16+
- VITE_APP_EDITABLE_INVENTORY
17+
- VITE_APP_WEBSITE_TITLE
18+
- VITE_APP_QR_CODE_RESOLVER_URL
19+
- VITE_APP_AUTOMATICALLY_GENERATE_ID_DEFAULT
2020
ports:
2121
- "8081:8081"
2222

‎webapp/.browserslistrc‎

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

‎webapp/.env.test_e2e‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
NODE_ENV=production
2-
VUE_APP_API_URL="http://localhost:5001"
2+
VITE_APP_API_URL="http://localhost:5001"

‎webapp/.eslintrc.js‎ renamed to ‎webapp/.eslintrc.cjs‎

File renamed without changes.

‎webapp/babel.config.js‎

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

‎webapp/cypress.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export default defineConfig({
99
},
1010
component: {
1111
devServer: {
12-
framework: "vue-cli",
13-
bundler: "webpack",
12+
framework: "vue",
13+
bundler: "vite",
1414
},
1515
},
1616
});

‎webapp/cypress/component/UserBubbleLoginTest.cy.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { createStore } from "vuex";
22
import UserBubbleLogin from "@/components/UserBubbleLogin.vue";
33
import NotificationDot from "@/components/NotificationDot.vue";
4-
import crypto from "crypto";
4+
import MD5 from "crypto-js/md5";
55

66
describe("UserBubbleLogin", () => {
7-
const md5 = (value) => crypto.createHash("md5").update(value).digest("hex");
7+
const md5 = (value) => MD5(value).toString();
88

99
const creator = {
1010
contact_email: "[email protected]",

0 commit comments

Comments
 (0)