Merge branch 'canary' into amp-optimizer-2.6

vercel · Aug 10, 2020 · 90075d5 · 90075d5
2 parents 7e31100 + e08b633
commit 90075d5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/packages/next/compiled/postcss-preset-env/index.js b/packages/next/compiled/postcss-preset-env/index.js
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -89,7 +89,7 @@
  "chokidar": "2.1.8",
  "crypto-browserify": "3.12.0",
  "css-loader": "3.5.3",
- "cssnano-simple": "1.0.6",
+ "cssnano-simple": "1.0.7",
  "find-cache-dir": "3.3.1",
  "jest-worker": "24.9.0",
  "loader-utils": "2.0.0",

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -39,6 +39,7 @@ const externals = {
 
  // Browserslist (post-css plugins)
  browserslist: 'browserslist',
+ 'caniuse-lite': 'caniuse-lite',
 
  // Webpack indirect and direct dependencies:
  webpack: 'webpack',

diff --git a/test/integration/css-modules/test/index.test.js b/test/integration/css-modules/test/index.test.js
@@ -110,7 +110,7 @@ describe('3rd Party CSS Module Support', () => {
  const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')
 
  expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
- `".index_foo__29BAH{position:relative}.index_foo__29BAH .bar,.index_foo__29BAH .baz{height:100%;overflow:hidden}.index_foo__29BAH .lol,.index_foo__29BAH>.lel{width:80%}"`
+ `".index_foo__29BAH{position:relative}.index_foo__29BAH .bar,.index_foo__29BAH .baz{height:100%;overflow:hidden}.index_foo__29BAH .lol{width:80%}.index_foo__29BAH>.lel{width:80%}"`
  )
  })
 

diff --git a/test/integration/scss-modules/test/index.test.js b/test/integration/scss-modules/test/index.test.js
@@ -109,7 +109,7 @@ describe('3rd Party CSS Module Support', () => {
  const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')
 
  expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
- `".index_foo__9_fxH{position:relative}.index_foo__9_fxH .bar,.index_foo__9_fxH .baz{height:100%;overflow:hidden}.index_foo__9_fxH .lol,.index_foo__9_fxH>.lel{width:80%}"`
+ `".index_foo__9_fxH{position:relative}.index_foo__9_fxH .bar,.index_foo__9_fxH .baz{height:100%;overflow:hidden}.index_foo__9_fxH .lol{width:80%}.index_foo__9_fxH>.lel{width:80%}"`
  )
  })
 

diff --git a/yarn.lock b/yarn.lock
@@ -6488,11 +6488,12 @@ cssnano-preset-simple@1.1.4:
  dependencies:
  postcss "^7.0.32"
 
-cssnano-preset-simple@1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.1.5.tgz#3a26829988ca20f5ffdb6d41c1df5b791db8a192"
- integrity sha512-/zuE8EMVg7KFNR5Olj0ZnaMs3vtswcUcnr86zdVVCrhx3rY5DVDHWSiFE9/IGNl0SSVqi3AekPEnoNoLcQFHQw==
+cssnano-preset-simple@1.1.7:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.1.7.tgz#38378118f156b3f4bf85c38a0b2fd06a1bdc7228"
+ integrity sha512-GVOJVQ1l5KI5sRaM9HOXCwYn78dmsLYoyJTYJcORhl9Tz44xDlP8Al6EvBdFIOvH6+wZlHcsMftlh1pwswuLeA==
  dependencies:
+ caniuse-lite "^1.0.30001093"
  postcss "^7.0.32"
 
 cssnano-simple@1.0.5:
@@ -6503,12 +6504,12 @@ cssnano-simple@1.0.5:
  cssnano-preset-simple "1.1.4"
  postcss "^7.0.32"
 
-cssnano-simple@1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.0.6.tgz#e2e33c57b2b829a330467c7dbb15100bac37c8ea"
- integrity sha512-q34pHOD8TFmZ6Etua7zJiebAl+8dV3Jb5O2pOdmCNJ/Ia8By9NQXk8at5WVW8qCVBFLm9ge5oaFXgU3FBFVTYw==
+cssnano-simple@1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.0.7.tgz#a812571ee6ae25817434d4b926d5e83ea4b0e7dd"
+ integrity sha512-jjmSazE36Bl77zBcNQ9efcUdxQevKkrqkE5FqgHbcb3GQASnWrOU3PLF+DR3c7lDZxi1vtLvuJMtfL5QLkCGdw==
  dependencies:
- cssnano-preset-simple "1.1.5"
+ cssnano-preset-simple "1.1.7"
  postcss "^7.0.32"
 
 cssnano-util-get-arguments@^4.0.0: