Skip to content

Commit

Permalink
feat!: Merge nuxt3.x upgrade code changes to main branch (#845)
Browse files Browse the repository at this point in the history
* feat!: trigger breaking change for version update

BREAKING CHANGE: Nuxt upgrade to version 3, fix bugs, add redirects and new features like email subscription.

* fix: percyscreen shot names

* feat: update layout to support impact report page layouts as well, as the layouts get wonky when switching navigating between default and impact layout

* fix: out of memory error with javascript and node

* fix: add redirect for /impact/all in nuxt config route rules

* ci: Update build timings and nuxt config build options to reduce the load on craft server (#846)

* feat: update component library version

* ci: update build times as nuxt concurrency and interval options are updated

* fix: AAPPS-2832 All services & resources links

* fix: APPS-2833 correct favicon

* fix: APPS-2850 access collection search

* APPS-2831 fix locations by adding both uri and to field as sometimes some compnnets use to and some use uri

* fix: eslint errors

* fix: lower concurreny and interval

* APPS-2853 4040 error on endowment listing page may be caused by  error from slug page caused by wrong search url

* fix: 404 endowment errors

* fix: change concurrency from 5 to 50

* Temporary commit to force push

* Remove temporary change

* fix: remove timeout update conurrency from 10 to 50 (#848)

* add a file

* delete the file

* fix: APPS-2851 move libchat script from usehead to client side using document.scripts

* fix: update ci time out and update package version of component library

* fix: recursive error in parsedAssociatedStaffMember computed method

* ci: use env added to the workflow

* fix: APPS-2852 blockhours height

* fix: Block hours height

* fix: Hours url with sitemap url to avpid cross origin request issue when working with iframes

* fix: lint errors

* fix: use window.location to fetch the url of the site on client side in onmounted hook for blockhours iframe
  • Loading branch information
pghorpade authored Aug 22, 2024
1 parent 8d8245b commit 53895fa
Show file tree
Hide file tree
Showing 245 changed files with 22,190 additions and 41,198 deletions.
30 changes: 0 additions & 30 deletions .dockerignore

This file was deleted.

9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
.nuxt/
node_modules/
storybook-static/
.output
dist

15 changes: 15 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
root: true,
extends: ["@nuxtjs/eslint-config-typescript"],
"rules": {
"@typescript-eslint/comma-dangle": "off",
"n/prefer-global/process": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "off",
"space-before-function-paren": "off",
"comma-dangle": "off",
"operator-linebreak": "off",
"curly": "off",
"brace-style": "off",
}
};
13 changes: 0 additions & 13 deletions .eslintrc.js

This file was deleted.

58 changes: 29 additions & 29 deletions .github/configs/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
categories:
- title: '🚀 Features and Improvements'
- title: 🚀 Features and Improvements
labels:
- 'feature'
- 'enhancement'
- 'performance'
- 'refactor'
- title: '🌈 Chore and Updates'
- feature
- enhancement
- performance
- refactor
- title: 🌈 Chore and Updates
labels:
- 'documentation'
- 'chore'
- 'test'
- 'ci'
- title: '🐛 Bug Fixes'
- documentation
- chore
- test
- ci
- title: 🐛 Bug Fixes
labels:
- 'bugfix'
- 'fix'
- title: '🧰 Breaking Changes'
label: 'breaking'
- bugfix
- fix
- title: 🧰 Breaking Changes
label: breaking
version-resolver:
major:
labels:
- 'breaking'
- breaking
minor:
labels:
- 'enhancement'
- 'feature'
- 'performance'
- 'refactor'
- enhancement
- feature
- performance
- refactor
patch:
labels:
- 'bugfix'
- 'documentation'
- 'fix'
- 'chore'
- 'test'
- 'ci'
- bugfix
- documentation
- fix
- chore
- test
- ci
default: patch
tag-template: '$RESOLVED_VERSION'
name-template: 'v$RESOLVED_VERSION'
tag-template: $RESOLVED_VERSION
name-template: v$RESOLVED_VERSION
change-template: '* $TITLE (#$NUMBER)'
change-title-escapes: ''
exclude-labels:
- 'skip-changelog'
- skip-changelog
template: |
## What’s Changed
Expand Down
62 changes: 31 additions & 31 deletions .github/workflows/auto-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@ on:
# tags:
# - production
schedule:
- cron: '00 8,20 * * *' # 8,20 UTC = noon and midnight PST, 1am and 1pm PDT
- cron: '00 8,20 * * *' # 8,20 UTC = noon and midnight PST, 1am and 1pm PDT

jobs:
nuxt-prod:
name: Netlify deploy
runs-on: ubuntu-latest
# timeout-minutes: 50
steps:
- uses: actions/checkout@v3
with:
ref: production
- uses: ./.github/workflows/setup-workspace
- run: npm run generate
env:
CRAFT_ENDPOINT: ${{ secrets.CRAFT_PROD_ENDPOINT }}
LIBCAL_ENDPOINT: ${{ secrets.LIBCAL_ENDPOINT }}
S3_BUCKET: "https://static.library.ucla.edu/"
SITEMAP_HOST: ${{ secrets.SITEMAP_URL_PROD }}
ES_URL: ${{ secrets.ES_URL }}
ESApiKey: ${{ secrets.ESApiKey }}
ES_READ_KEY: ${{ secrets.ES_READ_KEY_PROD }}
ES_WRITE_KEY: ${{ secrets.ES_WRITE_KEY_PROD }}
ES_INDEX: ${{ secrets.ES_INDEX_PROD }}
ES_INDEX_PREFIX: ${{ secrets.ES_INDEX_PREFIX_PROD }}
ES_TEMP_INDEX_PREFIX_LIBGUIDES: ${{secrets.ES_TEMP_INDEX_PREFIX_LIBGUIDES_PROD}}
LIBGUIDES_ES_INDEX: ${{secrets.LIBGUIDES_ES_INDEX_PROD}}
- name: Deploy to Netlify on release
uses: nwtgck/actions-netlify@v2 #
with:
production-deploy: true
deploy-message: https://github.com/UCLALibrary/library-website-nuxt/commit/${{ github.sha }}
github-token: ${{ secrets.GITHUB_TOKEN }}
publish-dir: './dist'
fails-without-credentials: true
github-deployment-environment: production
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_PROD_LIBRARY_SITE_ID }}
- uses: actions/checkout@v3
with:
ref: production
- uses: ./.github/workflows/setup-workspace
- run: npm run generate
env:
CRAFT_ENDPOINT: ${{ secrets.CRAFT_PROD_ENDPOINT }}
LIBCAL_ENDPOINT: ${{ secrets.LIBCAL_ENDPOINT }}
S3_BUCKET: 'https://static.library.ucla.edu/'
SITEMAP_HOST: ${{ secrets.SITEMAP_URL_PROD }}
ES_URL: ${{ secrets.ES_URL }}
ESApiKey: ${{ secrets.ESApiKey }}
ES_READ_KEY: ${{ secrets.ES_READ_KEY_PROD }}
ES_WRITE_KEY: ${{ secrets.ES_WRITE_KEY_PROD }}
ES_ALIAS: ${{ secrets.ES_ALIAS_PROD }}
ES_INDEX_PREFIX: ${{ secrets.ES_INDEX_PREFIX_PROD }}
ES_TEMP_INDEX_PREFIX_LIBGUIDES: ${{secrets.ES_TEMP_INDEX_PREFIX_LIBGUIDES_PROD}}
LIBGUIDES_ES_INDEX: ${{secrets.LIBGUIDES_ES_INDEX_PROD}}
- name: Deploy to Netlify on release
uses: nwtgck/actions-netlify@v3 #
with:
production-deploy: true
deploy-message: https://github.com/UCLALibrary/library-website-nuxt/commit/${{ github.sha }}
github-token: ${{ secrets.GITHUB_TOKEN }}
publish-dir: .output/public
fails-without-credentials: true
github-deployment-environment: production
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_PROD_LIBRARY_SITE_ID }}
Loading

1 comment on commit 53895fa

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.