Unverified Commit eb9d10fa authored by Shotaro Watanabe's avatar Shotaro Watanabe Committed by GitHub

Update @ampproject/toolbox-optimizer to v2.3.0 (#12039)

parent a6791abf
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@ampproject/toolbox-optimizer": "2.2.0", "@ampproject/toolbox-optimizer": "2.3.0",
"@babel/core": "7.7.2", "@babel/core": "7.7.2",
"@babel/plugin-proposal-class-properties": "7.7.0", "@babel/plugin-proposal-class-properties": "7.7.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.7.4", "@babel/plugin-proposal-nullish-coalescing-operator": "7.7.4",
......
...@@ -3,7 +3,6 @@ module.exports = { ...@@ -3,7 +3,6 @@ module.exports = {
amp: { amp: {
optimizer: { optimizer: {
ampRuntimeVersion: '001515617716922', ampRuntimeVersion: '001515617716922',
ampUrlPrefix: '/amp',
verbose: true, verbose: true,
}, },
skipValidation: true, skipValidation: true,
......
...@@ -30,7 +30,9 @@ describe('AMP Custom Optimizer', () => { ...@@ -30,7 +30,9 @@ describe('AMP Custom Optimizer', () => {
'amp-twitter width="500" height="500" layout="responsive" data-tweetid="1159145442896166912"' 'amp-twitter width="500" height="500" layout="responsive" data-tweetid="1159145442896166912"'
) )
expect(html).toContain('i-amphtml-version="001515617716922"') expect(html).toContain('i-amphtml-version="001515617716922"')
expect(html).toContain('script async src="/amp/rtv/001515617716922/v0.js"') expect(html).toContain(
'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.js"'
)
}) })
it('should build and start for dynamic page', async () => { it('should build and start for dynamic page', async () => {
...@@ -47,6 +49,8 @@ describe('AMP Custom Optimizer', () => { ...@@ -47,6 +49,8 @@ describe('AMP Custom Optimizer', () => {
'amp-img width="500" height="500" layout="responsive" src="https://amp.dev/static/samples/img/story_dog2_portrait.jpg"' 'amp-img width="500" height="500" layout="responsive" src="https://amp.dev/static/samples/img/story_dog2_portrait.jpg"'
) )
expect(html).toContain('i-amphtml-version="001515617716922"') expect(html).toContain('i-amphtml-version="001515617716922"')
expect(html).toContain('script async src="/amp/rtv/001515617716922/v0.js"') expect(html).toContain(
'script async src="https://cdn.ampproject.org/rtv/001515617716922/v0.js"'
)
}) })
}) })
...@@ -2,46 +2,46 @@ ...@@ -2,46 +2,46 @@
# yarn lockfile v1 # yarn lockfile v1
"@ampproject/toolbox-core@^2.2.0": "@ampproject/toolbox-core@^2.3.0":
version "2.2.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.2.0.tgz#3878c5fbdd2acdd865f070ded43ee84652a7a16b" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.3.0.tgz#f27bd17e01fdc6725c440aefa844f63466c0f37e"
integrity sha512-g0NnZZqPJttIcdplIpiMDmOLewwvCWPSnFKvNdyYXN7vknRvR4krpV2qveuVgjnA+dSlDmtzuFapFCaWh4V7FQ== integrity sha512-NT+kVR5Rm2cxp12h40IXgPRWmq0cpUdmcgZmgdelplp/q//4aWkt2+llGHR2foQJkwICxMVVlb/XidsHz0Rh9g==
dependencies: dependencies:
cross-fetch "3.0.4" cross-fetch "3.0.4"
"@ampproject/toolbox-optimizer@2.2.0": "@ampproject/toolbox-optimizer@2.3.0":
version "2.2.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.2.0.tgz#2438d7102beb1a74bae8d20926e038c5f724a8ae" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.3.0.tgz#504341aa75f81b42d17406d323a71b961e5fa062"
integrity sha512-lEujArv6jyl/mEab0uBZ25oMkf+kf8cpTuHPcy8k3+jtomNyVtd94lbSWbQtomsEnYQ0MA9MvLvCJXsJz1fQcg== integrity sha512-g2I7qNK6G1UWGFgw7BaHy9fUW8866vyieZeZbiKyuVNvxandxgrB0P8ujhSDC0XbKpBSi5F5Ei+GNRdO3PzU9g==
dependencies: dependencies:
"@ampproject/toolbox-core" "^2.2.0" "@ampproject/toolbox-core" "^2.3.0"
"@ampproject/toolbox-runtime-version" "^2.2.0" "@ampproject/toolbox-runtime-version" "^2.3.0"
"@ampproject/toolbox-script-csp" "^2.2.0" "@ampproject/toolbox-script-csp" "^2.3.0"
"@ampproject/toolbox-validator-rules" "^2.2.0" "@ampproject/toolbox-validator-rules" "^2.3.0"
cssnano "4.1.10" cssnano "4.1.10"
domhandler "3.0.0" domhandler "3.0.0"
domutils "2.0.0" domutils "2.0.0"
htmlparser2 "4.1.0" htmlparser2 "4.1.0"
normalize-html-whitespace "1.0.0" normalize-html-whitespace "1.0.0"
postcss-safe-parser "4.0.2" postcss-safe-parser "4.0.2"
terser "4.6.8" terser "4.6.11"
"@ampproject/toolbox-runtime-version@^2.2.0": "@ampproject/toolbox-runtime-version@^2.3.0":
version "2.2.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.2.0.tgz#e90ae9e97081c9c5362262f9ba093ac029837a8c" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.3.0.tgz#01a72db8fb069d64d341fb4cc4ffee2be6c8ca12"
integrity sha512-kQRLMreDp1Wp9DotQzJ4k/ZKK6ZxtI6ce2JIvyH8Xfi6H4BQNu0Ht0agMgm51/OsMKyHD+dDIGEHKaKWIOiPLQ== integrity sha512-sos2hmnAqp+KLYMLe+gF71BAElDmY04V4M9BvYRj3LEvwu3sCbvo2UPwcWZBgcWBV/cnh3JDHW+FaKfB5LtRrw==
dependencies: dependencies:
"@ampproject/toolbox-core" "^2.2.0" "@ampproject/toolbox-core" "^2.3.0"
"@ampproject/toolbox-script-csp@^2.2.0": "@ampproject/toolbox-script-csp@^2.3.0":
version "2.2.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.2.0.tgz#7bc33985e94a40acdbddb5695dc8d85f11066803" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.3.0.tgz#374cd0bf69bfdd0f1784064d0de69162722c89af"
integrity sha512-Z5AzbWFTlTMJg0z1/frMDmW6Gj+EbOw0dVdFYfdma4AJq4rNoxCQMVgVOjl4ryWNouJvK1RUA8o7sY1WmMx6eg== integrity sha512-Qba53ohvCH79sYl5O8K5GMSo/372OjuyxNc+XySG26sAsG26WpBKJEE0HTr8rsa//CD3Fc92FieT1gK5U/jK4Q==
"@ampproject/toolbox-validator-rules@^2.2.0": "@ampproject/toolbox-validator-rules@^2.3.0":
version "2.2.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.2.0.tgz#830a2bc22a09dc17ff37835991858902d04cfe19" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.3.0.tgz#047d8a8106ba777f1df308c19f1c1c41ffea4054"
integrity sha512-R5VkDmhmNatq9SuuHaeA2Uno4O5K4YSh11o6A/5jJZ2EjilAcpuAKvZlRp9tjucPWHi+/z/n5PCJ8YUxzCzWaQ== integrity sha512-S10YIyOKettoRDWoyRymRyjzWZD4/qW7YfHNhHAS13QVneabRcU5MF7vEwkG6dHWx/UdufT5GbqYnvpQRMNt3Q==
dependencies: dependencies:
cross-fetch "3.0.4" cross-fetch "3.0.4"
...@@ -15997,15 +15997,6 @@ terser@4.4.2: ...@@ -15997,15 +15997,6 @@ terser@4.4.2:
source-map "~0.6.1" source-map "~0.6.1"
source-map-support "~0.5.12" source-map-support "~0.5.12"
terser@4.6.8:
version "4.6.8"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.8.tgz#62ccb14a52f102418ad6061dfef45076f13e5fa2"
integrity sha512-drV7ga6ZlIpBtitvb87Uk7P7gAJkCt3j/TqZr9wwF4Dlt0MBn52ANIAyuvP1F605WdPY4w6vT63u6KTWqaXFRQ==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
source-map-support "~0.5.12"
terser@^3.8.2: terser@^3.8.2:
version "3.17.0" version "3.17.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2" resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment