Skip to content

Commit

Permalink
chore: merge release-v0.1.2 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjackwills committed Mar 10, 2023
2 parents 1da07e0 + e7f70ec commit f6d44cc
Show file tree
Hide file tree
Showing 16 changed files with 812 additions and 598 deletions.
38 changes: 23 additions & 15 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "16"
"VARIANT": "16",
"BUILDKIT_INLINE_CACHE": "0"
}
},

Expand All @@ -15,25 +16,32 @@
],

// Set *default* container specific settings.json values on container create.
"settings": {},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"mutantdino.resourcemonitor",
"meganrogge.template-string-converter",
"bungcip.better-toml",
"wix.vscode-import-cost",
"christian-kohler.path-intellisense",
"timonwong.shellcheck",
"vue.volar",
"vue.vscode-typescript-vue-plugin"

],
"postCreateCommand":"mkdir /tmp/typos && wget https://github.com/crate-ci/typos/releases/download/v1.13.10/typos-v1.13.10-x86_64-unknown-linux-musl.tar.gz -O /tmp/typos-v1.13.10-x86_64-unknown-linux-musl.tar.gz && tar -xvf /tmp/typos-v1.13.10-x86_64-unknown-linux-musl.tar.gz -C /tmp/typos && install -Dm 755 /tmp/typos/typos -t \"${HOME}/.local/bin\" && rm -rf /tmp/typos",

"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"mutantdino.resourcemonitor",
"meganrogge.template-string-converter",
"bungcip.better-toml",
"wix.vscode-import-cost",
"christian-kohler.path-intellisense",
"timonwong.shellcheck",
"vue.volar",
"vue.vscode-typescript-vue-plugin"
]
}
},


"remoteUser": "node",
"features": {
"git": "os-provided"
"ghcr.io/devcontainers/features/git:1": {
"version":"os-provided"
}
}
}
8 changes: 7 additions & 1 deletion .eslintrc-auto-import.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"globals": {
"Component": true,
"ComponentPublicInstance": true,
"ComputedRef": true,
"EffectScope": true,
"InjectionKey": true,
"PropType": true,
"Ref": true,
"VNode": true,
"aircraftModule": true,
"computed": true,
"createApp": true,
Expand Down Expand Up @@ -41,7 +48,6 @@
"readonly": true,
"ref": true,
"resolveComponent": true,
"resolveDirective": true,
"shallowReactive": true,
"shallowReadonly": true,
"shallowRef": true,
Expand Down
20 changes: 17 additions & 3 deletions .github/release-body.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
### 2023-01-27
### 2023-03-10

### Chores
+ create_release updated, [300c870e15bac3f40854ab3d740b76db33d913b9]
+ dependencies updated, [8bce25ec239a2413a2506112a9210f097e4c07ba], [8de6f1f8face73fdf77b8dc1f15bc7464b75f0bd]
+ devcontainer updated, [a4d5ab3334fed1d231c8e725ef612ef0dd5ee2e4]

### Docs
+ readme updated, [cf6058625abc6a8979a968e7d5da756bf5dc02a8]

### Features
+ use content-class for tooltip, [7775a2da83381c9ccae1aafdf2c2f704840ccd53]

### Fixes
+ workflow indentation typos, [0ebae1286bbaed68d70613960b560a25fb95bf3c]
+ readme.md typo, [39c396860f10488107dbd42968733fa81ef42434]
+ 100% height v-app fix, [9093af55f3cc374add5b2eaba3ebb35aa5cac4ad]
+ temporary(?) snackbar fix, [3688b3b0069ff885cead6c6bb6be35b622aa1159]

### Refactors
+ dead code removed, [8fe9b0627acf714a65cbfa9f24842fa46d614509]

see <a href='https://github.com/mrjackwills/flightbox_vue/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branch:
branches:
- 'main'
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# <a href='https://github.com/mrjackwills/flightbox_vue/releases/tag/v0.1.2'>v0.1.2</a>
### 2023-03-10

### Chores
+ create_release updated, [300c870e](https://github.com/mrjackwills/flightbox_vue/commit/300c870e15bac3f40854ab3d740b76db33d913b9)
+ dependencies updated, [8bce25ec](https://github.com/mrjackwills/flightbox_vue/commit/8bce25ec239a2413a2506112a9210f097e4c07ba), [8de6f1f8](https://github.com/mrjackwills/flightbox_vue/commit/8de6f1f8face73fdf77b8dc1f15bc7464b75f0bd)
+ devcontainer updated, [a4d5ab33](https://github.com/mrjackwills/flightbox_vue/commit/a4d5ab3334fed1d231c8e725ef612ef0dd5ee2e4)

### Docs
+ readme updated, [cf605862](https://github.com/mrjackwills/flightbox_vue/commit/cf6058625abc6a8979a968e7d5da756bf5dc02a8)

### Features
+ use content-class for tooltip, [7775a2da](https://github.com/mrjackwills/flightbox_vue/commit/7775a2da83381c9ccae1aafdf2c2f704840ccd53)

### Fixes
+ 100% height v-app fix, [9093af55](https://github.com/mrjackwills/flightbox_vue/commit/9093af55f3cc374add5b2eaba3ebb35aa5cac4ad)
+ temporary(?) snackbar fix, [3688b3b0](https://github.com/mrjackwills/flightbox_vue/commit/3688b3b0069ff885cead6c6bb6be35b622aa1159)

### Refactors
+ dead code removed, [8fe9b062](https://github.com/mrjackwills/flightbox_vue/commit/8fe9b0627acf714a65cbfa9f24842fa46d614509)

# <a href='https://github.com/mrjackwills/flightbox_vue/releases/tag/v0.1.1'>v0.1.1</a>
### 2023-01-27

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
The frontend for <a href='https://flights.mrjackwills.com' target='_blank' rel='noopener noreferrer'>flightbox</a>, powered by <a href='https://www.staticpi.com' target='_blank' rel='noopener noreferrer'>staticPi.com</a>
</p>
<p align="center">
Built using <a href='https://vuejs.org/' target='_blank' rel='noopener noreferrer'>Vue.js</a>, and <a href='https://www.typescriptlang.org/' target='_blank' rel='noopener noreferrer'>Typescript</a>
Built using <a href='https://vuejs.org/' target='_blank' rel='noopener noreferrer'>Vue.js</a>, and <a href='https://www.typescriptlang.org/' target='_blank' rel='noopener noreferrer'>TypeScript</a>
</p>

<p align="center">
Expand All @@ -32,13 +32,13 @@

## Required services

1) <a href='https://www.staticpi.com/' target='_blank' rel='noopener noreferrer'>staticPi</a> - the simple and secure messaging service
1) <a href='https://www.staticpi.com/' target='_blank' rel='noopener noreferrer'>staticPi</a> - the simple messaging service

File that are required by flightbox
| file | reason|
|---|---|
|```./.env.development``` | development enviromental variables|
|```./.env.development``` | productions enviromental variables|
|```./.env.development``` | development environmental variables|
|```./.env.development``` | productions environmental variables|

### Development
---
Expand Down
24 changes: 18 additions & 6 deletions create_release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

# v0.0.12
# Vue release
# v0.1.0

PACKAGE_NAME='flightbox_vue_site'

Expand Down Expand Up @@ -127,12 +128,12 @@ update_release_body_and_changelog () {
echo -e "# <a href='${GIT_REPO_URL}/releases/tag/${NEW_TAG_WITH_V}'>${NEW_TAG_WITH_V}</a>\n${DATE_SUBHEADING}${CHANGELOG_ADDITION}$(cat CHANGELOG.md)" > CHANGELOG.md

# Update changelog to add links to commits [hex:8](url_with_full_commit)
# "[aaaaaaaaaabbbbbbbbbbccccccccccddddddddd]" -> "[aaaaaaaa](https:/www.../commit/aaaaaaaaaabbbbbbbbbbccccccccccddddddddd),"
sed -i -E "s=(\s)\[([0-9a-f]{8})([0-9a-f]{32})\]= [\2](${GIT_REPO_URL}/commit/\2\3),=g" ./CHANGELOG.md
# "[aaaaaaaaaabbbbbbbbbbccccccccccddddddddd]" -> "[aaaaaaaa](https:/www.../commit/aaaaaaaaaabbbbbbbbbbccccccccccddddddddd)"
sed -i -E "s=(\s)\[([0-9a-f]{8})([0-9a-f]{32})\]= [\2](${GIT_REPO_URL}/commit/\2\3)=g" CHANGELOG.md

# Update changelog to add links to closed issues - comma included!
# "closes #1" -> "closes [#1](https:/www.../issues/1)"
sed -i -r -E "s=closes \#([0-9]+)=closes [#\1](${GIT_REPO_URL}/issues/\1)=g" ./CHANGELOG.md
# Update changelog to add links to closed issues
# "closes #1" -> "closes [#1](https:/www.../issues/1)""
sed -i -r -E "s=closes \#([0-9]+)=closes [#\1](${GIT_REPO_URL}/issues/\1)=g" CHANGELOG.md
}

update_json () {
Expand Down Expand Up @@ -206,10 +207,21 @@ release_continue () {
ask_continue

}

# Check repository for typos
check_typos () {
echo -e "\n${PURPLE}check typos${RESET}"
typos
ask_continue
}

# Full flow to create a new release
release_flow() {
check_typos

check_git
get_git_remote_url

linter
npm_build

Expand Down
Loading

0 comments on commit f6d44cc

Please sign in to comment.