Merge branch 'canary' into shu/084c

vercel · Dec 3, 2021 · b9f02ac · b9f02ac
2 parents f213e90 + b194664
commit b9f02ac
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 33 deletions.
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.5-canary.17"
+  "version": "12.0.5-canary.18"
 }
diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
     "test-unit": "yarn jest test/unit/",
     "testonly": "yarn jest --runInBand",
     "testheadless": "cross-env HEADLESS=true yarn testonly",
-    "testall": "yarn test -- --ci --forceExit && lerna run --scope @next/codemod test",
     "genstats": "cross-env LOCAL_STATS=true node .github/actions/next-stats-action/src/index.js",
     "git-reset": "git reset --hard HEAD",
     "git-clean": "git clean -d -x -e node_modules -e packages -f",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.5-canary.17",
+    "@next/eslint-plugin-next": "12.0.5-canary.18",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native"

diff --git a/packages/next/build/webpack/config/blocks/css/index.ts b/packages/next/build/webpack/config/blocks/css/index.ts
@@ -42,7 +42,6 @@ let postcssInstancePromise: Promise<any>
 export async function lazyPostCSS(
   rootDirectory: string,
   supportedBrowsers: string[] | undefined,
-  strictPostcssConfiguration: boolean | undefined,
   disablePostcssPresetEnv: boolean | undefined
 ) {
   if (!postcssInstancePromise) {
@@ -117,7 +116,6 @@ export async function lazyPostCSS(
       const postCssPlugins = await getPostCssPlugins(
         rootDirectory,
         supportedBrowsers,
-        strictPostcssConfiguration,
         disablePostcssPresetEnv
       )
 
@@ -145,7 +143,6 @@ export const css = curry(async function css(
     lazyPostCSS(
       ctx.rootDirectory,
       ctx.supportedBrowsers,
-      ctx.future.strictPostcssConfiguration,
       ctx.experimental.disablePostcssPresetEnv
     )
 

diff --git a/packages/next/build/webpack/config/blocks/css/plugins.ts b/packages/next/build/webpack/config/blocks/css/plugins.ts
@@ -117,12 +117,12 @@ function getDefaultPlugins(
 export async function getPostCssPlugins(
   dir: string,
   supportedBrowsers: string[] | undefined,
-  defaults: boolean = false,
   disablePostcssPresetEnv: boolean = false
 ): Promise<import('postcss').AcceptedPlugin[]> {
-  let config = defaults
-    ? null
-    : await findConfig<{ plugins: CssPluginCollection }>(dir, 'postcss')
+  let config = await findConfig<{ plugins: CssPluginCollection }>(
+    dir,
+    'postcss'
+  )
 
   if (config == null) {
     config = {

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,10 +70,10 @@
     "@babel/runtime": "7.15.4",
     "@hapi/accept": "5.0.2",
     "@napi-rs/triples": "1.0.3",
-    "@next/env": "12.0.5-canary.17",
-    "@next/polyfill-module": "12.0.5-canary.17",
-    "@next/react-dev-overlay": "12.0.5-canary.17",
-    "@next/react-refresh-utils": "12.0.5-canary.17",
+    "@next/env": "12.0.5-canary.18",
+    "@next/polyfill-module": "12.0.5-canary.18",
+    "@next/react-dev-overlay": "12.0.5-canary.18",
+    "@next/react-refresh-utils": "12.0.5-canary.18",
     "acorn": "8.5.0",
     "assert": "2.0.0",
     "browserify-zlib": "0.2.0",
@@ -156,7 +156,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.2.1",
-    "@next/polyfill-nomodule": "12.0.5-canary.17",
+    "@next/polyfill-nomodule": "12.0.5-canary.18",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
@@ -119,7 +119,6 @@ export type NextConfig = { [key: string]: any } & {
      * @deprecated this options was moved to the top level
      */
     webpack5?: false
-    strictPostcssConfiguration?: boolean
   }
   outputFileTracing?: boolean
   staticPageGenerationTimeout?: number
@@ -255,9 +254,6 @@ export const defaultConfig: NextConfig = {
     outputFileTracingRoot: process.env.NEXT_PRIVATE_OUTPUT_TRACE_ROOT || '',
     outputStandalone: !!process.env.NEXT_PRIVATE_STANDALONE,
   },
-  future: {
-    strictPostcssConfiguration: false,
-  },
 }
 
 export function normalizeConfig(phase: string, config: any) {

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.0.5-canary.17",
+  "version": "12.0.5-canary.18",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",