app: Bump to v2.0.0

Author: gaetansenn

README.md

@@ -1,4 +1,4 @@
-# Dynamic I18n
+# Dynamic I18n v2.0.0
 [![npm](https://img.shields.io/npm/dt/@nuxtjs/dynamic-i18n.svg?style=flat-square)](https://www.npmjs.com/package/@nuxtjs/dynamic-i18n)
 [![npm (scoped with tag)](https://img.shields.io/npm/v/@nuxtjs/dynamic-i18n/latest.svg?style=flat-square)](https://www.npmjs.com/package/@nuxtjs/dynamic-i18n)
 
@@ -7,8 +7,7 @@
 This module automatically import your translate file from a specific provider.
 
 # RooadMap
-- Integrate [https://github.com/nuxt-community/nuxt-i18n](nuxt-i18n)
-- Replace `console.log` and `console.err` with nuxtjs logger
+- Integrate [https://github.com/nuxt-community/nuxt-i18n](nuxt-i18n) plugin
 
 # Supported providers
 * Google sheets, see example of file [here](https://docs.google.com/spreadsheets/d/1dBsD-EsKb1mHvq4P2Zm4DcOPK2szuxqkkvnTsmbkYhc/edit?usp=sharing)
@@ -35,13 +34,17 @@ This module automatically import your translate file from a specific provider.
 | languages | **Required** | `[]` | Contain all the locales we want to import. |
 | provider-key | **Required** | `''` | The identifier for the source of the data stored. |
 | credentials | **Required** | `{}` | Configuration for the provider. |
-| title | Optional | `'Translate'` | Title of the document. |
+| id | Optional | None | id of the active document. Use gid for google sheet url to get active tab id |
 | maxAge | Optional | `1000 * 60 * 60` | Max age of translate files (60 minutes), use 0 to disable it
 | fallbackLocale | Optional | `'en'` | Default language if not founded from the store |
 | localeNamespaceStore | Optional | `'i18n'` | Default namespace of i18n locale store. see example of store [here](https://github.com/nuxt/nuxt.js/blob/dev/examples/i18n/store/index.js)|
 | outputFilePrefix | Optional | `'locale'` | Prefix of the output file like : {{outputFilePrefix}}-{{language}}.json. |
 | staticFolder | Optional | `static` | Specify folder in static
 
+## Migration from v1 to v2
+
+Dynamic i18n has been updated to work with the new version of [https://theoephraim.github.io/node-google-spreadsheet/#/](google-spreadsheet) and the `title` option to locate the tab has been replaced by `id` which is the `gid` identifier that you can get from the google sheet url query params `gid`.
+
 ## 📑 License
 
 [MIT License](./LICENSE) - Nuxt Community

index.js

@@ -2,7 +2,6 @@ const path = require('path')
 const library = require('./library')
 
 const defaults = {
-  title: 'Translate',
   provider: 'google-sheet',
   languages: ['en'],
   fallbackLocale: 'en',
@@ -34,7 +33,7 @@ module.exports = async function nuxtDynamicI18n(_moduleOptions) {
   }
 
   // Load translates from provider
-  importI18n(importOptions)
+  await importI18n(importOptions)
 
   this.addPlugin({
     src: path.resolve(__dirname, 'plugin.js'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/dynamic-i18n",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "license": "MIT",
   "repository": "https://github.com/nuxt/modules",
   "homepage": "https://github.com/nuxt/modules/tree/master/modules/dynamic-i18n",
@@ -9,7 +9,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "google-spreadsheet": "^2.0.4",
+    "google-spreadsheet": "^3.0.10",
     "lodash": "^4.17.5",
     "vue-i18n": "^7.6.0"
   }

providers/google-sheet-provider.js

@@ -2,9 +2,9 @@ const _ = require('lodash')
 const fs = require('fs')
 const path = require('path')
 
-const GoogleSpreadsheet = require('google-spreadsheet')
-const KEYS = 'keys'
-const VARS = 'vars'
+const { GoogleSpreadsheet } = require('google-spreadsheet')
+const KEYS = 'KEYS'
+const VARS = 'VARS'
 
 function cb(fn, ...args) {
   return new Promise((resolve, reject) => {
@@ -40,16 +40,16 @@ async function extract({ rows, path, conf }) {
 
     if (keys.length > 0) {
       _.forEach(conf.languages, (language) => {
-        if (_.has(row, language.toLowerCase())) {
-          const value = row[language.toLowerCase()].replace(/  +/g, ' ')
+        if (_.has(row, language.toUpperCase())) {
+          const value = row[language.toUpperCase()].replace(/  +/g, ' ')
 
           assignValue(i18n, language, keys, variables, value)
         }
       })
     }
   })
 
-  if (!path) return Promise.resolve(i18n)
+  if (!path) return i18n
 
   return save(i18n, path, conf)
 }
@@ -64,13 +64,13 @@ async function save(i18n, directory, conf) {
     const jsonData = JSON.stringify(i18n[language], null, 4)
 
     try {
-      fs.writeFileSync(filePath, jsonData);
+      fs.writeFileSync(filePath, jsonData)
     } catch (err) {
-      Promise.reject(err)
+      return Promise.reject(err)
     }
   })
 
-  return Promise.resolve(i18n)
+  return i18n
 }
 
 function assignValue(i18n, language, keys, variables, value) {
@@ -87,16 +87,16 @@ function assignValue(i18n, language, keys, variables, value) {
 }
 
 function parseValue(value, variables) {
-  if (_.isEmpty(variables)) return value;
+  if (_.isEmpty(variables)) return value
 
-  var parsed = value;
+  var parsed = value
   _.each(variables, function (variable, index) {
     if (!_.isEmpty(variable)) {
-      parsed = parsed.replace(new RegExp('\\[' + (index + 1) + '\\]', 'g'), '{{' + variable + '}}');
+      parsed = parsed.replace(new RegExp('\\[' + (index + 1) + '\\]', 'g'), '{{' + variable + '}}')
     }
-  });
+  })
 
-  return parsed;
+  return parsed
 }
 
 function getObjectFromTree(object, tree) {
@@ -110,14 +110,16 @@ async function importI18n({ path, conf, log }) {
   if (!checkExportConfigurationFile(conf)) return Promise.reject('Bad configuration file')
 
   const doc = new GoogleSpreadsheet(conf['providerKey'])
-  await cb(doc.useServiceAccountAuth, conf.credentials)
-  const info = await cb(doc.getInfo)
 
-  const worksheetIndex = _.findIndex(info.worksheets, (worksheet) => worksheet.title === conf.title)
+  await doc.useServiceAccountAuth(conf.credentials)
+  await doc.loadInfo()
 
-  if (worksheetIndex === -1) return Promise.reject(`Unable to find ${conf.title} worksheet`)
+  // If no gid provided we load the first tab
+  const worksheet = conf.id ? doc.sheetsById[conf.id] : doc.sheetsByIndex[0]
 
-  const rows = await cb(info.worksheets[worksheetIndex].getRows)
+  if (!worksheet) return Promise.reject(`Unable to find ${conf.id} worksheet tab`)
+
+  const rows = await worksheet.getRows()
   const i18n = await extract({ rows, path, conf, log })
 
   log(`Extract: ${rows.length} rows`)
@@ -126,5 +128,5 @@ async function importI18n({ path, conf, log }) {
 }
 
 module.exports = {
-  importI18n: importI18n
-};
+  importI18n
+}