Merge branch 'dev' of git.odit.services:lfk/selfservice into dev
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
commit
71f419ffb4
|
|
@ -2,8 +2,17 @@
|
|||
|
||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||
|
||||
#### [0.7.1](https://git.odit.services/lfk/selfservice/compare/0.7.0...0.7.1)
|
||||
|
||||
- Merge pull request 'bugfix/31-env-js-linking-ci' (#41) from bugfix/31-env-js-linking-ci into dev [`#31`](https://git.odit.services/lfk/selfservice/issues/31)
|
||||
- ⏫ dependency bump [`ad13bae`](https://git.odit.services/lfk/selfservice/commit/ad13bae068416bed10d00e6887a05d580a836482)
|
||||
- added 'yarn postbuild' script for fixing env.js in dist/index.html [`51d058b`](https://git.odit.services/lfk/selfservice/commit/51d058bf966c3dcb064562e6bf696a748d0cd148)
|
||||
|
||||
#### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0)
|
||||
|
||||
> 6 April 2021
|
||||
|
||||
- 🚀Bumped version to v0.7.0 [`152e741`](https://git.odit.services/lfk/selfservice/commit/152e74190d13d30110d494a9062f868390ca19b3)
|
||||
- Merge pull request 'Donation list feature/39-donation_list' (#40) from feature/39-donation_list into dev [`4c83e2e`](https://git.odit.services/lfk/selfservice/commit/4c83e2e738a075354383dca4d500808f761247d2)
|
||||
- Added total to bottom of page [`89820d4`](https://git.odit.services/lfk/selfservice/commit/89820d44501793365248b8e778522cdc188afa70)
|
||||
- Sorted translations 🌍 [`cb1b9d3`](https://git.odit.services/lfk/selfservice/commit/cb1b9d330b28f11cceed9691aee4ccee5246d346)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ WORKDIR /app
|
|||
COPY . .
|
||||
RUN yarn
|
||||
RUN yarn build
|
||||
RUN yarn postbuild
|
||||
# final image
|
||||
FROM fholzer/nginx-brotli:v1.19.1
|
||||
COPY --from=0 /app/dist /usr/share/nginx/html
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
const fs = require('fs');
|
||||
if (fs.existsSync('./dist/index.html')) {
|
||||
const content = fs.readFileSync('./dist/index.html', { encoding: 'utf8' });
|
||||
const newcontent = content.replace(`"/env.js"`, `"./env.js"`);
|
||||
fs.writeFileSync('./dist/index.html', newcontent);
|
||||
}
|
||||
101
package.json
101
package.json
|
|
@ -1,50 +1,51 @@
|
|||
{
|
||||
"name": "@odit/lfk-selfservice",
|
||||
"version": "0.7.0",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"release": "release-it --only-version"
|
||||
},
|
||||
"dependencies": {
|
||||
"marked": "2.0.1",
|
||||
"redaxios": "0.4.1",
|
||||
"toastify-js": "1.10.0",
|
||||
"validator": "13.5.2",
|
||||
"vue-i18n": "9.0.0",
|
||||
"vue-toastification": "2.0.0-rc.1",
|
||||
"vue": "3.0.9",
|
||||
"vue-router": "4.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tailwindcss/jit": "0.1.18",
|
||||
"@tailwindcss/aspect-ratio": "0.2.0",
|
||||
"@tailwindcss/forms": "0.3.2",
|
||||
"@tailwindcss/line-clamp": "0.2.0",
|
||||
"@tailwindcss/typography": "0.4.0",
|
||||
"@vitejs/plugin-vue": "1.2.1",
|
||||
"@vue/compiler-sfc": "3.0.10",
|
||||
"autoprefixer": "10.2.5",
|
||||
"tailwindcss": "2.0.4",
|
||||
"release-it": "14.5.0",
|
||||
"vite": "2.1.5"
|
||||
},
|
||||
"release-it": {
|
||||
"git": {
|
||||
"commit": true,
|
||||
"requireCleanWorkingDir": false,
|
||||
"commitMessage": "🚀Bumped version to v${version}",
|
||||
"requireBranch": "dev",
|
||||
"push": false,
|
||||
"tag": true,
|
||||
"tagName": null,
|
||||
"tagAnnotation": "v${version}"
|
||||
},
|
||||
"npm": {
|
||||
"publish": false
|
||||
},
|
||||
"hooks": {
|
||||
"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js && git add src/locales"
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "@odit/lfk-selfservice",
|
||||
"version": "0.7.1",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"release": "release-it --only-version",
|
||||
"postbuild": "node env_fix.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"marked": "2.0.3",
|
||||
"redaxios": "0.4.1",
|
||||
"toastify-js": "1.10.0",
|
||||
"validator": "13.5.2",
|
||||
"vue-i18n": "9.1.4",
|
||||
"vue-toastification": "2.0.0-rc.1",
|
||||
"vue": "3.0.9",
|
||||
"vue-router": "4.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tailwindcss/jit": "0.1.18",
|
||||
"@tailwindcss/aspect-ratio": "0.2.0",
|
||||
"@tailwindcss/forms": "0.3.2",
|
||||
"@tailwindcss/line-clamp": "0.2.0",
|
||||
"@tailwindcss/typography": "0.4.0",
|
||||
"@vitejs/plugin-vue": "1.2.1",
|
||||
"@vue/compiler-sfc": "3.0.11",
|
||||
"autoprefixer": "10.2.5",
|
||||
"tailwindcss": "2.1.1",
|
||||
"release-it": "14.6.1",
|
||||
"vite": "2.1.5"
|
||||
},
|
||||
"release-it": {
|
||||
"git": {
|
||||
"commit": true,
|
||||
"requireCleanWorkingDir": false,
|
||||
"commitMessage": "🚀Bumped version to v${version}",
|
||||
"requireBranch": "dev",
|
||||
"push": false,
|
||||
"tag": true,
|
||||
"tagName": null,
|
||||
"tagAnnotation": "v${version}"
|
||||
},
|
||||
"npm": {
|
||||
"publish": false
|
||||
},
|
||||
"hooks": {
|
||||
"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js && git add src/locales"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue