Skip to content

Commit

Permalink
Merge pull request #513 from add2cal/dev
Browse files Browse the repository at this point in the history
Next (#512)
  • Loading branch information
jekuer authored Dec 13, 2023
2 parents 63e9e5f + b373d74 commit 68e65eb
Show file tree
Hide file tree
Showing 95 changed files with 18,330 additions and 14,859 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[INSERT CONTACT METHOD].
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Adhering to the following process is the best way to get your work included in t

```bash
# Clone your fork of the repo
git clone https://github.com/<your-username>/add-to-calendar-button.git
git clone https://github.com/add2cal/add-to-calendar-button.git
# Navigate to the newly cloned directory
cd add-to-calendar-button
# Assign the original repo to a remote called "upstream"
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/azure-static-web-apps-blue-field-0efe76003.yml

This file was deleted.

59 changes: 59 additions & 0 deletions .github/workflows/azure-static-web-apps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- main
- dev
- next

jobs:
build_and_deploy_job_main:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
name: Build and Deploy Job [main]
steps:
- uses: actions/checkout@v4
with:
submodules: true
lfs: false
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_FIELD_0EFE76003 }}
action: 'upload'
production_branch: 'main'
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_build_command: 'npm ci && npm run build && cd demo && npm ci && npm run generate'
app_location: '/'
output_location: 'demo/.output/public'
skip_api_build: true
###### End of Repository/Build Configurations ######

build_and_deploy_job_dev:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main'
name: Build and Deploy Job [dev]
steps:
- uses: actions/checkout@v4
with:
submodules: true
lfs: false
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_FIELD_0EFE76003 }}
action: 'upload'
production_branch: 'main'
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_build_command: 'npm ci && npm run build && cd demo && npm ci && npm run generate'
app_location: '/'
output_location: 'demo/.output/public'
skip_api_build: true
###### End of Repository/Build Configurations ######
env:
NUXT_PUBLIC_ROBOTS: 'noindex, nofollow'
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- run: npm ci
Expand All @@ -23,15 +23,20 @@ jobs:
build-and-publish:
needs: test
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- run: npm install -g npm
- run: npm ci
- run: npm run build
- run: npm publish
- name: Publish package
run: npm publish --provenance --tag ${{ github.event.release.prerelease && 'next' || 'latest' }}
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_SECRET}}
NODE_AUTH_TOKEN: ${{ secrets.NPM_SECRET }}
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node-version: ['18']
node-version: ['18', '20']
toolchain: [stable]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Run tests
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

## Version 2

- v2.5 : PRO option and more
-[introducing PRO offering](https://add-to-calendar-pro.com/)
- ⚠️ Breaking: default branding activated in order to support this free open source project (if you do not want to support this project, use the hideBranding option to disable it)
- ⚠️ Breaking: if you want to customize calendar option labels, you need need to do this via the customLabels option
- ⚠️ Breaking: some inline style got moved to the css. If you use your own custom css, double-check
- new optionsMobile und optionsIOS options to specify device-specific calendar types
- more css var options and subtle style fixes
- bundle-size optimization option
- attendee optimization
- a lot of fixes
- v2.4 : forceOverlay, fixes
- v2.3 : pastDateHandling, disable option, static-dropup listStyle option, date style optimized, buttonsList optimized, better iOS support, new languages
- v2.2 : "attendee" option, lazy external css loading, fixes
Expand Down
Loading

0 comments on commit 68e65eb

Please sign in to comment.