Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump vite from 5.2.13 to 5.2.14 #150

Open
wants to merge 77 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
ad88755
chore: quick testing link generator
prince-deriv Sep 3, 2024
8ff312c
chore: required js changes
prince-deriv Sep 6, 2024
2dadc65
Merge pull request #131 from moiz-deriv/Moiz/save-affiliate-cookies
habib-deriv Sep 9, 2024
7a04841
feat: added preloading of traders hub for performance improvements
moiz-deriv Sep 9, 2024
6f2f260
fix: moved block into domcontentloaded function
moiz-deriv Sep 9, 2024
5769b9c
Merge pull request #133 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 9, 2024
a9865c2
fix:added dyanmic fetching of login url for traders hub
moiz-deriv Sep 9, 2024
3563263
Merge pull request #134 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 9, 2024
f40399c
fix: trigger release
moiz-deriv Sep 9, 2024
66720e7
fix: trigger
moiz-deriv Sep 9, 2024
7eb7e09
Merge pull request #135 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 9, 2024
cc43e27
Merge branch 'master' into test-link-runner
prince-deriv Sep 9, 2024
c86e143
fix: indention
prince-deriv Sep 9, 2024
11be013
fix: updated link to iframe for tradershub prefetching
moiz-deriv Sep 10, 2024
77b2df8
fix: added sandbox attribute to iframe
moiz-deriv Sep 10, 2024
e4dadde
Merge pull request #136 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
03025c1
fix: added console for testing
moiz-deriv Sep 10, 2024
5bb0867
Merge pull request #137 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
213f933
fix: moved snippet out of function declaration
moiz-deriv Sep 10, 2024
9911a9d
fix: removed display property for iframe
moiz-deriv Sep 10, 2024
ab080e5
fix: removed cfd merge
moiz-deriv Sep 10, 2024
3afe673
Merge pull request #138 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
3ef4cdd
fix: removed iframe block
moiz-deriv Sep 10, 2024
30e69d4
ci: remove webflow subdomain
ali-hosseini-deriv Sep 10, 2024
119e1dc
ci: remove the webflow domain from workflow
ali-hosseini-deriv Sep 10, 2024
f01e04f
fix: added domain key to set cookie function
moiz-deriv Sep 10, 2024
264734d
Merge pull request #141 from moiz-deriv/Moiz/save-affiliate-cookies
habib-deriv Sep 10, 2024
6f6348c
Merge pull request #132 from deriv-com/test-link-runner
habib-deriv Sep 10, 2024
c3da329
Merge pull request #139 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
a726d63
fix: moved ifram logic to github
moiz-deriv Sep 10, 2024
8a31ca3
Merge pull request #142 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
833b2d3
fix: temporarily removed iframe
moiz-deriv Sep 10, 2024
0621960
Merge pull request #143 from moiz-deriv/Moiz/traders-hub-iframe
habib-deriv Sep 10, 2024
fcfb387
fix: readded ifram post release
moiz-deriv Sep 11, 2024
b8f8d40
fix: removed console.log
moiz-deriv Sep 11, 2024
2445b19
Merge pull request #144 from moiz-deriv/Moiz/traders-hub-iframe
ali-hosseini-deriv Sep 11, 2024
e4c4dc2
Merge pull request #140 from deriv-com/ako/clean-up-webflow-domain
ali-hosseini-deriv Sep 11, 2024
ed22f04
fix: modified sitemap updater to remove all urls that contain eu
moiz-deriv Sep 11, 2024
9dd8827
fix: Update .github/modify_sitemap.js
moiz-deriv Sep 11, 2024
4c6494e
Merge pull request #145 from moiz-deriv/Moiz/sitemap-modifaction
ali-hosseini-deriv Sep 11, 2024
4de74cc
chore: custom script static
prince-deriv Sep 16, 2024
03e927b
chore: fixed rendering condition
prince-deriv Sep 16, 2024
b7b7054
chore: migrated all
prince-deriv Sep 17, 2024
92e8fbb
chore: migrated all
prince-deriv Sep 17, 2024
ce12055
chore: minify temp static
prince-deriv Sep 17, 2024
1ee72ca
chore: revert and migrate minimum
prince-deriv Sep 17, 2024
0570129
chore: migrate all
prince-deriv Sep 17, 2024
741e79b
chore: remove webflow array functions
prince-deriv Sep 17, 2024
eccac6d
Merge pull request #149 from deriv-com/migration-script-fix
ali-hosseini-deriv Sep 18, 2024
dd683bd
chore: bundle generator
prince-deriv Sep 18, 2024
f94bd43
chore: update workflow
prince-deriv Sep 18, 2024
0f59e52
chore: update workflow
prince-deriv Sep 18, 2024
ca66178
chore: update workflow
prince-deriv Sep 18, 2024
b3c4690
chore: update workflow
prince-deriv Sep 18, 2024
92e653b
chore: update workflow
prince-deriv Sep 18, 2024
5836f68
chore: update workflow
prince-deriv Sep 18, 2024
cc745f5
chore: update workflow
prince-deriv Sep 18, 2024
fe4be97
chore: update workflow
prince-deriv Sep 18, 2024
70f59f1
chore: update workflow
prince-deriv Sep 18, 2024
dd45926
chore: update workflow
prince-deriv Sep 18, 2024
0b562d3
chore: removed ngrok
prince-deriv Sep 18, 2024
d0567d7
chore: added pre commit
prince-deriv Sep 18, 2024
972aaab
chore: added pre commit
prince-deriv Sep 18, 2024
1d6ceb7
chore: added pre commit
prince-deriv Sep 18, 2024
1edcab0
chore: test pre-commit
prince-deriv Sep 18, 2024
028eb70
chore: test pre-commit
prince-deriv Sep 18, 2024
17c1fa9
chore: test pre-commit
prince-deriv Sep 18, 2024
a4c5a45
chore: test pre-commit
prince-deriv Sep 18, 2024
f0637ac
chore: test pre-commit
prince-deriv Sep 18, 2024
ac6c3ca
chore: test pre-commit
prince-deriv Sep 18, 2024
7714a2a
chore: test pre-commit
prince-deriv Sep 18, 2024
392c018
fix: updated traders hub pre load url
moiz-deriv Sep 19, 2024
96df536
Merge pull request #153 from moiz-deriv/Moiz/update-tradershub-url
habib-deriv Sep 19, 2024
a9c6950
fix: updated traders hub prefetch url
moiz-deriv Sep 19, 2024
e951688
Merge pull request #154 from moiz-deriv/Moiz/update-tradershub-url
habib-deriv Sep 19, 2024
c50d333
Merge pull request #151 from deriv-com/test-link-bundle
ali-hosseini-deriv Sep 19, 2024
99051f5
chore(deps-dev): bump vite from 5.2.13 to 5.2.14
dependabot[bot] Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/actions/publish_website/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ inputs:
description: 'Publish to staging.deriv.com'
required: true
default: 'false'
site_label_webflow:
description: 'Publish to webflow.deriv.com'
required: true
default: 'false'
site_label_deriv_com:
description: 'Publish to deriv.com'
required: true
Expand All @@ -27,9 +23,6 @@ inputs:
staging_site_id:
description: 'Staging Site ID'
required: true
webflow_site_id:
description: 'Webflow Site ID'
required: true
deriv_com_site_id:
description: 'Deriv.com Site ID'
required: true
Expand Down Expand Up @@ -59,10 +52,6 @@ runs:
SITES_TO_PUBLISH+=("\"staging.deriv.com\"")
SITES_DEPLOY_IDS+=("\"${{ inputs.staging_site_id }}\"")
fi
if [ "${{ inputs.site_label_webflow }}" == "true" ]; then
SITES_TO_PUBLISH+=("\"webflow.deriv.com\"")
SITES_DEPLOY_IDS+=("\"${{ inputs.webflow_site_id }}\"")
fi
if [ "${{ inputs.site_label_deriv_com }}" == "true" ]; then
SITES_TO_PUBLISH+=("\"deriv.com\"")
SITES_DEPLOY_IDS+=("\"${{ inputs.deriv_com_site_id }}\"")
Expand Down
2 changes: 1 addition & 1 deletion .github/modify_sitemap.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fs.readFile(inputFile, "utf8", (err, data) => {
const urlBlockPattern = /(<url>[\s\S]*?<\/url>)/g;

let filteredContent = newContent.replace(urlBlockPattern, (match) => {
if (/https:\/\/deriv\.com\/eu\//.test(match)) {
if (/https:\/\/deriv\.com(\/[a-z-]{2,5})?\/eu\//.test(match)) {
return "";
}
return match;
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/generate-bundle-url.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Generate Bundle CDN URL

on:
pull_request:
types: [opened, synchronize, reopened]

permissions:
pull-requests: write # Ensure the token has write access to PRs

jobs:
generate-url:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install dependencies
run: npm install

- name: Generate CDN URL
id: generate-url
run: |
# Generate the URL and capture it as an output
URL=$(node scripts/generate-bundle-url.js)
echo "URL=$URL" >> $GITHUB_ENV

- name: Create or update PR comment with CDN URL
uses: peter-evans/create-or-update-comment@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
body: |
### CUSTOM FOOTER SCRIPT

${{ env.URL }}

8 changes: 1 addition & 7 deletions .github/workflows/publish-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ on:
type: boolean
description: "staging.deriv.com"
default: false
site_label_webflow:
type: boolean
description: "webflow.deriv.com"
default: false
site_label_deriv_com:
type: boolean
description: "deriv.com"
Expand Down Expand Up @@ -41,13 +37,11 @@ jobs:
uses: ./.github/actions/publish_website
with:
site_label_staging: ${{ github.event.inputs.site_label_staging }}
site_label_webflow: ${{ github.event.inputs.site_label_webflow }}
site_label_deriv_com: ${{ github.event.inputs.site_label_deriv_com }}
site_label_deriv_me: ${{ github.event.inputs.site_label_deriv_me }}
site_label_deriv_be: ${{ github.event.inputs.site_label_deriv_be }}
webflow_api_token: ${{ secrets.WEBFLOW_API_TOKEN }}
staging_site_id: ${{ secrets.STAGING_SITE_ID }}
webflow_site_id: ${{ secrets.WEBFLOW_SITE_ID }}
deriv_com_site_id: ${{ secrets.DERIV_COM_SITE_ID }}
deriv_me_site_id: ${{ secrets.DERIV_ME_SITE_ID }}
deriv_be_site_id: ${{ secrets.DERIV_BE_SITE_ID }}
Expand Down Expand Up @@ -76,7 +70,7 @@ jobs:
generate_sitemap_and_robots:
runs-on: ubuntu-latest
needs: publish_site
if: ${{ needs.publish_site.result == 'success' && (github.event.inputs.site_label_webflow == 'true' || github.event.inputs.site_label_deriv_com == 'true' || github.event.inputs.site_label_deriv_me == 'true' || github.event.inputs.site_label_deriv_be == 'true') }}
if: ${{ needs.publish_site.result == 'success' && ( github.event.inputs.site_label_deriv_com == 'true' || github.event.inputs.site_label_deriv_me == 'true' || github.event.inputs.site_label_deriv_be == 'true') }}
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

npm run pre-commit:generate-bundle
Loading
Loading