merge master into dev

.github/workflows/master-to-prod.yml

@@ -11,17 +11,21 @@ env:
 
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     environment: dev
     steps:
     - name: 'Checkout GitHub Action'
       uses: actions/checkout@v3
 
     - name: 'Login via Azure CLI'
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
-        creds: ${{ secrets.AZURE_CREDENTIALS_PRINCIPAL }} # set up AZURE_RBAC_CREDENTIALS secrets in your repository
-
+          auth-type: IDENTITY
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_BECF5140E58D4E4DAF8C3ECDD90CB3D3 }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          enable-AzPSSession: true
+
     - name: Setup Node ${{ env.NODE_VERSION }} Environment
       uses: actions/setup-node@v3
       with:

.puppeteerrc.cjs

@@ -6,4 +6,4 @@ const {join} = require('path');
 module.exports = {
   // Changes the cache location for Puppeteer.
   cacheDirectory: join(__dirname, '.cache', 'puppeteer'),
-};
+};

FindServiceWorker/index.ts

@@ -54,7 +54,7 @@ const httpTrigger: AzureFunction = async function (
     else {
       context?.log.warn(`FindServiceWorker: trying slow mode`);
 
-      const browser = await puppeteer.launch({headless: 'new' , args: ['--no-sandbox', '--disable-setuid-sandbox']});
+      const browser = await puppeteer.launch({headless: true , args: ['--no-sandbox', '--disable-setuid-sandbox']});
       const page = await browser.newPage();
       await page.setUserAgent(USER_AGENT);
       await page.setRequestInterception(true);

FindWebManifest/index.ts

@@ -146,7 +146,7 @@ async function puppeteerAttempt(site: string, context?: Context): Promise<{error
   try {
     context?.log.warn(`FindWebManifest: trying slow mode`);
 
-    const browser = await puppeteer.launch({headless: 'new', args: ['--no-sandbox', '--disable-setuid-sandbox']});
+    const browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
     const page = await browser.newPage();
     await page.setUserAgent(USER_AGENT);
     await page.setRequestInterception(true);

Report/index.ts

@@ -5,14 +5,14 @@ import { checkParams } from '../utils/checkParams.js';
 import { getManifestByLink } from '../utils/getManifestByLink.js';
 import {
   analyzeServiceWorker,
-  AnalyzeServiceWorkerResponce,
+  AnalyzeServiceWorkerResponse,
 } from '../utils/analyzeServiceWorker.js';
 import { AnalyticsInfo, uploadToAppInsights } from '../utils/analytics.js';
 import { Report } from './type.js';
 
-import { dirname, join } from 'path';
+import { dirname } from 'path';
 import { fileURLToPath } from 'url';
-import childProcess, { ChildProcess, exec, spawn } from 'child_process';
+import { ChildProcess, exec, spawn } from 'child_process';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 // const _root = `${__dirname}/../..`;
@@ -175,7 +175,7 @@ const audit = async (
       url?: string;
     };
   } = {};
-  let swFeatures: AnalyzeServiceWorkerResponce | null = null;
+  let swFeatures: AnalyzeServiceWorkerResponse | null = null;
 
   const processServiceWorker = async () => {
     if (audits['service-worker-audit']?.details?.scriptUrl ) {

Report/lighthouse/lighthouse.ts

@@ -117,7 +117,7 @@ async function execute() {
       `--disable-features=${disabledFeatures.join(',')}`,
       // '--single-process'
     ],
-    headless: 'new',
+    headless: true,
     defaultViewport: {
       width: screenEmulationMetrics[desktop? 'desktop': 'mobile'].width,
       height: screenEmulationMetrics[desktop? 'desktop': 'mobile'].height,