Skip to content

Make images smaller using best-in-class codecs, right in the browser.

JavaScript

Site isolation headers & redirect fix (#866)

Jake Archibald3abc7700536a
diff --git a/package-lock.json b/package-lock.json
index 045bfcf5..2ddde372 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -182,6 +182,12 @@
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
"dev": true
},
+ "@types/dedent": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/@types/dedent/-/dedent-0.7.0.tgz",
+ "integrity": "sha512-EGlKlgMhnLt/cM4DbUSafFdrkeJoC9Mvnj0PUCU7tFmTjMjNRT957kXCx0wYm3JuEq4o4ZsS5vG+NlkM2DMd2A==",
+ "dev": true
+ },
"@types/estree": {
"version": "0.0.39",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
diff --git a/package.json b/package.json
index fa813be0..44bc7fac 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,11 @@
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-replace": "^2.3.4",
"@surma/rollup-plugin-off-main-thread": "^1.4.2",
+ "@types/dedent": "^0.7.0",
"@types/node": "^14.14.7",
"comlink": "^4.3.0",
"cssnano": "^4.1.10",
+ "dedent": "^0.7.0",
"del": "^5.1.0",
"file-drop-element": "^1.0.1",
"husky": "^4.3.0",
diff --git a/src/copy/_headers b/src/copy/_headers
deleted file mode 100644
index ecdb8a68..00000000
--- a/src/copy/_headers
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Cache-Control: no-cache
-
-/c/*
- Cache-Control: max-age=31536000
-
-# COOP+COEP for WebAssembly threads.
-/*
- Cross-Origin-Embedder-Policy: require-corp
- Cross-Origin-Opener-Policy: same-origin
-# Origin trial for WebAssembly SIMD.
-# ATTENTION: This one is configured for dev--squoosh.netlify.app preview.
-# For production squoosh.app, replace with AgoKiDqjr0GVPtrwV/vuVlrrSvbDa5Yb99s+q66ly816DrrAQ8Cdas33NgDtmhxM4BtDP9PEdyuxHPyTQHD5ZAcAAABUeyJvcmlnaW4iOiJodHRwczovL3NxdW9vc2guYXBwOjQ0MyIsImZlYXR1cmUiOiJXZWJBc3NlbWJseVNpbWQiLCJleHBpcnkiOjE2MDg2NzI5OTR9.
- Origin-Trial: As3b1fXjclhF8ZgvUkIqOo3r1/Jqvx0mNuT6Ilgb7SdpeJnV8lUdYr7i+OKgCmcVTWkqjkF23LJ+xZ111VYMEQIAAABheyJvcmlnaW4iOiJodHRwczovL2Rldi0tc3F1b29zaC5uZXRsaWZ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlTaW1kIiwiZXhwaXJ5IjoxNjA5NDI4Nzk4fQ==
diff --git a/src/copy/_redirects b/src/copy/_redirects
index 66fd124c..31e2bf01 100644
--- a/src/copy/_redirects
+++ b/src/copy/_redirects
@@ -1,2 +1 @@
-/index.html / 301
-/* /index.html 301
\ No newline at end of file
+/editor / 301
diff --git a/src/static-build/index.tsx b/src/static-build/index.tsx
index 4d104375..d90f4cf0 100644
--- a/src/static-build/index.tsx
+++ b/src/static-build/index.tsx
@@ -16,6 +16,23 @@ import { renderPage, writeFiles } from './utils';
import IndexPage from './pages/index';
import iconLargeMaskable from 'url:static-build/assets/icon-large-maskable.png';
import iconLarge from 'url:static-build/assets/icon-large.png';
+import dedent from 'dedent';
+
+// Set by Netlify
+const branch = process.env.BRANCH;
+
+const branchOriginTrialIds = new Map([
+ [
+ 'dev',
+ 'As3b1fXjclhF8ZgvUkIqOo3r1/Jqvx0mNuT6Ilgb7SdpeJnV8lUdYr7i+OKgCmcVTWkqjkF23LJ+xZ111VYMEQIAAABheyJvcmlnaW4iOiJodHRwczovL2Rldi0tc3F1b29zaC5uZXRsaWZ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlTaW1kIiwiZXhwaXJ5IjoxNjA5NDI4Nzk4fQ==',
+ ],
+ [
+ 'live',
+ 'AgoKiDqjr0GVPtrwV/vuVlrrSvbDa5Yb99s+q66ly816DrrAQ8Cdas33NgDtmhxM4BtDP9PEdyuxHPyTQHD5ZAcAAABUeyJvcmlnaW4iOiJodHRwczovL3NxdW9vc2guYXBwOjQ0MyIsImZlYXR1cmUiOiJXZWJBc3NlbWJseVNpbWQiLCJleHBpcnkiOjE2MDg2NzI5OTR9',
+ ],
+]);
+
+const originTrialId = branchOriginTrialIds.get(branch || '');
interface Output {
[outputPath: string]: string;
@@ -57,6 +74,27 @@ const toOutput: Output = {
},
},
}),
+ _headers: dedent`
+ /*
+ Cache-Control: no-cache
+
+ /c/*
+ Cache-Control: max-age=31536000
+
+ # COOP+COEP for WebAssembly threads.
+ /*
+ Cross-Origin-Embedder-Policy: require-corp
+ Cross-Origin-Opener-Policy: same-origin
+
+ # Origin trial for WebAssembly SIMD.
+ ${
+ originTrialId
+ ? ` Origin-Trial: ${originTrialId}`
+ : `# Cannot find origin trial ID. process.env.BRANCH is: ${JSON.stringify(
+ branch,
+ )}`
+ }
+ `,
};
writeFiles(toOutput);