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.

Sign up for GitHub

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

Jump to bottom

Ready for Main: stage into main. #597

Closed
wants to merge 14 commits into from
Closed

Ready for Main: stage into main. #597

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
926efde
Update CSP for universal nav
TsayAdobe Mar 1, 2024
74de784
Use exact hosts
TsayAdobe Mar 5, 2024
41e919f
Merge branch 'stage' into MWPW-143629
TsayAdobe Mar 5, 2024
1906be4
Merge pull request #562 from adobecom/MWPW-143629
TsayAdobe Mar 5, 2024
8f56b82
Update scripts.js
Blainegunn Mar 6, 2024
c41fbd3
Update scripts.js
Blainegunn Mar 6, 2024
1eec058
Update scripts.js
Blainegunn Mar 6, 2024
ebbfa69
MWPW-143839
Blainegunn Mar 6, 2024
64a0c9d
Merge branch 'stage' into MWPW-143839
Blainegunn Mar 6, 2024
e2a5af8
Merge pull request #598 from adobecom/MWPW-143839
Blainegunn Mar 6, 2024
4dc13ae
Update CSP
TsayAdobe Mar 6, 2024
3e91532
Merge pull request #600 from adobecom/edgeworker
Blainegunn Mar 7, 2024
c1c6649
removing test code
Blainegunn Mar 7, 2024
e5788eb
Merge pull request #601 from adobecom/removeTests
Blainegunn Mar 7, 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
2 changes: 2 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const connectSrc = [
'14257-chimera-stage.adobeioruntime.net',
'14257-chimera.adobeioruntime.net',
'*.adobe.com',
'stage.adobeccstatic.com',
'*.adobe.io',
'*.adobelogin.com',
'*.amazonaws.com',
Expand Down Expand Up @@ -116,6 +117,7 @@ const imgSrc = [
'about:',
'blob:',
'data:',
'stage.adobeccstatic.com',
'*.clarity.ms',
'*.enterprise.adobe.com',
'*.services.adobe.com',
Expand Down
5 changes: 4 additions & 1 deletion acrobat/scripts/contentSecurityPolicy/prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const connectSrc = [
'blob:',
'14257-chimera.adobeioruntime.net',
'*.adobe.com',
'prod.adobeccstatic.com',
'*.clicktale.net/',
'*.adobe.io',
'*.adobelogin.com',
Expand Down Expand Up @@ -109,6 +110,7 @@ const imgSrc = [
'about:',
'blob:',
'data:',
'prod.adobeccstatic.com',
'*.clarity.ms',
'*.enterprise.adobe.com',
'*.services.adobe.com',
Expand Down Expand Up @@ -208,6 +210,7 @@ const scriptSrc = [
'servedby.flashtalking.com',
'snap.licdn.com',
'so.rlcdn.com/',
'prod.adobeccstatic.com',
'static.ads-twitter.com',
't.co/i',
'tag.clrstm.com',
Expand Down Expand Up @@ -245,7 +248,7 @@ const styleSrc = [
'\'unsafe-inline\'',
'*.adobe.com',
'accounts.google.com/gsi/style',
'adobeccstatic.com',
'prod.adobeccstatic.com',
'use.typekit.net',
'main--milo--adobecom.hlx.page',
'p.typekit.net',
Expand Down
2 changes: 2 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/stage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const connectSrc = [
'14257-chimera-stage.adobeioruntime.net',
'14257-chimera.adobeioruntime.net',
'*.adobe.com',
'stage.adobeccstatic.com',
'*.adobe.io',
'*.adobelogin.com',
'*.amazonaws.com',
Expand Down Expand Up @@ -119,6 +120,7 @@ const imgSrc = [
'blob:',
'data:',
'*.adobe.com',
'stage.adobeccstatic.com',
'*.clarity.ms',
'*.enterprise.adobe.com',
'*.services.adobe.com',
Expand Down
3 changes: 3 additions & 0 deletions acrobat/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@
version: '1.0',
onDemand: false,
},
htmlExclude: [
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🚫 [eslint] <indent> reported by reviewdog 🐶
Expected indentation of 2 spaces but found 4.

Suggested change
htmlExclude: [
htmlExclude: [

/www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/,
],
};

// Setting alternative Jarcis client ID for these paths
Expand All @@ -298,7 +301,7 @@
|| window.location.pathname.match('/documentcloud/')
|| window.location.pathname.match('/acrobat/business/')) {
CONFIG.jarvis.id = 'DocumentCloudsignAcro';
};

Check failure on line 304 in acrobat/scripts/scripts.js

View workflow job for this annotation

GitHub Actions / runner / eslint (18.x) 

[eslint] reported by reviewdog 🐶
Unnecessary semicolon.

Raw Output:
{"ruleId":"no-extra-semi","severity":2,"message":"Unnecessary semicolon.","line":304,"column":2,"nodeType":"EmptyStatement","messageId":"unexpected","endLine":304,"endColumn":3,"fix":{"range":[11528,11581],"text":"}\n\n// Default to loading the first image as eager.\n("}}

// Default to loading the first image as eager.
(async function loadLCPImage() {
Expand Down Expand Up @@ -405,5 +408,5 @@
geoPhoneNumber();
}
}());

Check failure on line 411 in acrobat/scripts/scripts.js

View workflow job for this annotation

GitHub Actions / runner / eslint (18.x) 

[eslint] reported by reviewdog 🐶
Too many blank lines at the end of file. Max of 0 allowed.

Raw Output:
{"ruleId":"no-multiple-empty-lines","severity":2,"message":"Too many blank lines at the end of file. Max of 0 allowed.","line":411,"column":1,"nodeType":"Program","messageId":"blankEndOfFile","endLine":413,"endColumn":1,"fix":{"range":[15212,15214],"text":""}}

Loading