@financial-times/dotcom-ui-shell 5.1.0 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. package/dist/node/components/ResourceHints.js +4 -1
  2. package/dist/node/lib/getResourceType.js +1 -2
  3. package/package.json +6 -6
  4. package/src/components/ResourceHints.tsx +4 -1
  5. package/src/components/Shell.tsx +2 -1
  6. package/src/lib/getResourceType.ts +1 -3
package/dist/node/components/ResourceHints.js CHANGED
@@ -13,8 +13,11 @@ const ResourceHints = (props) => {
13
13
  react_1.default.createElement("link", { rel: "preconnect", href: "https://ads-api.ft.com" }),
14
14
  react_1.default.createElement("link", { rel: "preconnect", href: "https://securepubads.g.doubleclick.net" }),
15
15
  props.resourceHints.map((resource, i) => {
16
+ var _a;
16
17
  const contentType = getResourceType_1.default(resource);
17
- const mimeType = mime_types_1.default.lookup(resource) || null;
18
+ const mimeType = mime_types_1.default.lookup(resource) ||
19
+ mime_types_1.default.lookup((_a = resource.match(/(?<=font_format=)([a-z0-9]+)/)) === null || _a === void 0 ? void 0 : _a[0]) ||
20
+ null;
18
21
  const attributes = {
19
22
  as: contentType,
20
23
  href: resource,
package/dist/node/lib/getResourceType.js CHANGED
@@ -8,7 +8,6 @@ const url_1 = __importDefault(require("url"));
8
8
  const StyleFiles = new Set(['.css']);
9
9
  const ScriptFiles = new Set(['.js', '.mjs']);
10
10
  const ImageFiles = new Set(['.png', '.jpg', '.jpeg', '.gif', '.svg', '.webp']);
11
- const FontFiles = new Set(['.woff', '.woff2', '.otf', '.ttf', '.eot']);
12
11
  exports.default = (file) => {
13
12
  // Always parse the file so that we can ignore any domain names, query strings etc.
14
13
  // Node's old URL API is able to parse anything inc. filenames, paths, and URLs.
@@ -23,7 +22,7 @@ exports.default = (file) => {
23
22
  if (ImageFiles.has(extension)) {
24
23
  return 'image';
25
24
  }
26
- if (FontFiles.has(extension)) {
25
+ if (file.includes('font_format=woff')) {
27
26
  return 'font';
28
27
  }
29
28
  throw Error(`Unknown filename extension "${extension}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@financial-times/dotcom-ui-shell",
3
- "version": "5.1.0",
3
+ "version": "6.0.0",
4
4
  "description": "",
5
5
  "main": "component.js",
6
6
  "browser": "browser.js",
@@ -21,11 +21,11 @@
21
21
  "author": "",
22
22
  "license": "MIT",
23
23
  "dependencies": {
24
- "@financial-times/dotcom-ui-app-context": "^5.1.0",
25
- "@financial-times/dotcom-ui-base-styles": "^5.1.0",
26
- "@financial-times/dotcom-ui-bootstrap": "^5.1.0",
27
- "@financial-times/dotcom-ui-flags": "^5.1.0",
28
- "@financial-times/dotcom-ui-polyfill-service": "^5.1.0",
24
+ "@financial-times/dotcom-ui-app-context": "^6.0.0",
25
+ "@financial-times/dotcom-ui-base-styles": "^6.0.0",
26
+ "@financial-times/dotcom-ui-bootstrap": "^6.0.0",
27
+ "@financial-times/dotcom-ui-flags": "^6.0.0",
28
+ "@financial-times/dotcom-ui-polyfill-service": "^6.0.0",
29
29
  "mime-types": "^2.1.26"
30
30
  },
31
31
  "peerDependencies": {
package/src/components/ResourceHints.tsx CHANGED
@@ -32,7 +32,10 @@ const ResourceHints = (props: TResourceHintsProps) => {
32
32
 
33
33
  {props.resourceHints.map((resource, i) => {
34
34
  const contentType = getResourceType(resource)
35
- const mimeType = mimeTypes.lookup(resource) || null
35
+ const mimeType =
36
+ mimeTypes.lookup(resource) ||
37
+ mimeTypes.lookup(resource.match(/(?<=font_format=)([a-z0-9]+)/)?.[0]) ||
38
+ null
36
39
 
37
40
  const attributes: React.LinkHTMLAttributes<HTMLLinkElement> = {
38
41
  as: contentType,
package/src/components/Shell.tsx CHANGED
@@ -51,7 +51,8 @@ function Shell(props: TShellProps) {
51
51
  lang="en-GB"
52
52
  className={`no-js core ${loadCustomFontsClassNames}`}
53
53
  data-o-component="o-typography"
54
- style={documentStyles}>
54
+ style={documentStyles}
55
+ >
55
56
  <head>
56
57
  <DocumentHead {...props} />
57
58
  <ResourceHints resourceHints={resourceHints} />
package/src/lib/getResourceType.ts CHANGED
@@ -7,8 +7,6 @@ const ScriptFiles = new Set(['.js', '.mjs'])
7
7
 
8
8
  const ImageFiles = new Set(['.png', '.jpg', '.jpeg', '.gif', '.svg', '.webp'])
9
9
 
10
- const FontFiles = new Set(['.woff', '.woff2', '.otf', '.ttf', '.eot'])
11
-
12
10
  export default (file: string): string => {
13
11
  // Always parse the file so that we can ignore any domain names, query strings etc.
14
12
  // Node's old URL API is able to parse anything inc. filenames, paths, and URLs.
@@ -28,7 +26,7 @@ export default (file: string): string => {
28
26
  return 'image'
29
27
  }
30
28
 
31
- if (FontFiles.has(extension)) {
29
+ if (file.includes('font_format=woff')) {
32
30
  return 'font'
33
31
  }
34
32