fix: temporary fix MaxCDN outage (#581)

* fix: temporary fix * fix: update yarn command line in build script
twitter · Jan 9, 2023 · abb5a1a · abb5a1a
1 parent ad3d3d6
commit abb5a1a
Show file tree

Hide file tree

Showing 10 changed files with 1,461 additions and 1,072 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,10 @@ node_modules/
 build
 dist/
 .npmrc
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ This guarantees that you will always use the latest version of the library.
 
 If, instead, you'd like to include the latest version explicitly, you can add the following tag:
 ```html
-<script src="https://twemoji.maxcdn.com/v/14.0.2/twemoji.min.js" integrity="sha384-32KMvAMS4DUBcQtHG6fzADguo/tpN1Nh6BAJa2QqZc6/i0K+YPQE+bWiqBRAWuFs" crossorigin="anonymous"></script>
+<script src="https://unpkg.com/twemoji@14.0.2/dist/twemoji.min.js" integrity="sha384-ICOlZarapRIX6UjKPcWKEpubjg7lGADN7Y9fYP4DU9zm0aPFhgnP5ef+XFaPyKv+" crossorigin="anonymous"></script>
 ```
 
 ### Download

diff --git a/index.d.ts b/index.d.ts
@@ -13,7 +13,7 @@ export type ReplacerFunction = (substring: string, ...args: any[]) => string;
 
 export type TwemojiOptions = {
   /**
-   * Default: MaxCDN
+   * Default: Cloudflare
    */
   base?: string;
   /**

diff --git a/index.html b/index.html
@@ -44,7 +44,7 @@ <h1>Twem&#x2764;ji</h1>
     <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 
     <p>Code licensed under MIT. Graphics licensed under CC-BY</p>
-    <script src="https://twemoji.maxcdn.com/v/latest/twemoji.min.js"></script>
+    <script src="https://unpkg.com/twemoji@latest/dist/twemoji.min.js"></script>
     <script>
       // I \u2764 emoji!
       twemoji.parse(document.body);

diff --git a/scripts/build.js b/scripts/build.js
@@ -47,7 +47,7 @@ function createTwemoji() {
         /////////////////////////
 
           // default assets url, by default will be Twitter Inc. CDN
-          base: 'https://twemoji.maxcdn.com/v/$VERSION/',
+          base: 'https://cdnjs.cloudflare.com/ajax/libs/twemoji/$VERSION/',
 
           // default assets file extensions, by default '.png'
           ext: '.png',

diff --git a/scripts/create-dist b/scripts/create-dist
@@ -39,7 +39,7 @@ fs.writeFileSync(
 );
 
 spawnSync(
-  'yarnpkg',
+  'yarn',
   [
     'uglifyjs',
     '--verbose',
@@ -60,7 +60,7 @@ const integrityHash = getIntegrityHash(distFile('twemoji.min.js'));
 const { version } = require('../package.json');
 
 function updateSriScriptReference(filename) {
-  const newScript = `<script src="https://twemoji.maxcdn.com/v/${version}/twemoji.min.js" integrity="${integrityHash}"`;
+  const newScript = `<script src="https://unpkg.com/twemoji@${version}/dist/twemoji.min.js" integrity="${integrityHash}"`;
   fs.writeFileSync(filename, fs.readFileSync(filename).toString('utf8').replace(/<script src="[^ ]*" integrity="[^ ]*"/, newScript));
 }
 

diff --git a/src/test/preview-svg.html b/src/test/preview-svg.html
@@ -25,7 +25,7 @@
       vertical-align: -0.1em;
     }
     </style>
-    <script src="https://twemoji.maxcdn.com/v/latest/twemoji.min.js" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/twemoji@latest/dist/twemoji.min.js" crossorigin="anonymous"></script>
   </head>
   <body>
     <ul class="emoji-list">

diff --git a/src/test/test.js b/src/test/test.js
@@ -225,7 +225,7 @@ wru.test([{
 },{
   name: 'nested nodes',
   test: function () {
-    var str = '<img class="emoji" draggable="false" alt="\u2764" src="https://twemoji.maxcdn.com/72x72/2764.png"/>',
+    var str = '<img class="emoji" draggable="false" alt="\u2764" src="https://cdnjs.cloudflare.com/ajax/libs/twemoji/14.0.2/72x72/2764.png"/>',
         div = document.createElement('div'),
         p,
         img;