update

dachaeon · May 7, 2019 · a587cea · a587cea
1 parent f4323ec
commit a587cea
Show file tree

Hide file tree

Showing 5 changed files with 1,081 additions and 1,162 deletions.
diff --git a/angular.json b/angular.json
@@ -36,7 +36,8 @@
                 "input": "src/global.scss"
               }
             ],
-            "scripts": []
+            "scripts": [],
+            "es5BrowserSupport": true
           },
           "configurations": {
             "production": {

diff --git a/firebase.json b/firebase.json
@@ -29,7 +29,7 @@
           {
             "key": "Link",
             "value":
-              "</22.3e7d9e35871b1ac72549.js>;rel=preload;as=script,</styles.56a3ad37f5cebe088e83.css>;rel=preload;as=style,</runtime.9291807ac0ccdbded33e.js>;rel=preload;as=script,</polyfills.831ecfebd3d4e97df989.js>;rel=preload;as=script,</main.f6d00ce10d69f1f6e7fb.js>;rel=preload;as=script,</common.b6b0115808f3c9fd1d69.js>;rel=preload;as=script,</173.e0b988b648f09db932db.js>;rel=preload;as=script,</149.f6043f20e1dc90a4e7db.js>;rel=preload;as=script,</117.3af3b84bd416f1ef5fe2.js>;rel=preload;as=script,</51.d1be872e90b69eaece48.js>;rel=preload;as=script,</92.caea70f001934c2f89f5.js>;rel=preload;as=script,</45.b7825f6109d93ae4a3d7.js>;rel=preload;as=script,</100.8d18ea16ed8d80fc16d3.js>;rel=preload;as=script,</5.1af48c97cf8873405b97.js>;rel=preload;as=script,</147.4e7d253b5759b8ef977a.js>;rel=preload;as=script,</7.04e49d8eb2fb82393356.js>;rel=preload;as=script,</125.541133887552aa12feb7.js>;rel=preload;as=script,</assets/img/ica-slidebox-img-1.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-2.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-3.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-4.png>;rel=preload;as=script,</6.ba790a199f354956bcb5.js>;rel=preload;as=script,"
+              "</25.7db0c0f679f29628451d.js>;rel=preload;as=script,</styles.78714f64c5619ee02382.css>;rel=preload;as=style,</runtime.c06fbb26e9bab5fb8a00.js>;rel=preload;as=script,</polyfills.83e506f1c32447a5a917.js>;rel=preload;as=script,</main.7d636f05011125b2c1ed.js>;rel=preload;as=script,</common.bdbc08c4e46bd612eb35.js>;rel=preload;as=script,</72.77f4c92bf907b93ddf9d.js>;rel=preload;as=script,</102.88783f6f1841f256a61f.js>;rel=preload;as=script,</112.0493e83015315c306ce4.js>;rel=preload;as=script,</138.c4cdbafac56511990ea5.js>;rel=preload;as=script,</128.996a6e0fcfb6178447ae.js>;rel=preload;as=script,</64.2c332dbb23ca40339346.js>;rel=preload;as=script,</134.e995f94ac5f69c01618a.js>;rel=preload;as=script,</8.5deb8afd2d9798907a78.js>;rel=preload;as=script,</176.e3bcff597174a751a9bc.js>;rel=preload;as=script,</5.ddd0a72185376268a758.js>;rel=preload;as=script,</4.54d1be505b517fb8a365.js>;rel=preload;as=script,</142.e4db899d283c2a9ccd53.js>;rel=preload;as=script,</assets/img/ica-slidebox-img-1.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-2.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-3.png>;rel=preload;as=script,</assets/img/ica-slidebox-img-4.png>;rel=preload;as=script,</10.9dfc5381b71f20b8d830.js>;rel=preload;as=script,"
           }
         ]
       }

diff --git a/generate-h2-push.js b/generate-h2-push.js
@@ -17,9 +17,10 @@ const indexMatches = [
   '.svg'
 ];
 let results = '';
-async function main(){
+async function main() {
   const browser = await puppeteer.launch();
   const page = await browser.newPage();
+  await page._client.send('ServiceWorker.disable')
 
   page.on('console', msg => console.log(msg.text()));
 
@@ -31,32 +32,37 @@ async function main(){
     allRequests.set(req.url(), req);
   });
 
-  await page.reload({ waitUntil: 'networkidle0' });
+  await page.reload({ waitUntil: 'networkidle2' });
 
   Array.from(allRequests.values()).forEach(req => {
     const url = req.url();
 
     // filter out urls that match these extensions
     for (const exlude of indexMatches) {
-      if (url.indexOf(exlude) != -1) {
-        return false;
-      }
+      if (url.indexOf(exlude) != -1) return false;
     }
+
     // if external, dont worry about it for now
-    if (url.indexOf(host) === -1) return false;
+    //
+    const origin = new URL(host);
+
+    if (url.indexOf(origin.origin) === -1) return false;
 
     // Format the url to remove the host
-    const formatted = url.replace(`${host}/`, '');
+    const formatted = url.replace(`${origin.origin}/`, '');
+
+    if (origin.pathname.includes(formatted)) return false;
+
     // if it's an empty string, just ignore it
     if (!formatted) return false;
 
     let type = url.substr(-3) == 'css' ? 'style' : 'script';
     results += `</${formatted}>;rel=preload;as=${type},`;
-  });
 
+  });
   await browser.close();
   updateWith(results);
-};
+}
 function updateWith(result) {
   fs.readFile('firebase.json', 'utf8', function(err, data) {
     if (err) {
@@ -75,4 +81,5 @@ function updateWith(result) {
     }
   });
 }
+
 main();