Skip to content

Commit

Permalink
fix: missing env variable during yarn build (resolve #61)
Browse files Browse the repository at this point in the history
chore: upgrade vite to v2
  • Loading branch information
muety committed Jan 9, 2021
1 parent b2d741d commit 1400c35
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 941 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:14-alpine

MAINTAINER Ferdinand Mütsch <ferdinand@muetsch.io>

Expand All @@ -15,7 +15,7 @@ RUN cd /app && yarn

RUN cd /app/webapp && \
yarn && \
yarn build && \
yarn build:base && \
cd ..

ENTRYPOINT yarn start
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mininote",
"version": "0.7.0",
"version": "0.7.1",
"description": "A simple Mardown note-taking editor",
"main": "index.js",
"scripts": {
Expand Down
8 changes: 5 additions & 3 deletions webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "mininote-frontend",
"version": "0.7.0",
"version": "0.7.1",
"private": true,
"description": "A simple Mardown note-taking editor.",
"author": "Ferdinand Mütsch <mail@ferdinand-muetsch.de>",
"scripts": {
"build": "yarn lint && yarn test && vite build --base $BASE_URL",
"build": "yarn lint && yarn test && vite build",
"build:base": "yarn lint && yarn test && vite build --base $BASE_URL",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint",
"dev": "vite --port 8080",
Expand All @@ -21,6 +22,7 @@
"vuex": "^4.0.0-0"
},
"devDependencies": {
"@vitejs/plugin-vue": "^1.0.4",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-unit-jest": "~4.5.0",
Expand All @@ -35,7 +37,7 @@
"eslint-plugin-vue": "^7.1.0",
"prettier": "^2.1.2",
"typescript": "~3.9.3",
"vite": "^1.0.0-rc.13",
"vite": "^2.0.0-beta.15",
"vue-jest": "^5.0.0-0"
},
"eslintConfig": {
Expand Down
3 changes: 3 additions & 0 deletions webapp/vite.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import vue from "@vitejs/plugin-vue";

export default {
proxy: {
"/api": {
Expand All @@ -6,4 +8,5 @@ export default {
rewrite: (path) => path.replace(/^\/api/, ""),
},
},
plugins: [vue()],
};
Loading

0 comments on commit 1400c35

Please sign in to comment.