-
Notifications
You must be signed in to change notification settings - Fork 27.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/canary' into canary
- Loading branch information
Showing
22 changed files
with
129 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,5 @@ | ||
| const compose = (plugins) => ({ | ||
| webpack(config, options) { | ||
| return plugins.reduce((config, plugin) => { | ||
| if (plugin instanceof Array) { | ||
| const [_plugin, ...args] = plugin | ||
| plugin = _plugin(...args) | ||
| } | ||
| if (plugin instanceof Function) { | ||
| plugin = plugin() | ||
| } | ||
| if (plugin && plugin.webpack instanceof Function) { | ||
| return plugin.webpack(config, options) | ||
| } | ||
| return config | ||
| }, config) | ||
| }, | ||
|
|
||
| webpackDevMiddleware(config) { | ||
| return plugins.reduce((config, plugin) => { | ||
| if (plugin instanceof Array) { | ||
| const [_plugin, ...args] = plugin | ||
| plugin = _plugin(...args) | ||
| } | ||
| if (plugin instanceof Function) { | ||
| plugin = plugin() | ||
| } | ||
| if (plugin && plugin.webpackDevMiddleware instanceof Function) { | ||
| return plugin.webpackDevMiddleware(config) | ||
| } | ||
| return config | ||
| }, config) | ||
| }, | ||
| const withBundleAnalyzer = require('@next/bundle-analyzer')({ | ||
| enabled: process.env.ANALYZE === 'true', | ||
| }) | ||
|
|
||
| const withBundleAnalyzer = require('@next/bundle-analyzer') | ||
|
|
||
| module.exports = compose([ | ||
| [ | ||
| withBundleAnalyzer, | ||
| { | ||
| enabled: process.env.ANALYZE === 'true', | ||
| }, | ||
| ], | ||
| ]) | ||
| module.exports = withBundleAnalyzer() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,5 +17,5 @@ | |
| "registry": "https://registry.npmjs.org/" | ||
| } | ||
| }, | ||
| "version": "9.4.5-canary.43" | ||
| "version": "9.5.0" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "create-next-app", | ||
| "version": "9.4.5-canary.43", | ||
| "version": "9.5.0", | ||
| "keywords": [ | ||
| "react", | ||
| "next", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
test/integration/css-fixtures/next-issue-15468/pages/_app.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import App from 'next/app' | ||
| import React from 'react' | ||
| import '../styles/global.css' | ||
|
|
||
| class MyApp extends App { | ||
| render() { | ||
| const { Component, pageProps } = this.props | ||
| return <Component {...pageProps} /> | ||
| } | ||
| } | ||
|
|
||
| export default MyApp |
8 changes: 8 additions & 0 deletions
8
test/integration/css-fixtures/next-issue-15468/pages/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| export default function Home() { | ||
| return ( | ||
| <main> | ||
| <div className="test1">Hello</div> | ||
| <div className="test2">Hello</div> | ||
| </main> | ||
| ) | ||
| } |
16 changes: 16 additions & 0 deletions
16
test/integration/css-fixtures/next-issue-15468/styles/global.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| :root { | ||
| --blk: #000000; | ||
| --five: 5px; | ||
| } | ||
|
|
||
| .test1 { | ||
| border: 1px solid var(--blk); | ||
| border-radius: var(--five); | ||
| border-width: 0; | ||
| } | ||
|
|
||
| .test2 { | ||
| border: 0px solid var(--blk); | ||
| border-radius: var(--five); | ||
| border-width: 5px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.