Upgrade amp optimizer to v2.8.3 (#27106)

* upgrade amp optimizer to v2.8.3 * update lock * update test Co-authored-by: JJ Kasper <jj@jjsweb.site>
2022-05-30 02:38:23 +02:00 · 2022-05-30 02:38:23 +02:00 · bbe8a9e191
commit bbe8a9e191
parent 741626559d
4 changed files with 75 additions and 75 deletions
--- a/packages/next/package.json
+++ b/packages/next/package.json
@ -94,7 +94,7 @@
    }
  },
  "devDependencies": {
-    "@ampproject/toolbox-optimizer": "2.7.1-alpha.0",
+    "@ampproject/toolbox-optimizer": "2.8.3",
    "@babel/code-frame": "7.12.11",
    "@babel/core": "7.15.0",
    "@babel/eslint-parser": "7.15.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -385,7 +385,7 @@ importers:

  packages/next:
    specifiers:
-      '@ampproject/toolbox-optimizer': 2.7.1-alpha.0
+      '@ampproject/toolbox-optimizer': 2.8.3
      '@babel/code-frame': 7.12.11
      '@babel/core': 7.15.0
      '@babel/eslint-parser': 7.15.0
@ -578,7 +578,7 @@ importers:
      styled-jsx: 5.0.2_@babel+core@7.15.0
      use-sync-external-store: 1.1.0
    devDependencies:
-      '@ampproject/toolbox-optimizer': 2.7.1-alpha.0
+      '@ampproject/toolbox-optimizer': 2.8.3
      '@babel/code-frame': 7.12.11
      '@babel/core': 7.15.0
      '@babel/eslint-parser': 7.15.0_xw2oyqbzhnjfmqehyjkh3ainty
@ -866,16 +866,15 @@ packages:
    dependencies:
      '@jridgewell/trace-mapping': 0.3.4

-  /@ampproject/toolbox-core/2.7.1-alpha.0:
-    resolution: {integrity: sha512-Vutu9Bzo43Hp6Oxem2f14+d1WT107TJiVgpMGdyhdOfd7s+K/D7iI2EKuEsqLRGfJ/NWyXhv8xkQnGZXjIIXjQ==}
+  /@ampproject/toolbox-core/2.8.0:
+    resolution: {integrity: sha512-YrMRrE9zfAChPlFLT+B4yoGEH6CR/Yerjm6SCxuFSPARK/LaytUV+ZhZ03tlMv5wUHDH2Lq8e/lGymME0CXBhA==}
    dependencies:
-      cross-fetch: 3.0.6
+      cross-fetch: 3.1.2
      lru-cache: 6.0.0
    dev: true

-  /@ampproject/toolbox-optimizer/2.7.1-alpha.0:
-    resolution: {integrity: sha512-WGPZKVQvHgNYJk1XVJCCmY+NVGTGJtvn0OALDyiegN4FJWOcilQUhCIcjMkZN59u1flz/u+sEKccM5qsROqVyg==}
-    requiresBuild: true
+  /@ampproject/toolbox-optimizer/2.8.3:
+    resolution: {integrity: sha512-kcs2vT1bY5hvgLfCn7xzlxZzYc/as2r7cy7YlPpxWSO3kcZQnO25HAQZO5+G+a+RKsd++rb4Ga9GhhZyIthfxQ==}
    peerDependencies:
      jimp: '*'
      probe-image-size: '*'
@ -885,42 +884,41 @@ packages:
      probe-image-size:
        optional: true
    dependencies:
-      '@ampproject/toolbox-core': 2.7.1-alpha.0
-      '@ampproject/toolbox-runtime-version': 2.7.1-alpha.0
-      '@ampproject/toolbox-script-csp': 2.5.4
-      '@ampproject/toolbox-validator-rules': 2.7.1-alpha.0
+      '@ampproject/toolbox-core': 2.8.0
+      '@ampproject/toolbox-runtime-version': 2.8.0
+      '@ampproject/toolbox-script-csp': 2.8.0
+      '@ampproject/toolbox-validator-rules': 2.8.0
      abort-controller: 3.0.0
-      cross-fetch: 3.0.6
-      cssnano-simple: 1.2.1
-      dom-serializer: 1.1.0
-      domhandler: 3.3.0
-      domutils: 2.4.2
-      htmlparser2: 5.0.1
+      cross-fetch: 3.1.2
+      cssnano-simple: 2.0.0_postcss@8.2.13
+      dom-serializer: 1.2.0
+      domhandler: 4.0.0
+      domutils: 2.5.0
+      htmlparser2: 6.0.1
      https-proxy-agent: 5.0.0
      lru-cache: 6.0.0
-      node-fetch: 2.6.1
      normalize-html-whitespace: 1.0.0
-      postcss: 7.0.32
-      postcss-safe-parser: 4.0.2
+      postcss: 8.2.13
+      postcss-safe-parser: 5.0.2
      terser: 5.5.1
    transitivePeerDependencies:
      - supports-color
    dev: true

-  /@ampproject/toolbox-runtime-version/2.7.1-alpha.0:
-    resolution: {integrity: sha512-CB3JicgGp/Hp5Tey5/S1hgR+E5kNhS9V2GUeMW7qDYDqaJ6dLNlQ5tYgqaebrpeRxufZrK5MRd7bnM4o5tAyuA==}
+  /@ampproject/toolbox-runtime-version/2.8.0:
+    resolution: {integrity: sha512-vkotDc6S3Q3Xm6LIPzWo2T1+yxvj+bIDrD4SObk6J4SVqilIlPEunLayS602Su+ZXqNC82VjEeD1ARAtc613dQ==}
    dependencies:
-      '@ampproject/toolbox-core': 2.7.1-alpha.0
+      '@ampproject/toolbox-core': 2.8.0
    dev: true

-  /@ampproject/toolbox-script-csp/2.5.4:
-    resolution: {integrity: sha512-+knTYetI5nWllRZ9wFcj7mYxelkiiFVRAAW/hl0ad8EnKHMH82tRlk40CapEnUHhp6Er5sCYkumQ8dngs3Q4zQ==}
+  /@ampproject/toolbox-script-csp/2.8.0:
+    resolution: {integrity: sha512-5/ytdTzhmdIyOkcEBskh5ZlLJ8V4bbe+1pY9LZQ8DfWrSOVD1pJ+LtAO/7lmTM+HXxMAKPYDRpvsJc0vvbY0tw==}
    dev: true

-  /@ampproject/toolbox-validator-rules/2.7.1-alpha.0:
-    resolution: {integrity: sha512-1+nrZDkHIk8Go4Qh9DUfjTrbsW0OTvLYdwcI716LdgyB3WsmLfsAx/fJU/9Tc14a1YS73ptx2Xb0Tdh+ewwEIw==}
+  /@ampproject/toolbox-validator-rules/2.8.0:
+    resolution: {integrity: sha512-kbInwnzpEPVZkKigpKFkF/DQ2LsuZ5b8vrEFHjJ4P+meKVQg2QF/UWAQpIMMdjGe1AQBT+DWm91n9UyjgqfnWQ==}
    dependencies:
-      cross-fetch: 3.1.4
+      cross-fetch: 3.1.2
    dev: true

  /@babel/code-frame/7.12.11:
@ -8543,6 +8541,10 @@ packages:
      color-string: 1.5.4
    dev: true

+  /colorette/1.4.0:
+    resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
+    dev: true
+
  /colors/1.4.0:
    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
    engines: {node: '>=0.1.90'}
@ -9032,8 +9034,8 @@ packages:
      cross-spawn: 7.0.3
    dev: true

-  /cross-fetch/3.0.6:
-    resolution: {integrity: sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==}
+  /cross-fetch/3.1.2:
+    resolution: {integrity: sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==}
    dependencies:
      node-fetch: 2.6.1
    dev: true
@ -9295,11 +9297,13 @@ packages:
      postcss-unique-selectors: 4.0.1
    dev: true

-  /cssnano-preset-simple/1.2.1:
-    resolution: {integrity: sha512-B2KahOIFTV6dw5Ioy9jHshTh/vAYNnUB2enyWRgnAEg3oJBjI/035ExpePaMqS2SwpbH7gCgvQqwpMBH6hTJSw==}
+  /cssnano-preset-simple/2.0.0_postcss@8.2.13:
+    resolution: {integrity: sha512-HkufSLkaBJbKBFx/7aj5HmCK9Ni/JedRQm0mT2qBzMG/dEuJOLnMt2lK6K1rwOOyV4j9aSY+knbW9WoS7BYpzg==}
+    peerDependencies:
+      postcss: ^8.2.1
    dependencies:
      caniuse-lite: 1.0.30001332
-      postcss: 7.0.32
+      postcss: 8.2.13
    dev: true

  /cssnano-preset-simple/3.0.1_postcss@8.4.5:
@ -9311,11 +9315,13 @@ packages:
      postcss: 8.4.5
    dev: true

-  /cssnano-simple/1.2.1:
-    resolution: {integrity: sha512-9vOyjw8Dj/T12kIOnXPZ5VnEIo6F3YMaIn0wqJXmn277R58cWpI3AvtdlCBtohX7VAUNYcyk2d0dKcXXkb5I6Q==}
+  /cssnano-simple/2.0.0_postcss@8.2.13:
+    resolution: {integrity: sha512-0G3TXaFxlh/szPEG/o3VcmCwl0N3E60XNb9YZZijew5eIs6fLjJuOPxQd9yEBaX2p/YfJtt49i4vYi38iH6/6w==}
+    peerDependencies:
+      postcss: ^8.2.2
    dependencies:
-      cssnano-preset-simple: 1.2.1
-      postcss: 7.0.32
+      cssnano-preset-simple: 2.0.0_postcss@8.2.13
+      postcss: 8.2.13
    dev: true

  /cssnano-simple/3.0.1_postcss@8.4.5:
@ -9839,11 +9845,11 @@ packages:
      entities: 2.0.0
    dev: true

-  /dom-serializer/1.1.0:
-    resolution: {integrity: sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==}
+  /dom-serializer/1.2.0:
+    resolution: {integrity: sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==}
    dependencies:
      domelementtype: 2.2.0
-      domhandler: 3.3.0
+      domhandler: 4.2.0
      entities: 2.0.0
    dev: true

@ -9888,8 +9894,8 @@ packages:
      domelementtype: 1.3.1
    dev: true

-  /domhandler/3.3.0:
-    resolution: {integrity: sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==}
+  /domhandler/4.0.0:
+    resolution: {integrity: sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==}
    engines: {node: '>= 4'}
    dependencies:
      domelementtype: 2.2.0
@ -9915,12 +9921,12 @@ packages:
      domelementtype: 1.3.1
    dev: true

-  /domutils/2.4.2:
-    resolution: {integrity: sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==}
+  /domutils/2.5.0:
+    resolution: {integrity: sha512-Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg==}
    dependencies:
      dom-serializer: 1.3.1
      domelementtype: 2.2.0
-      domhandler: 3.3.0
+      domhandler: 4.2.0
    dev: true

  /domutils/2.6.0:
@ -12377,11 +12383,11 @@ packages:
      readable-stream: 3.6.0
    dev: true

-  /htmlparser2/5.0.1:
-    resolution: {integrity: sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==}
+  /htmlparser2/6.0.1:
+    resolution: {integrity: sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==}
    dependencies:
      domelementtype: 2.2.0
-      domhandler: 3.3.0
+      domhandler: 4.2.0
      domutils: 2.6.0
      entities: 2.0.0
    dev: true
@ -13969,7 +13975,7 @@ packages:
      esprima: 4.0.1

  /jsbn/0.1.1:
-    resolution: {integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM=}
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
    dev: true

  /jscodeshift/0.13.1_@babel+preset-env@7.15.0:
@ -14089,10 +14095,10 @@ packages:
    dev: true

  /json-stable-stringify-without-jsonify/1.0.1:
-    resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}

  /json-stringify-safe/5.0.1:
-    resolution: {integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=}
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
    dev: true

  /json-to-ast/2.1.0:
@ -14157,7 +14163,7 @@ packages:
    dev: true

  /jsprim/1.4.1:
-    resolution: {integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=}
+    resolution: {integrity: sha512-4Dj8Rf+fQ+/Pn7C5qeEX02op1WfOss3PKTE9Nsop3Dx+6UPxlm1dr/og7o2cRa5hNN07CACr4NFzRLtj/rjWog==}
    engines: {'0': node >=0.6.0}
    dependencies:
      assert-plus: 1.0.0
@ -17804,11 +17810,11 @@ packages:
      postcss: 8.4.5
    dev: true

-  /postcss-safe-parser/4.0.2:
-    resolution: {integrity: sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==}
-    engines: {node: '>=6.0.0'}
+  /postcss-safe-parser/5.0.2:
+    resolution: {integrity: sha512-jDUfCPJbKOABhwpUKcqCVbbXiloe/QXMcbJ6Iipf3sDIihEzTqRCeMBfRaOHxhBuTYqtASrI1KJWxzztZU4qUQ==}
+    engines: {node: '>=10.0'}
    dependencies:
-      postcss: 7.0.32
+      postcss: 8.4.5
    dev: true

  /postcss-safe-parser/6.0.0_postcss@8.4.5:
@ -17942,6 +17948,15 @@ packages:
      supports-color: 6.1.0
    dev: true

+  /postcss/8.2.13:
+    resolution: {integrity: sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      colorette: 1.4.0
+      nanoid: 3.1.30
+      source-map: 0.6.1
+    dev: true
+
  /postcss/8.4.5:
    resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==}
    engines: {node: ^10 || ^12 || >=14}
--- a/test/integration/amphtml-custom-optimizer/test/index.test.js
+++ b/test/integration/amphtml-custom-optimizer/test/index.test.js
@ -29,7 +29,7 @@ describe('AMP Custom Optimizer', () => {
    )
    expect(html).toContain('i-amphtml-version="001515617716922"')
    expect(html).toContain(
-      'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.js"'
+      'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.mjs"'
    )
  })

@ -48,7 +48,7 @@ describe('AMP Custom Optimizer', () => {
    )
    expect(html).toContain('i-amphtml-version="001515617716922"')
    expect(html).toContain(
-      'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.js"'
+      'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.mjs"'
    )
  })
 })
--- a/test/integration/amphtml/test/index.test.js
+++ b/test/integration/amphtml/test/index.test.js
@ -106,21 +106,6 @@ describe('AMP Usage', () => {
        expect(result).toBeFalsy()
      })

-      it('should add link preload for amp script', async () => {
-        const html = await renderViaHTTP(appPort, '/?amp=1')
-        await validateAMP(html)
-        const $ = cheerio.load(html)
-        expect(
-          $(
-            $('link[rel=preload]')
-              .toArray()
-              .find(
-                (i) => $(i).attr('href') === 'https://cdn.ampproject.org/v0.js'
-              )
-          ).attr('href')
-        ).toBe('https://cdn.ampproject.org/v0.js')
-      })
-
      it('should drop custom scripts', async () => {
        const html = await renderViaHTTP(appPort, '/custom-scripts')
        expect(html).not.toMatch(/src='\/im-not-allowed\.js'/)