Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/hotwax/inventory-count into…
Browse files Browse the repository at this point in the history
… #25k8h53
  • Loading branch information
k2maan committed Jan 30, 2023
2 parents 52ce03d + a265a80 commit c57836f
Show file tree
Hide file tree
Showing 25 changed files with 11,600 additions and 8,419 deletions.
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ VUE_APP_I18N_LOCALE=en
VUE_APP_I18N_FALLBACK_LOCALE=en
VUE_APP_CACHE_MAX_AGE=3600
VUE_APP_VIEW_SIZE=10
VUE_APP_BASE_URL=
VUE_APP_PERMISSION_ID=
VUE_APP_ALIAS=
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ module.exports = {
'@vue/typescript/recommended'
],
parserOptions: {
ecmaVersion: 2020
ecmaVersion: 2020,
parser: '@typescript-eslint/parser',
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'vue/no-deprecated-slot-attribute': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'vue/multi-word-component-names' : 'off'
},
overrides: [
{
Expand Down
7 changes: 5 additions & 2 deletions .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
"targets": {
"hotwax-digital-commerce": {
"hosting": {
"dev-inventorycount": [
"dev": [
"dev-inventorycount"
],
"uat": [
"inventorycount-uat"
]
}
},
"digital-commerce-71eb8": {
"hosting": {
"inventorycount": [
"prod": [
"inventorycount"
]
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
env:
HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
- name: Deploy
run: firebase deploy --token "$HOTWAX_PUBLIC_SECRET" -m "Deploying via GitHub actions" --only hosting:dev-inventorycount
run: firebase deploy --token "$HOTWAX_PUBLIC_SECRET" -m "Deploying via GitHub actions" --only hosting:dev
env:
HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
29 changes: 29 additions & 0 deletions .github/workflows/firebase-hosting-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Deploy to Firebase Hosting on release
'on':
push:
tags:
- '*' # Push events to every tag not containing / Refer https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#patterns-to-match-branches-and-tags
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout to latest release tag
run: |
git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
- name: Install Dependencies
run: npm install
- name: Generate .env file
run: cp .env.example .env
- name: Build
run: npm run build
- name: Install Firebase
run: npm install -g firebase-tools
- name: Set Firebase project
run: firebase use default --token "$HOTWAX_PUBLIC_SECRET"
env:
HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
- name: Deploy
run: firebase deploy --token "$HOTWAX_PUBLIC_SECRET" -m "Deploying via GitHub actions" --only hosting:uat
env:
HOTWAX_PUBLIC_SECRET: ${{ secrets.HOTWAX_PUBLIC_SECRET }}
17 changes: 15 additions & 2 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"hosting": [
{
"target": "inventorycount",
"target": "prod",
"public": "dist",
"ignore": [
"firebase.json",
Expand All @@ -15,7 +15,7 @@

},
{
"target": "dev-inventorycount",
"target": "dev",
"public": "dist",
"ignore": [
"firebase.json",
Expand All @@ -27,6 +27,19 @@
"destination": "/index.html"
} ]

},
{
"target": "uat",
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [ {
"source": "**",
"destination": "/index.html"
} ]
}
]
}
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module.exports = {
transform: {
'^.+\\.vue$': 'vue-jest'
},
transformIgnorePatterns: ['/node_modules/(?!@ionic/vue|@ionic/vue-router)']
transformIgnorePatterns: ['/node_modules/(?!@ionic/vue|@ionic/vue-router|@ionic/core|@stencil/core|ionicons)']
}
Loading

0 comments on commit c57836f

Please sign in to comment.