feat(wordpress): add defaultLanguage option

gregberge · gregberge · commit 5451cd399825 · 2019-03-04T11:35:28.000+01:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,16 +1,7 @@
 {
   "root": true,
-  "parser": "babel-eslint",
-  "extends": ["airbnb", "prettier"],
-  "env": {
-    "jest": true,
-    "browser": false
-  },
+  "extends": ["smooth", "smooth/project", "smooth/react"],
   "rules": {
-    "no-restricted-syntax": "off",
-    "no-nested-ternary": "off",
-    "no-plusplus": "off",
-    "no-param-reassign": "off",
     "no-underscore-dangle": [
       "error",
       {
@@ -23,20 +14,11 @@
         ]
       }
     ],
-    "react/jsx-filename-extension": ["error", { "extensions": [".js"] }],
-    "react/jsx-wrap-multilines": "off",
-    "react/no-unused-state": "off",
-    "react/destructuring-assignment": "off",
-    "react/prop-types": "off",
-    "react/no-array-index-key": "off",
-    "react/no-danger": "off",
-    "import/prefer-default-export": "off",
     "import/no-unresolved": [
       "error",
       {
         "ignore": ["__smooth"]
       }
-    ],
-    "jsx-a11y/html-has-lang": "off"
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -15,9 +15,9 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.3.3",
-    "@babel/plugin-proposal-class-properties": "^7.3.3",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/core": "^7.3.4",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-react": "^7.0.0",
     "@loadable/babel-plugin": "^5.6.0",
     "babel-core": "^7.0.0-bridge.0",
@@ -26,14 +26,16 @@
     "conventional-github-releaser": "^3.1.2",
     "cross-env": "^5.2.0",
     "doctoc": "^1.4.0",
-    "eslint": "^5.14.1",
+    "eslint": "^5.15.0",
     "eslint-config-airbnb": "^17.1.0",
-    "eslint-config-prettier": "^4.0.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-config-smooth": "^2.0.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-react-hooks": "^1.4.0",
     "jest": "^24.1.0",
-    "lerna": "^3.13.0",
+    "lerna": "^3.13.1",
     "prettier": "^1.16.4",
     "react": "^16.8.3",
     "react-dom": "^16.8.3",
diff --git a/packages/smooth-backend-wordpress/src/acf/api.js b/packages/smooth-backend-wordpress/src/acf/api.js
@@ -13,11 +13,11 @@ function paramsSerializer(params) {
   return qs.stringify(params, { arrayFormat: 'indices' })
 }
 
-export function createClient(baseUrl) {
+export function createClient({ baseUrl, defaultLanguage }) {
   return {
     async getContents({ type, slug, lang, query }) {
       type = type.toLowerCase()
-      const params = getParams({ lang, type, query })
+      const params = getParams({ lang: lang || defaultLanguage, type, query })
 
       if (slug) {
         params.slug = slug
@@ -40,7 +40,7 @@ export function createClient(baseUrl) {
       return results[0] || null
     },
     async getContentPreview({ lang, id }) {
-      const params = getParams({ lang })
+      const params = getParams({ lang: lang || defaultLanguage })
       const { data } = await axios.get(
         `${baseUrl}/wp-json/presspack/v1/preview/${id}/`,
         { params },
diff --git a/packages/smooth-backend-wordpress/src/acf/index.js b/packages/smooth-backend-wordpress/src/acf/index.js
@@ -27,11 +27,11 @@ export async function onBuild({ schemaDefinition, options, types: gqlTypes }) {
 }
 
 export async function getContent({ request, options }) {
-  const apiClient = createClient(options.baseUrl)
+  const apiClient = createClient(options)
   return apiClient.getContent(request)
 }
 
 export async function getContents({ request, options }) {
-  const apiClient = createClient(options.baseUrl)
+  const apiClient = createClient(options)
   return apiClient.getContents(request)
 }
diff --git a/packages/smooth-backend-wordpress/src/acf/resolvers/index.js b/packages/smooth-backend-wordpress/src/acf/resolvers/index.js
@@ -24,7 +24,7 @@ export function createResolvers({
   schemaDefinition,
   config,
 }) {
-  const apiClient = createClient(options.baseUrl)
+  const apiClient = createClient(options)
   const { typeDefs } = schemaDefinition
   const blockDefinitions = typeDefs.definitions.filter(
     typeDefinition =>
diff --git a/packages/smooth-dev-cli/package.json b/packages/smooth-dev-cli/package.json
@@ -32,7 +32,7 @@
     "react-dom": ">=16.3.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.3.1",
+    "@babel/runtime": "^7.3.4",
     "chokidar": "^2.1.2",
     "configstore": "^4.0.0",
     "fs-extra": "^7.0.1",
diff --git a/packages/smooth/package.json b/packages/smooth/package.json
@@ -33,28 +33,28 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@babel/core": "^7.3.3",
-    "@babel/plugin-proposal-class-properties": "^7.3.3",
-    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/core": "^7.3.4",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.3.4",
     "@babel/polyfill": "^7.2.5",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "@babel/runtime": "^7.3.1",
+    "@babel/runtime": "^7.3.4",
     "@emotion/core": "^10.0.7",
     "@loadable/babel-plugin": "^5.6.0",
     "@loadable/component": "^5.6.1",
     "@loadable/server": "^5.6.1",
     "@loadable/webpack-plugin": "^5.5.0",
-    "apollo-cache-inmemory": "^1.4.3",
-    "apollo-client": "^2.4.13",
+    "apollo-cache-inmemory": "^1.5.1",
+    "apollo-client": "^2.5.1",
     "apollo-link": "^1.2.8",
     "apollo-link-http": "^1.5.11",
     "apollo-link-schema": "^1.1.6",
-    "apollo-server-express": "^2.4.6",
+    "apollo-server-express": "^2.4.8",
     "axios": "^0.18.0",
     "babel-loader": "^8.0.5",
-    "camelcase": "^5.0.0",
+    "camelcase": "^5.1.0",
     "commander": "^2.19.0",
     "cors": "^2.8.5",
     "cwd": "^0.10.0",
@@ -70,13 +70,13 @@
     "merge-deep": "^3.0.2",
     "pluralize": "^7.0.0",
     "progress-estimator": "^0.2.2",
-    "query-string": "^6.2.0",
-    "react-apollo": "^2.4.1",
+    "query-string": "^6.3.0",
+    "react-apollo": "^2.5.1",
     "react-helmet": "^5.2.0",
     "react-router-dom": "^4.3.1",
     "slugify": "^1.3.4",
     "tiny-glob": "^0.2.6",
-    "webpack": "^4.29.5",
+    "webpack": "^4.29.6",
     "webpack-dev-middleware": "^3.6.0",
     "webpack-hot-middleware": "^2.24.3",
     "webpack-node-externals": "^1.7.2"
diff --git a/packages/smooth/src/client/.eslintrc.json b/packages/smooth/src/client/.eslintrc.json
@@ -1,5 +1,3 @@
 {
-  "env": {
-    "browser": true
-  }
+  "extends": ["smooth/browser"]
 }
diff --git a/packages/smooth/src/config/webpack.js b/packages/smooth/src/config/webpack.js
@@ -79,7 +79,13 @@ function getTargetConfig(target, { config, dev }) {
       },
       externals:
         target === 'node'
-          ? [nodeExternals({ whitelist: [/^smooth\//] })]
+          ? [
+              nodeExternals({ whitelist: [/^smooth\//] }),
+              'graphql/type',
+              'graphql/language',
+              'graphql/execution',
+              'graphql/validation',
+            ]
           : undefined,
       output: {
         path: path.join(config.cachePath, target, 'static'),
diff --git a/packages/smooth/src/content/Query.js b/packages/smooth/src/content/Query.js
@@ -72,7 +72,7 @@ function Handler({ children, ...props }) {
     if (hiddenRouter && !props.loading) {
       hiddenRouter.onPrefetched()
     }
-  }, [props.loading])
+  }, [props.loading]) // eslint-disable-line react-hooks/exhaustive-deps
 
   if (!props.loading && !props.error && !props.data.contentProps) {
     return children({
diff --git a/packages/smooth/src/document/GlobalScript.js b/packages/smooth/src/document/GlobalScript.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/no-danger */
 import React from 'react'
 
 export default function GlobalScript({ varName, json }) {
diff --git a/packages/smooth/src/document/Html.js b/packages/smooth/src/document/Html.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsx-a11y/html-has-lang */
 import React from 'react'
 import Context from './Context'
 
diff --git a/packages/smooth/src/document/Main.js b/packages/smooth/src/document/Main.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/no-danger */
 import React from 'react'
 import Context from './Context'
 
diff --git a/packages/smooth/src/graphql/fragmentTypes/index.js b/packages/smooth/src/graphql/fragmentTypes/index.js
@@ -1,4 +1,4 @@
-import { execute } from 'graphql'
+import { execute } from 'graphql/execution'
 import gql from 'graphql-tag'
 
 const QUERY = gql`
diff --git a/packages/smooth/src/graphql/schema/hooks.js b/packages/smooth/src/graphql/schema/hooks.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import * as types from '../types'
 
 export async function applyAsyncHook(plugins, hook, value) {
diff --git a/packages/smooth/src/graphql/schema/index.js b/packages/smooth/src/graphql/schema/index.js
@@ -4,7 +4,7 @@ import { promisify } from 'util'
 import path from 'path'
 import glob from 'tiny-glob'
 import { concatenateTypeDefs, makeExecutableSchema } from 'graphql-tools'
-import { parse } from 'graphql'
+import { parse } from 'graphql/language'
 import { definitions as baseDefinitions } from '../definitions'
 import { addBlockTypeDefinitions } from './blockType'
 import { addContentTypeDefinitions } from './contentType'
diff --git a/packages/smooth/src/graphql/schema/index.test.js b/packages/smooth/src/graphql/schema/index.test.js
@@ -1,5 +1,5 @@
 import path from 'path'
-import { GraphQLSchema } from 'graphql'
+import { GraphQLSchema } from 'graphql/type'
 import { getDefinitionModules, createSchema, createSchemaDefinition } from '.'
 
 const SCHEMAS_FIXTURES_DIR = path.join(__dirname, '../../__fixtures__/schemas')
diff --git a/packages/smooth/src/plugin/browser.js b/packages/smooth/src/plugin/browser.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import plugins from '__smooth_plugins'
 
 export function runHook(plugin, hook, args) {
diff --git a/packages/smooth/src/plugin/node.js b/packages/smooth/src/plugin/node.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import { types } from '../graphql'
 import * as validators from './validators'
 
diff --git a/packages/smooth/src/server/links/validate.js b/packages/smooth/src/server/links/validate.js
@@ -1,5 +1,5 @@
 import { ApolloLink, Observable } from 'apollo-link'
-import { validate } from 'graphql'
+import { validate } from 'graphql/validation'
 
 export class ValidateLink extends ApolloLink {
   constructor({ schema }) {
diff --git a/packages/smooth/src/utils/shallowEqual.js b/packages/smooth/src/utils/shallowEqual.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-syntax */
+
 export function shallowEqual(actual, expected) {
   const keys = Object.keys(expected)
 
diff --git a/packages/smooth/src/webpack/loaders/smooth-babel-loader.js b/packages/smooth/src/webpack/loaders/smooth-babel-loader.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import babelLoader from 'babel-loader'
 import preset from '../../babel/preset'
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"root": true,`
`3`		`- "parser": "babel-eslint",`
`4`		`- "extends": ["airbnb", "prettier"],`
`5`		`- "env": {`
`6`		`- "jest": true,`
`7`		`- "browser": false`
`8`		`- },`
	`3`	`+ "extends": ["smooth", "smooth/project", "smooth/react"],`
`9`	`4`	`"rules": {`
`10`		`- "no-restricted-syntax": "off",`
`11`		`- "no-nested-ternary": "off",`
`12`		`- "no-plusplus": "off",`
`13`		`- "no-param-reassign": "off",`
`14`	`5`	`"no-underscore-dangle": [`
`15`	`6`	`"error",`
`16`	`7`	`{`
`@@ -23,20 +14,11 @@`
`23`	`14`	`]`
`24`	`15`	`}`
`25`	`16`	`],`
`26`		`- "react/jsx-filename-extension": ["error", { "extensions": [".js"] }],`
`27`		`- "react/jsx-wrap-multilines": "off",`
`28`		`- "react/no-unused-state": "off",`
`29`		`- "react/destructuring-assignment": "off",`
`30`		`- "react/prop-types": "off",`
`31`		`- "react/no-array-index-key": "off",`
`32`		`- "react/no-danger": "off",`
`33`		`- "import/prefer-default-export": "off",`
`34`	`17`	`"import/no-unresolved": [`
`35`	`18`	`"error",`
`36`	`19`	`{`
`37`	`20`	`"ignore": ["__smooth"]`
`38`	`21`	`}`
`39`		`- ],`
`40`		`- "jsx-a11y/html-has-lang": "off"`
	`22`	`+ ]`
`41`	`23`	`}`
`42`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ export async function onBuild({ schemaDefinition, options, types: gqlTypes }) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`export async function getContent({ request, options }) {`
`30`		`- const apiClient = createClient(options.baseUrl)`
	`30`	`+ const apiClient = createClient(options)`
`31`	`31`	`return apiClient.getContent(request)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`export async function getContents({ request, options }) {`
`35`		`- const apiClient = createClient(options.baseUrl)`
	`35`	`+ const apiClient = createClient(options)`
`36`	`36`	`return apiClient.getContents(request)`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`	`1`	`{`
`2`		`- "env": {`
`3`		`- "browser": true`
`4`		`- }`
	`2`	`+ "extends": ["smooth/browser"]`
`5`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function Handler({ children, ...props }) {`
`72`	`72`	`if (hiddenRouter && !props.loading) {`
`73`	`73`	`hiddenRouter.onPrefetched()`
`74`	`74`	`}`
`75`		`- }, [props.loading])`
	`75`	`+ }, [props.loading]) // eslint-disable-line react-hooks/exhaustive-deps`
`76`	`76`
`77`	`77`	`if (!props.loading && !props.error && !props.data.contentProps) {`
`78`	`78`	`return children({`