Import from non-compat modules in fluent-react examples

stasm · stasm · commit 0cb08d783ccf · 2017-11-21T11:20:06.000+01:00
diff --git a/fluent-react/examples/async-messages/src/App.js b/fluent-react/examples/async-messages/src/App.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 export default function App() {
   return (
diff --git a/fluent-react/examples/async-messages/src/l10n.js b/fluent-react/examples/async-messages/src/l10n.js
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import delay from 'delay';
 
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
-import { LocalizationProvider } from 'fluent-react/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
+import { LocalizationProvider } from 'fluent-react';
+import { negotiateLanguages } from 'fluent-langneg';
 
 async function fetchMessages(locale) {
   const { PUBLIC_URL } = process.env;
diff --git a/fluent-react/examples/change-language/src/App.js b/fluent-react/examples/change-language/src/App.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 export default function App(props) {
   const { currentLocales, handleLocaleChange } = props;
diff --git a/fluent-react/examples/change-language/src/l10n.js b/fluent-react/examples/change-language/src/l10n.js
@@ -1,9 +1,9 @@
 import React, { cloneElement, Children, Component } from 'react';
 
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
-import { LocalizationProvider } from 'fluent-react/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
+import { LocalizationProvider } from 'fluent-react';
+import { negotiateLanguages } from 'fluent-langneg';
 
 const MESSAGES_ALL = {
   'pl': `
diff --git a/fluent-react/examples/fallback-sync/src/App.js b/fluent-react/examples/fallback-sync/src/App.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 export default function App() {
   return (
diff --git a/fluent-react/examples/fallback-sync/src/index.js b/fluent-react/examples/fallback-sync/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { LocalizationProvider } from 'fluent-react/compat';
+import { LocalizationProvider } from 'fluent-react';
 
 import { generateMessages } from './l10n';
 import App from './App';
diff --git a/fluent-react/examples/fallback-sync/src/l10n.js b/fluent-react/examples/fallback-sync/src/l10n.js
@@ -1,5 +1,5 @@
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
 
 const MESSAGES_ALL = {
   'pl': `
@@ -18,4 +18,3 @@ export function* generateMessages() {
     yield cx;
   }
 }
-
diff --git a/fluent-react/examples/hello-world/src/App.js b/fluent-react/examples/hello-world/src/App.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 export default function App() {
   return (
diff --git a/fluent-react/examples/hello-world/src/index.js b/fluent-react/examples/hello-world/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { LocalizationProvider } from 'fluent-react/compat';
+import { LocalizationProvider } from 'fluent-react';
 
 import { generateMessages } from './l10n';
 import App from './App';
diff --git a/fluent-react/examples/hello-world/src/l10n.js b/fluent-react/examples/hello-world/src/l10n.js
@@ -1,6 +1,6 @@
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
+import { negotiateLanguages } from 'fluent-langneg';
 
 const MESSAGES_ALL = {
   'pl': `
@@ -25,4 +25,3 @@ export function* generateMessages(userLocales) {
     yield cx;
   }
 }
-
diff --git a/fluent-react/examples/higher-order/src/App.js b/fluent-react/examples/higher-order/src/App.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Localized, withLocalization } from 'fluent-react/compat';
+import { Localized, withLocalization } from 'fluent-react';
 
 function App(props) {
   function showAlert() {
diff --git a/fluent-react/examples/higher-order/src/index.js b/fluent-react/examples/higher-order/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { LocalizationProvider } from 'fluent-react/compat';
+import { LocalizationProvider } from 'fluent-react';
 
 import { generateMessages } from './l10n';
 import App from './App';
diff --git a/fluent-react/examples/higher-order/src/l10n.js b/fluent-react/examples/higher-order/src/l10n.js
@@ -1,6 +1,6 @@
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
+import { negotiateLanguages } from 'fluent-langneg';
 
 const MESSAGES_ALL = {
   'pl': `
@@ -27,4 +27,3 @@ export function* generateMessages(userLocales) {
     yield cx;
   }
 }
-
diff --git a/fluent-react/examples/redux-async/src/App.js b/fluent-react/examples/redux-async/src/App.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect} from 'react-redux';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 import { changeLocales } from './actions';
 
diff --git a/fluent-react/examples/redux-async/src/actions.js b/fluent-react/examples/redux-async/src/actions.js
@@ -1,5 +1,5 @@
-import { MessageContext } from 'fluent/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import { MessageContext } from 'fluent';
+import { negotiateLanguages } from 'fluent-langneg';
 import delay from 'delay';
 
 async function fetchMessages(locale) {
diff --git a/fluent-react/examples/redux-async/src/l10n.js b/fluent-react/examples/redux-async/src/l10n.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import 'fluent-intl-polyfill/compat';
-import { LocalizationProvider } from 'fluent-react/compat';
+import 'fluent-intl-polyfill';
+import { LocalizationProvider } from 'fluent-react';
 
 import { changeLocales } from './actions';
 
diff --git a/fluent-react/examples/redux-sync/src/App.js b/fluent-react/examples/redux-sync/src/App.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect} from 'react-redux';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 import { changeLocales } from './actions';
 
diff --git a/fluent-react/examples/redux-sync/src/actions.js b/fluent-react/examples/redux-sync/src/actions.js
@@ -1,5 +1,5 @@
-import { MessageContext } from 'fluent/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import { MessageContext } from 'fluent';
+import { negotiateLanguages } from 'fluent-langneg';
 
 const MESSAGES_ALL = {
   'pl': `
diff --git a/fluent-react/examples/redux-sync/src/l10n.js b/fluent-react/examples/redux-sync/src/l10n.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import 'fluent-intl-polyfill/compat';
-import { LocalizationProvider } from 'fluent-react/compat';
+import 'fluent-intl-polyfill';
+import { LocalizationProvider } from 'fluent-react';
 
 import { changeLocales } from './actions';
 
diff --git a/fluent-react/examples/text-input/src/App.js b/fluent-react/examples/text-input/src/App.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Localized } from 'fluent-react/compat';
+import { Localized } from 'fluent-react';
 
 function Header(props) {
   const { children } = props;
diff --git a/fluent-react/examples/text-input/src/index.js b/fluent-react/examples/text-input/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { LocalizationProvider } from 'fluent-react/compat';
+import { LocalizationProvider } from 'fluent-react';
 
 import { generateMessages } from './l10n';
 import App from './App';
diff --git a/fluent-react/examples/text-input/src/l10n.js b/fluent-react/examples/text-input/src/l10n.js
@@ -1,6 +1,6 @@
-import 'fluent-intl-polyfill/compat';
-import { MessageContext } from 'fluent/compat';
-import { negotiateLanguages } from 'fluent-langneg/compat';
+import 'fluent-intl-polyfill';
+import { MessageContext } from 'fluent';
+import { negotiateLanguages } from 'fluent-langneg';
 
 const MESSAGES_ALL = {
   'pl': `

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import 'fluent-intl-polyfill/compat';`
`2`		`-import { MessageContext } from 'fluent/compat';`
	`1`	`+import 'fluent-intl-polyfill';`
	`2`	`+import { MessageContext } from 'fluent';`
`3`	`3`
`4`	`4`	`const MESSAGES_ALL = {`
`5`	`5`	'pl': `
`@@ -18,4 +18,3 @@ export function* generateMessages() {`
`18`	`18`	`yield cx;`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-import 'fluent-intl-polyfill/compat';`
`2`		`-import { MessageContext } from 'fluent/compat';`
`3`		`-import { negotiateLanguages } from 'fluent-langneg/compat';`
	`1`	`+import 'fluent-intl-polyfill';`
	`2`	`+import { MessageContext } from 'fluent';`
	`3`	`+import { negotiateLanguages } from 'fluent-langneg';`
`4`	`4`
`5`	`5`	`const MESSAGES_ALL = {`
`6`	`6`	'pl': `
`@@ -25,4 +25,3 @@ export function* generateMessages(userLocales) {`
`25`	`25`	`yield cx;`
`26`	`26`	`}`
`27`	`27`	`}`
`28`		`-`