import

Author: stephenliang

frontend/README.md

@@ -12,7 +12,6 @@ module.exports = {
   appName: 'Component Library',
   batchName: 'Frontend Eyes Tests',
   dontCloseBatches: true,
-  parentBranchName: 'staging',
   browser: [
     {width: 1200, height: 800, name: 'chrome'},
     {width: 1200, height: 800, name: 'firefox'},

frontend/apps/design-system-storybook/applitools.config.cjs

@@ -17,7 +17,7 @@
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
   "scripts": {
-    "build-storybook": "storybook build -o dist/component-library-storybook",
+    "build": "storybook build -o dist/component-library-storybook",
     "clean": "rimraf dist",
     "dev": "yarn run storybook",
     "eyes-storybook": "tsx ./scripts/eyes-storybook.ts",
@@ -36,31 +36,31 @@
     "extends": "@code-dot-org/lint-config/stylelint/index.mjs"
   },
   "devDependencies": {
-    "@applitools/eyes-storybook": "^3.52.1",
+    "@applitools/eyes-storybook": "^3.53.13",
     "@code-dot-org/component-library-styles": "workspace:*",
     "@code-dot-org/fonts": "workspace:*",
     "@code-dot-org/lint-config": "workspace:*",
     "@dotenv-run/cli": "^1.3.6",
     "@eslint/js": "^9.16.0",
-    "@storybook/addon-a11y": "^8.4.4",
-    "@storybook/addon-essentials": "^8.4.4",
-    "@storybook/addon-interactions": "^8.4.4",
-    "@storybook/addon-storysource": "^8.4.4",
+    "@storybook/addon-a11y": "^8.6.9",
+    "@storybook/addon-essentials": "^8.6.9",
+    "@storybook/addon-interactions": "^8.6.9",
+    "@storybook/addon-storysource": "^8.6.9",
     "@storybook/addon-styling-webpack": "^1.0.1",
-    "@storybook/addon-webpack5-compiler-swc": "^1.0.6",
-    "@storybook/blocks": "^8.4.4",
-    "@storybook/react": "^8.4.4",
-    "@storybook/react-webpack5": "^8.4.4",
-    "@storybook/test": "^8.4.4",
-    "@storybook/test-runner": "^0.19.1",
+    "@storybook/addon-webpack5-compiler-swc": "^3.0.0",
+    "@storybook/blocks": "^8.6.9",
+    "@storybook/react": "^8.6.9",
+    "@storybook/react-webpack5": "^8.6.9",
+    "@storybook/test": "^8.6.9",
+    "@storybook/test-runner": "^0.22.0",
     "axe-playwright": "^2.0.3",
     "concurrently": "^9.1.0",
     "eslint": "^9.16.0",
     "globals": "^15.13.0",
     "http-server": "^14.1.1",
     "prettier": "3.4.2",
     "sass-loader": "^16.0.3",
-    "storybook": "^8.4.4",
+    "storybook": "^8.6.9",
     "storybook-addon-rtl": "^1.0.1",
     "stylelint": "^16.14.1",
     "tsx": "^4.19.2",

frontend/apps/design-system-storybook/package.json

@@ -5,7 +5,7 @@
 set -x
 
 # Build a production version of Storybook
-yarn build-storybook --quiet
+yarn build --quiet
 
 # Wait for Storybook to be available and then execute the tests
 npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \

frontend/apps/design-system-storybook/public/images/action-block-01.png

@@ -2,13 +2,16 @@ const assertions = {
   'bf-cache': 'off',
   'color-contrast': 'off',
   'inspector-issues': 'off',
-  'offscreen-images': ['error', {minScore: 0.5, maxLength: 1}],
+  'offscreen-images': ['error', {minScore: 0.5, maxLength: 3}], // re-enable after CMS-482
   'total-byte-weight': ['error', {minScore: 0.5}],
   'unused-css-rules': ['error', {maxLength: 5}],
   'unused-javascript': ['error', {maxLength: 10}],
   'uses-text-compression': ['error', {maxLength: 5}],
   'third-party-cookies': 'off',
   'uses-rel-preconnect': 'off',
+  'unsized-images': ['error', {minScore: 0.5}], // re-enable after CMS-482
+  'uses-responsive-images': ['error', {maxLength: 1}], // re-enable after CMS-482,
+  'link-text': 'off', // re-enable after CMS-497
 };
 
 if (process.env.STAGE !== 'production') {

frontend/apps/design-system-storybook/public/images/action-block-02.png

@@ -0,0 +1 @@
+public/**

frontend/apps/design-system-storybook/public/images/action-block-03.png

@@ -0,0 +1 @@
+public/**

frontend/apps/design-system-storybook/public/images/admins-page-top.png

@@ -6,7 +6,7 @@ import cdoReactConfig from '@code-dot-org/lint-config/eslint/react.mjs';
 /** @type {import('eslint').Linter.Config[]} */
 export default [
   {
-    ignores: ['.next/*', 'playwright-report', 'test-results'],
+    ignores: ['.next/*', 'playwright-report', 'test-results', 'public/**'],
   },
   {
     // TODO: Remove this once the following Github Issue is resolved:

frontend/apps/design-system-storybook/public/images/help-page-top.png

@@ -16,7 +16,8 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "scripts": {
-    "build": "next build",
+    "build": "next build && yarn copy:static-assets",
+    "copy:static-assets": "cp -r public .next/standalone/apps/marketing",
     "dev": "next dev --turbopack -p 3001",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
@@ -42,7 +43,7 @@
     "@statsig/statsig-node-core": "^0.0.8",
     "@statsig/web-analytics": "^3.14.1",
     "contentful": "^11.2.5",
-    "next": "^15.1.2",
+    "next": "^15.2.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

frontend/apps/design-system-storybook/public/images/teach-page-top.png

@@ -29,14 +29,14 @@ export default defineConfig<EyesFixture>({
       matchLevel: 'Strict',
       // Runner type: 'ufg' for Ultrafast Grid, 'classic' for Classic runner
       type: 'classic',
-      parentBranchName: 'staging',
       batch: {
         name: 'Frontend Eyes Tests',
         id: process.env.APPLITOOLS_BATCH_ID,
         notifyOnCompletion: false,
       },
       sendDom: true,
       failTestsOnDiff: 'afterEach',
+      branchName: 'staging',
       // Additional configuration options...
     },
   },

frontend/apps/design-system-storybook/scripts/test-storybook.sh

@@ -0,0 +1 @@
+{"CookieSPAEnabled":false,"CookieSameSiteNoneEnabled":false,"CookieV2CSPEnabled":false,"MultiVariantTestingEnabled":false,"UseV2":true,"MobileSDK":false,"SkipGeolocation":false,"ScriptType":"LOCAL","Version":"202306.2.0","OptanonDataJSON":"27cca70a-7db3-4852-9ef0-a6660fd0977d","GeolocationUrl":"https://geolocation.onetrust.com/cookieconsentpub/v1/geo/location","BulkDomainCheckUrl":"https://cookies-data.onetrust.io/bannersdk/v1/domaingroupcheck","RuleSet":[{"Id":"af8e25d7-0a22-4aa0-9f25-e5cd8db4333d","Name":"Global Rule","Countries":["pr","ps","pw","py","qa","ad","ae","af","ag","ai","al","am","ao","aq","ar","as","au","aw","az","ba","bb","rs","bd","ru","bf","rw","bh","bi","bj","bl","bm","bn","bo","sa","sb","bq","sc","br","bs","sd","bt","sg","bv","sh","bw","sj","by","bz","sl","sn","so","ca","sr","ss","cc","st","cd","sv","cf","cg","sx","sy","ci","sz","ck","cl","cm","cn","co","cr","tc","td","cu","tf","tg","cv","cw","th","cx","tj","tk","tl","tm","tn","to","tr","tt","tv","tw","dj","tz","dm","do","ua","ug","dz","um","us","ec","eg","eh","uy","uz","va","er","vc","et","ve","vg","vi","vn","vu","fj","fk","fm","fo","wf","ga","ws","gd","ge","gg","gh","gi","gl","gm","gn","gq","gs","gt","gu","gw","gy","xk","hk","hm","hn","ht","ye","id","il","im","in","io","za","iq","ir","zm","je","zw","jm","jo","jp","ke","kg","kh","ki","km","kn","kp","kr","kw","ky","kz","la","lb","lc","lk","lr","ls","ly","ma","md","me","mg","mh","mk","ml","mm","mn","mo","mp","mr","ms","mu","mv","mw","mx","my","mz","na","nc","ne","nf","ng","ni","np","nr","nu","nz","om","pa","pe","pf","pg","ph","pk","pm","pn"],"States":{},"LanguageSwitcherPlaceholder":{"hi":"hi","ps":"ps","pt":"pt","hr":"hr","hu":"hu","yi":"yi","hy":"hy","yo":"yo","id":"id","af":"af","is":"is","it":"it","am":"am","zh":"zh","ar":"ar","ja":"ja","az":"az","zu":"zu","ro":"ro","ru":"ru","be":"be","bg":"bg","jv":"jv","bn":"bn","sd":"sd","bs":"bs","default":"en","si":"si","ka":"ka","sk":"sk","sl":"sl","sm":"sm","sn":"sn","so":"so","ca":"ca","sq":"sq","sr":"sr","kk":"kk","st":"st","su":"su","km":"km","sv":"sv","kn":"kn","sw":"sw","ko":"ko","kr":"kr","ku":"ku","co":"co","ta":"ta","ky":"ky","cs":"cs","te":"te","tg":"tg","th":"th","cy":"cy","lb":"lb","tl":"tl","da":"da","tr":"tr","tt":"tt","de":"de","lo":"lo","lt":"lt","lv":"lv","uk":"uk","me":"me","mg":"mg","mi":"mi","ur":"ur","mk":"mk","ml":"ml","mn":"mn","uz":"uz","mr":"mr","ms":"ms","mt":"mt","el":"el","eo":"eo","my":"my","es":"es","et":"et","eu":"eu","vi":"vi","ne":"ne","fa":"fa","nl":"nl","no":"no","fi":"fi","fr":"fr","ga":"ga","gd":"gd","gl":"gl","gu":"gu","xh":"xh","pa":"pa","ha":"ha","pl":"pl","he":"he"},"BannerPushesDown":false,"Default":true,"Global":true,"Type":"GDPR","UseGoogleVendors":false,"VariantEnabled":false,"TestEndTime":null,"Variants":[],"TemplateName":"Code.org Template","Conditions":[],"GCEnable":false,"IsGPPEnabled":false},{"Id":"a927cb3f-e217-4683-b0d8-c299188734b6","Name":"GDPR Rule","Countries":["no","de","be","fi","pt","bg","dk","lt","lu","hr","lv","fr","hu","se","mc","si","sk","mf","sm","gb","yt","ie","gf","ee","mq","ch","mt","gp","is","it","gr","es","re","at","cy","cz","ax","pl","li","ro","nl"],"States":{},"LanguageSwitcherPlaceholder":{"hi":"hi","ps":"ps","pt":"pt","hr":"hr","hu":"hu","yi":"yi","hy":"hy","yo":"yo","id":"id","af":"af","is":"is","it":"it","am":"am","zh":"zh","ar":"ar","ja":"ja","az":"az","zu":"zu","ro":"ro","ru":"ru","be":"be","bg":"bg","jv":"jv","bn":"bn","sd":"sd","bs":"bs","default":"en","si":"si","ka":"ka","sk":"sk","sl":"sl","sm":"sm","sn":"sn","so":"so","ca":"ca","sq":"sq","sr":"sr","kk":"kk","st":"st","su":"su","km":"km","sv":"sv","kn":"kn","sw":"sw","ko":"ko","kr":"kr","ku":"ku","co":"co","ta":"ta","ky":"ky","cs":"cs","te":"te","tg":"tg","th":"th","cy":"cy","lb":"lb","tl":"tl","da":"da","tr":"tr","tt":"tt","de":"de","lo":"lo","lt":"lt","lv":"lv","uk":"uk","me":"me","mg":"mg","mi":"mi","ur":"ur","mk":"mk","ml":"ml","mn":"mn","uz":"uz","mr":"mr","ms":"ms","mt":"mt","el":"el","eo":"eo","my":"my","es":"es","et":"et","eu":"eu","vi":"vi","ne":"ne","fa":"fa","nl":"nl","no":"no","fi":"fi","fr":"fr","ga":"ga","gd":"gd","gl":"gl","gu":"gu","xh":"xh","pa":"pa","ha":"ha","pl":"pl","he":"he"},"BannerPushesDown":false,"Default":false,"Global":false,"Type":"GDPR","UseGoogleVendors":false,"VariantEnabled":false,"TestEndTime":null,"Variants":[],"TemplateName":"Code.org Template","Conditions":[],"GCEnable":false,"IsGPPEnabled":false}],"IabData":{"cookieVersion":"1","createdTime":"2023-07-20T00:42:41.607409321","updatedTime":"2023-07-20T00:42:41.607418121","cmpId":"28","cmpVersion":"1","consentScreen":"1","consentLanguage":null,"vendorListVersion":0,"maxVendorId":0,"encodingType":"0","globalVendorListUrl":"https://cdn.cookielaw.org/vendorlist/iabData.json"},"IabV2Data":{"cookieVersion":"1","createdTime":"2023-07-20T00:42:41.788577669","updatedTime":"2023-07-20T00:42:41.788583769","cmpId":"28","cmpVersion":"1","consentScreen":"1","consentLanguage":null,"vendorListVersion":0,"maxVendorId":0,"encodingType":"0","globalVendorListUrl":"https://cdn.cookielaw.org/vendorlist/iab2Data.json"},"GoogleData":{"vendorListVersion":1,"googleVendorListUrl":"https://cdn.cookielaw.org/vendorlist/googleData.json"},"ScriptDynamicLoadEnabled":false,"TenantFeatures":{"CookieV2BannerFocus":true,"CookieV2GPC":true,"CookieV2AssignTemplateRule":true,"CookieV2GeolocationJsonApi":true,"CookieV2TCF21":true,"CookieV2RemoveSettingsIcon":true,"CookieV2BannerLogo":true,"CookieV2GeneralVendors":true,"CookieV2GPP":true},"IsSuppressBanner":false,"IsSuppressPC":false,"PublisherCC":"US","Domain":"code.org","TenantGuid":"a810c6a9-5986-41f3-b636-8944508580bc","EnvId":"app-prod","RemoteActionsEnabled":false,"GeoRuleGroupName":"Geolocation Group by Athena","GATrackToggle":true,"GATrackAssignedCategory":"AS","WebFormIntegrationEnabled":false,"WebFormSrcUrl":"","WebFormWorkerUrl":"","GppData":{"cmpId":"28"}}