Update fonts packages and handling

7 files changed, 28 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da20311..16c6c8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to
 - Updated ``autoprefixer``, ``postcss-discard-comments``, ``postcss-import``,
   ``postcss-url``, ``purecss``, ``rollup-plugin-typescript2``, ``rollup``,
   ``tslib``, ``typescript`` and inner dependencies.
+- Switched from ``source-sans-pro`` and ``source-serif-pro`` to
+  ``source-sans`` and ``source-serif`` (got renamed).
 
 ### Fixed
 - Display of line numbers in inline code blocks
diff --git a/_assets/_style.css b/_assets/_style.css
index af34efa..03b9f22 100644
--- a/_assets/_style.css
+++ b/_assets/_style.css
@@ -1,6 +1,6 @@
 @import 'source-code-pro/source-code-pro.css';
-@import 'source-sans-pro/source-sans-pro.css';
-@import 'source-serif-pro/source-serif-pro.css';
+@import 'source-sans/source-sans-3.css';
+@import 'source-serif/source-serif-text.css';
 
 @import 'purecss/build/base.css';
 @import 'purecss/build/grids-core.css';
diff --git a/package-lock.json b/package-lock.json
index 776c8bc..71d1be6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,8 +11,8 @@
       "dependencies": {
         "purecss": "^2.0.6",
         "source-code-pro": "github:adobe-fonts/source-code-pro#release",
-        "source-sans-pro": "^3.6.0",
-        "source-serif-pro": "^3.1.0"
+        "source-sans": "^3.28.0",
+        "source-serif": "^4.4.0"
       },
       "devDependencies": {
         "autoprefixer": "^10.2.5",
@@ -4385,17 +4385,15 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/source-sans-pro": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/source-sans-pro/-/source-sans-pro-3.6.0.tgz",
-      "integrity": "sha512-C1RFUGu+YASuqpgDRInTM7Y6OwqeWNOuKn7v0P/4Kh66epTI4PYWwPWP5kdA4l/VqzBAWiqoz5dk0trof73R7w==",
-      "deprecated": "WARNING: This project has been renamed to source-sans. Install using source-sans instead."
+    "node_modules/source-sans": {
+      "version": "3.28.0",
+      "resolved": "https://registry.npmjs.org/source-sans/-/source-sans-3.28.0.tgz",
+      "integrity": "sha512-ra//x4S1iPfKIAtyHVe92/75CirB3ixIRuWDBOZIIjSUD7DJrs4WSfJaQ1U3MG3JytIJV9G64tUHonhXAftDsw=="
     },
-    "node_modules/source-serif-pro": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/source-serif-pro/-/source-serif-pro-3.1.0.tgz",
-      "integrity": "sha512-b4/f5JilgkEGbFjLh7M9safsjWTovyfvpiQIgGY8pigRkH5lAfO+9jLxbRnKoekBQqmnhacWxiRsCJu4JB4Qhg==",
-      "deprecated": "WARNING: This project has been renamed to source-serif. Install using source-serif instead."
+    "node_modules/source-serif": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/source-serif/-/source-serif-4.4.0.tgz",
+      "integrity": "sha512-6vgShAHupgS9hqgEOWNOPbwP2H/v/YqmlXwJZdB9wGxOjn62d7spSM91VBdcF57XkBvMB051XesZQ8Dapmphkg=="
     },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
@@ -8119,15 +8117,15 @@
         "source-map": "^0.6.0"
       }
     },
-    "source-sans-pro": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/source-sans-pro/-/source-sans-pro-3.6.0.tgz",
-      "integrity": "sha512-C1RFUGu+YASuqpgDRInTM7Y6OwqeWNOuKn7v0P/4Kh66epTI4PYWwPWP5kdA4l/VqzBAWiqoz5dk0trof73R7w=="
+    "source-sans": {
+      "version": "3.28.0",
+      "resolved": "https://registry.npmjs.org/source-sans/-/source-sans-3.28.0.tgz",
+      "integrity": "sha512-ra//x4S1iPfKIAtyHVe92/75CirB3ixIRuWDBOZIIjSUD7DJrs4WSfJaQ1U3MG3JytIJV9G64tUHonhXAftDsw=="
     },
-    "source-serif-pro": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/source-serif-pro/-/source-serif-pro-3.1.0.tgz",
-      "integrity": "sha512-b4/f5JilgkEGbFjLh7M9safsjWTovyfvpiQIgGY8pigRkH5lAfO+9jLxbRnKoekBQqmnhacWxiRsCJu4JB4Qhg=="
+    "source-serif": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/source-serif/-/source-serif-4.4.0.tgz",
+      "integrity": "sha512-6vgShAHupgS9hqgEOWNOPbwP2H/v/YqmlXwJZdB9wGxOjn62d7spSM91VBdcF57XkBvMB051XesZQ8Dapmphkg=="
     },
     "spdx-correct": {
       "version": "3.1.1",
diff --git a/package.json b/package.json
index d00302a..1a35efb 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
   "dependencies": {
     "purecss": "^2.0.6",
     "source-code-pro": "github:adobe-fonts/source-code-pro#release",
-    "source-sans-pro": "^3.6.0",
-    "source-serif-pro": "^3.1.0"
+    "source-sans": "^3.28.0",
+    "source-serif": "^4.4.0"
   },
   "devDependencies": {
     "autoprefixer": "^10.2.5",
diff --git a/rollup.config.js b/rollup.config.js
index 37faf83..56afe2d 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -64,10 +64,10 @@ const assetStyle = () => {
           src: path.join(NODE_M, 'source-code-pro', 'LICENSE.md'),
           dest: path.join(STATIC, 'assets', 'license-source-code-pro.md'),
         }, {
-          src: path.join(NODE_M, 'source-sans-pro', 'LICENSE.md'),
+          src: path.join(NODE_M, 'source-sans', 'LICENSE.md'),
           dest: path.join(STATIC, 'assets', 'license-source-sans-pro.md'),
         }, {
-          src: path.join(NODE_M, 'source-serif-pro', 'LICENSE.md'),
+          src: path.join(NODE_M, 'source-serif', 'LICENSE.md'),
           dest: path.join(STATIC, 'assets', 'license-source-serif-pro.md'),
         }],
       }),
diff --git a/static/assets/license-source-sans-pro.md b/static/assets/license-source-sans-pro.md
index 9eeeb0d..50ee76c 100644
--- a/static/assets/license-source-sans-pro.md
+++ b/static/assets/license-source-sans-pro.md
@@ -1,4 +1,4 @@
-Copyright 2010-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

+Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

 

 This Font Software is licensed under the SIL Open Font License, Version 1.1.

 

diff --git a/static/assets/license-source-serif-pro.md b/static/assets/license-source-serif-pro.md
index 4a3086a..78bb291 100644
--- a/static/assets/license-source-serif-pro.md
+++ b/static/assets/license-source-serif-pro.md
@@ -1,4 +1,4 @@
-Copyright 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.

 

 This Font Software is licensed under the SIL Open Font License, Version 1.1.