Merge branch 'canary' into configure-webpack-environment

examples/blog-starter-typescript/components/date-formater.tsx → examples/blog-starter-typescript/components/date-formatter.tsx

@@ -4,9 +4,9 @@ type Props = {
   dateString: string
 }
 
-const DateFormater = ({ dateString }: Props) => {
+const DateFormatter = ({ dateString }: Props) => {
   const date = parseISO(dateString)
   return <time dateTime={dateString}>{format(date, 'LLLL	d, yyyy')}</time>
 }
 
-export default DateFormater
+export default DateFormatter

examples/blog-starter-typescript/components/hero-post.tsx

@@ -1,5 +1,5 @@
 import Avatar from './avatar'
-import DateFormater from './date-formater'
+import DateFormatter from './date-formatter'
 import CoverImage from './cover-image'
 import Link from 'next/link'
 import Author from '../types/author'
@@ -34,7 +34,7 @@ const HeroPost = ({
             </Link>
           </h3>
           <div className="mb-4 md:mb-0 text-lg">
-            <DateFormater dateString={date} />
+            <DateFormatter dateString={date} />
           </div>
         </div>
         <div>

examples/blog-starter-typescript/components/post-header.tsx

@@ -1,5 +1,5 @@
 import Avatar from './avatar'
-import DateFormater from './date-formater'
+import DateFormatter from './date-formatter'
 import CoverImage from './cover-image'
 import PostTitle from './post-title'
 import Author from '../types/author'
@@ -26,7 +26,7 @@ const PostHeader = ({ title, coverImage, date, author }: Props) => {
           <Avatar name={author.name} picture={author.picture} />
         </div>
         <div className="mb-6 text-lg">
-          <DateFormater dateString={date} />
+          <DateFormatter dateString={date} />
         </div>
       </div>
     </>

examples/blog-starter-typescript/components/post-preview.tsx

@@ -1,5 +1,5 @@
 import Avatar from './avatar'
-import DateFormater from './date-formater'
+import DateFormatter from './date-formatter'
 import CoverImage from './cover-image'
 import Link from 'next/link'
 import Author from '../types/author'
@@ -32,7 +32,7 @@ const PostPreview = ({
         </Link>
       </h3>
       <div className="text-lg mb-4">
-        <DateFormater dateString={date} />
+        <DateFormatter dateString={date} />
       </div>
       <p className="text-lg leading-relaxed mb-4">{excerpt}</p>
       <Avatar name={author.name} picture={author.picture} />

examples/blog-starter/components/date-formater.js → examples/blog-starter/components/date-formatter.js

@@ -1,6 +1,6 @@
 import { parseISO, format } from 'date-fns'
 
-export default function DateFormater({ dateString }) {
+export default function DateFormatter({ dateString }) {
   const date = parseISO(dateString)
   return <time dateTime={dateString}>{format(date, 'LLLL	d, yyyy')}</time>
 }

examples/blog-starter/components/hero-post.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from '../components/cover-image'
 import Link from 'next/link'
 
@@ -24,7 +24,7 @@ export default function HeroPost({
             </Link>
           </h3>
           <div className="mb-4 md:mb-0 text-lg">
-            <DateFormater dateString={date} />
+            <DateFormatter dateString={date} />
           </div>
         </div>
         <div>

examples/blog-starter/components/post-header.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from '../components/cover-image'
 import PostTitle from '../components/post-title'
 
@@ -18,7 +18,7 @@ export default function PostHeader({ title, coverImage, date, author }) {
           <Avatar name={author.name} picture={author.picture} />
         </div>
         <div className="mb-6 text-lg">
-          <DateFormater dateString={date} />
+          <DateFormatter dateString={date} />
         </div>
       </div>
     </>

examples/blog-starter/components/post-preview.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from './cover-image'
 import Link from 'next/link'
 
@@ -22,7 +22,7 @@ export default function PostPreview({
         </Link>
       </h3>
       <div className="text-lg mb-4">
-        <DateFormater dateString={date} />
+        <DateFormatter dateString={date} />
       </div>
       <p className="text-lg leading-relaxed mb-4">{excerpt}</p>
       <Avatar name={author.name} picture={author.picture} />

examples/cms-kontent/components/date-formater.js

@@ -1,6 +1,6 @@
 import { parseISO, format } from 'date-fns'
 
-export default function DateFormater({ dateString }) {
+export default function DateFormatter({ dateString }) {
   const date = parseISO(dateString)
   return <time dateTime={dateString}>{format(date, 'LLLL	d, yyyy')}</time>
 }

examples/cms-kontent/components/hero-post.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from '../components/cover-image'
 import Link from 'next/link'
 
@@ -24,7 +24,7 @@ export default function HeroPost({
             </Link>
           </h3>
           <div className="mb-4 md:mb-0 text-lg">
-            <DateFormater dateString={date} />
+            <DateFormatter dateString={date} />
           </div>
         </div>
         <div>

examples/cms-kontent/components/post-header.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from '../components/cover-image'
 import PostTitle from '../components/post-title'
 
@@ -18,7 +18,7 @@ export default function PostHeader({ title, coverImage, date, author }) {
           <Avatar name={author.name} picture={author.picture} />
         </div>
         <div className="mb-6 text-lg">
-          <DateFormater dateString={date} />
+          <DateFormatter dateString={date} />
         </div>
       </div>
     </>

examples/cms-kontent/components/post-preview.js

@@ -1,5 +1,5 @@
 import Avatar from '../components/avatar'
-import DateFormater from '../components/date-formater'
+import DateFormatter from '../components/date-formatter'
 import CoverImage from './cover-image'
 import Link from 'next/link'
 
@@ -22,7 +22,7 @@ export default function PostPreview({
         </Link>
       </h3>
       <div className="text-lg mb-4">
-        <DateFormater dateString={date} />
+        <DateFormatter dateString={date} />
       </div>
       <p className="text-lg leading-relaxed mb-4">{excerpt}</p>
       <Avatar name={author.name} picture={author.picture} />

examples/svg-components/.babelrc

@@ -1,4 +1,4 @@
 {
-  "presets": [ "next/babel" ],
-  "plugins": [ "inline-react-svg" ]
+  "presets": ["next/babel"],
+  "plugins": ["inline-react-svg"]
 }

examples/with-ant-design-less/.babelrc

@@ -2,7 +2,8 @@
   "presets": ["next/babel"],
   "plugins": [
     [
-      "import", {
+      "import",
+      {
         "libraryName": "antd",
         "style": true
       }

examples/with-ant-design-mobile/.babelrc

@@ -1,9 +1,12 @@
 {
-  "presets":  ["next/babel"],
+  "presets": ["next/babel"],
   "plugins": [
-    ["import", {
-      "libraryName": "antd-mobile",
-      "style": "css"
-    }]
+    [
+      "import",
+      {
+        "libraryName": "antd-mobile",
+        "style": "css"
+      }
+    ]
   ]
 }

examples/with-ant-design-pro-layout-less/.babelrc

@@ -1,7 +1,5 @@
 {
-  "presets": [
-    "next/babel"
-  ],
+  "presets": ["next/babel"],
   "plugins": [
     [
       "import",
@@ -11,4 +9,4 @@
       }
     ]
   ]
-}
+}

examples/with-cssed/.babelrc

@@ -1,8 +1,4 @@
 {
-  "presets": [
-    "next/babel"
-  ],
-  "plugins": [
-    "babel-plugin-macros"
-  ]
+  "presets": ["next/babel"],
+  "plugins": ["babel-plugin-macros"]
 }

examples/with-custom-babel-config/.babelrc

@@ -1,8 +1,4 @@
 {
-  "presets": [
-    "next/babel"
-  ],
-  "plugins": [
-    "@babel/plugin-proposal-do-expressions"
-  ]
+  "presets": ["next/babel"],
+  "plugins": ["@babel/plugin-proposal-do-expressions"]
 }

examples/with-custom-reverse-proxy/.babelrc

@@ -1,5 +1,3 @@
 {
-  "presets": [
-    "next/babel"
-  ]
+  "presets": ["next/babel"]
 }

examples/with-filbert/.babelrc

@@ -1,4 +1,4 @@
 {
-    "presets": ["next/babel"],
-    "plugins": ["macros"]
-  }
+  "presets": ["next/babel"],
+  "plugins": ["macros"]
+}

examples/with-flow/.babelrc

@@ -1,8 +1,4 @@
 {
-    "presets": [
-        "next/babel"
-    ],
-    "plugins": [
-        "transform-flow-strip-types"
-    ]
-}
+  "presets": ["next/babel"],
+  "plugins": ["transform-flow-strip-types"]
+}

examples/with-flow/flow-typed/next.js.flow

@@ -1,32 +1,40 @@
 // @flow
 
-declare module "next" {
+declare module 'next' {
   declare type NextApp = {
-    prepare(): Promise<void>;
-    getRequestHandler(): any;
-    render(req: any, res: any, pathname: string, query: any): any;
-  };
+    prepare(): Promise<void>,
+    getRequestHandler(): any,
+    render(req: any, res: any, pathname: string, query: any): any,
+  }
   declare module.exports: (...opts: any) => NextApp
 }
 
-declare module "next/head" {
-  declare module.exports: Class<React$Component<any, any>>;
+declare module 'next/head' {
+  declare module.exports: Class<React$Component<any, any>>
 }
 
-declare module "next/link" {
-  declare module.exports: Class<React$Component<{href: string, prefetch?: bool}, any>>;
+declare module 'next/link' {
+  declare module.exports: Class<
+    React$Component<{ href: string, prefetch?: boolean }, any>
+  >
 }
 
-declare module "next/error" {
-  declare module.exports: Class<React$Component<{statusCode: number}, any>>;
+declare module 'next/error' {
+  declare module.exports: Class<React$Component<{ statusCode: number }, any>>
 }
 
-declare module "next/document" {
-  declare export var Head: Class<React$Component<any, any>>;
-  declare export var Main: Class<React$Component<any, any>>;
-  declare export var NextScript: Class<React$Component<any, any>>;
+declare module 'next/document' {
+  declare export var Head: Class<React$Component<any, any>>
+  declare export var Main: Class<React$Component<any, any>>
+  declare export var NextScript: Class<React$Component<any, any>>
   declare export default Class<React$Component<any, any>> & {
-    getInitialProps: (ctx: {pathname: string, query: any, req?: any, res?: any, err?: any}) => Promise<any>;
-    renderPage(cb: Function): void;
-  };
+    getInitialProps: (ctx: {
+      pathname: string,
+      query: any,
+      req?: any,
+      res?: any,
+      err?: any,
+    }) => Promise<any>,
+    renderPage(cb: Function): void,
+  }
 }

examples/with-glamor/.babelrc

@@ -1,9 +1,4 @@
 {
   "presets": ["next/babel"],
-  "plugins": [
-    [
-      "transform-react-jsx",
-      { "pragma": "Glamor.createElement" }
-    ]
-  ]
+  "plugins": [["transform-react-jsx", { "pragma": "Glamor.createElement" }]]
 }

examples/with-linaria/.babelrc

@@ -1,6 +1,3 @@
 {
-  "presets": [
-    "next/babel",
-    "linaria/babel"
-  ]
+  "presets": ["next/babel", "linaria/babel"]
 }

examples/with-lingui/.babelrc

@@ -1,8 +1,4 @@
 {
-  "presets": [
-    "next/babel"
-  ],
-  "plugins": [
-    "macros"
-  ]
-}
+  "presets": ["next/babel"],
+  "plugins": ["macros"]
+}

examples/with-mobx-react-lite/.babelrc

@@ -1,5 +1,3 @@
 {
-  "presets": [
-    "next/babel"
-  ]
+  "presets": ["next/babel"]
 }

examples/with-mobx-state-tree/.babelrc

@@ -1,8 +1,4 @@
 {
-  "presets": [
-    "next/babel"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-decorators", { "legacy": true }]
-  ]
+  "presets": ["next/babel"],
+  "plugins": [["@babel/plugin-proposal-decorators", { "legacy": true }]]
 }

examples/with-mobx/.babelrc

@@ -1,7 +1,5 @@
 {
-  "presets": [
-    "next/babel"
-  ],
+  "presets": ["next/babel"],
   "plugins": [
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
     ["@babel/plugin-proposal-class-properties", { "loose": true }]

examples/with-mocha/.babelrc

@@ -10,4 +10,4 @@
       "presets": [["next/babel", { "preset-env": { "modules": "commonjs" } }]]
     }
   }
-}
+}