@data-fair/dev-server 1.0.4 → 1.4.0

package/dist/index.html

@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
   <head>
-    <title>DataFair - Dev server</title><meta data-n-head="1" charset="utf-8"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" data-hid="application" name="application-name" content="DataFair - Dev server"><meta data-n-head="1" data-hid="description" name="description" content="A development server for optimal development experience of data-fair applications."><meta data-n-head="1" data-hid="robots" name="robots" content="noindex"><link data-n-head="1" rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900&display=swap"><link data-n-head="1" rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link rel="preload" href="/_nuxt/ce9939c.js" as="script"><link rel="preload" href="/_nuxt/765c8cf.js" as="script"><link rel="preload" href="/_nuxt/b9d9dd1.js" as="script"><link rel="preload" href="/_nuxt/d3a56e4.js" as="script">
+    <title>DataFair - Dev server</title><meta data-n-head="1" charset="utf-8"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" data-hid="application" name="application-name" content="DataFair - Dev server"><meta data-n-head="1" data-hid="description" name="description" content="A development server for optimal development experience of data-fair applications."><meta data-n-head="1" data-hid="robots" name="robots" content="noindex"><link data-n-head="1" rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900&display=swap"><link data-n-head="1" rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link rel="preload" href="/_nuxt/fa5339e.js" as="script"><link rel="preload" href="/_nuxt/04fc13d.js" as="script"><link rel="preload" href="/_nuxt/13c55a4.js" as="script"><link rel="preload" href="/_nuxt/a928dea.js" as="script">
   </head>
   <body>
-    <div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{}}</script>
-  <script src="/_nuxt/ce9939c.js"></script><script src="/_nuxt/765c8cf.js"></script><script src="/_nuxt/b9d9dd1.js"></script><script src="/_nuxt/d3a56e4.js"></script></body>
+    <div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{_app:{basePath:"/",assetsPath:"/_nuxt/",cdnURL:null}}}</script>
+  <script src="/_nuxt/fa5339e.js"></script><script src="/_nuxt/04fc13d.js"></script><script src="/_nuxt/13c55a4.js"></script><script src="/_nuxt/a928dea.js"></script></body>
 </html>

package/nuxt.config.js

@@ -5,10 +5,27 @@ if (process.argv.slice(-1)[0] === 'generate') {
   config = nuxtConfigInject.prepare(config)
 }
 
+const locales = ['en', 'fr']
+
 module.exports = {
-  mode: 'spa',
+  ssr: false,
+  components: true,
   srcDir: 'public/',
-  modules: ['@nuxtjs/axios'],
+  telemetry: false,
+  modules: ['@nuxtjs/axios', ['@nuxtjs/i18n', {
+    seo: false,
+    locales,
+    defaultLocale: 'en',
+    vueI18nLoader: true,
+    strategy: 'no_prefix',
+    detectBrowserLanguage: {
+      useCookie: true,
+      cookieKey: 'i18n_lang'
+    },
+    vueI18n: {
+      fallbackLocale: 'en'
+    }
+  }]],
   axios: {
     browserBaseURL: 'http://localhost:5888/data-fair'
   },
@@ -24,7 +41,7 @@ module.exports = {
       }
     }
   },
-  env: { app: config.app, dataFair: config.dataFair },
+  env: { app: config.app, dataFair: config.dataFair, iframeLog: config.iframeLog, locales },
   head: {
     title: 'DataFair - Dev server',
     meta: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/dev-server",
-  "version": "1.0.4",
+  "version": "1.4.0",
   "description": "A development server for optimal development experience of data-fair applications.",
   "main": "server/index.js",
   "bin": {
@@ -26,47 +26,61 @@
     "url": "https://github.com/koumoul-dev/df-dev-server/issues"
   },
   "homepage": "https://github.com/koumoul-dev/df-dev-server#readme",
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended",
+      "standard",
+      "plugin:vue/recommended"
+    ],
+    "rules": {
+      "vue/no-v-html": "off",
+      "vue/multi-word-component-names": "off"
+    }
+  },
   "dependencies": {
     "@koumoul/nuxt-config-inject": "^0.4.4",
-    "@koumoul/vjsf": "^2.1.3",
-    "ajv": "^6.12.0",
-    "body-parser": "^1.19.0",
+    "@koumoul/vjsf": "^2.9.0",
+    "ajv": "^8.8.2",
+    "ajv-i18n": "^4.2.0",
+    "body-parser": "^1.19.1",
     "chalk": "^3.0.0",
-    "config": "^3.2.4",
+    "config": "^3.3.6",
     "cors": "^2.8.5",
-    "dot-prop": "^6.0.0",
+    "dot-prop": "^6.0.1",
     "dotenv": "^10.0.0",
     "escape-string-regexp": "^2.0.0",
     "event-to-promise": "^0.8.0",
-    "express": "^4.17.1",
-    "fs-extra": "^8.1.0",
-    "http-proxy-middleware": "^0.20.0",
-    "open": "^7.0.0",
+    "express": "^4.17.2",
+    "fs-extra": "^10.0.0",
+    "http-proxy-middleware": "^2.0.1",
+    "open": "^8.4.0",
     "parse5": "^6.0.1",
     "tree-kill": "^1.2.2",
-    "ws": "^7.3.0"
+    "ws": "^8.3.0"
   },
   "devDependencies": {
-    "@koumoul/v-iframe": "^0.5.4",
-    "@nuxtjs/axios": "^5.12.5",
-    "@nuxtjs/vuetify": "^1.11.3",
-    "babel-eslint": "^10.1.0",
-    "cross-env": "^6.0.3",
-    "eslint": "^6.8.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^3.0.4",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "eslint-plugin-vuetify": "^1.0.0-beta.7",
+    "@babel/eslint-parser": "^7.16.0",
+    "@koumoul/v-iframe": "^0.9.1",
+    "@nuxtjs/axios": "^5.13.6",
+    "@nuxtjs/i18n": "^7.2.0",
+    "@nuxtjs/vuetify": "^1.12.3",
+    "cross-env": "^7.0.3",
+    "eslint": "^7.12.1",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.1",
+    "eslint-plugin-vue": "^8.0.3",
     "http-server": "^0.12.3",
-    "iframe-resizer": "^4.3.1",
-    "nodemon": "^2.0.7",
-    "nuxt": "^2.14.12",
+    "iframe-resizer": "^4.3.2",
+    "nodemon": "^2.0.15",
+    "nuxt": "^2.15.8",
     "reconnecting-websocket": "^4.4.0",
-    "vuetify": "^2.4.11"
+    "vuetify": "^2.6.1"
   }
 }

package/server/app.js

@@ -7,7 +7,7 @@ const config = require('config')
 const eventToPromise = require('event-to-promise')
 const http = require('http')
 const fs = require('fs-extra')
-const proxy = require('http-proxy-middleware')
+const { createProxyMiddleware } = require('http-proxy-middleware')
 const cors = require('cors')
 const open = require('open')
 const kill = require('tree-kill')
@@ -25,7 +25,7 @@ wss.on('connection', (_ws) => {
   if (ws) ws.terminate()
   ws = _ws
 
-  ws.on('message', function incoming(message) {
+  ws.on('message', function incoming (message) {
     if (!message.includes('"pong"')) console.log('received: %s', message)
   })
   ws.send(JSON.stringify({ type: 'ping' }))
@@ -53,7 +53,7 @@ app.post('/config/error', (req, res) => {
 
 // re-expose the application performing similar modifications to the body as data-fair
 const appUrl = new URL(config.app.url)
-app.use('/app', proxy({
+app.use('/app', createProxyMiddleware({
   target: appUrl.origin,
   pathRewrite: { '^/app': appUrl.pathname === '/' ? '' : appUrl.pathname },
   secure: false,
@@ -151,14 +151,14 @@ setTimeout(function() {
 
 // re-expose a data-fair instance to access datasets, etc.
 const dfUrl = new URL(config.dataFair.url)
-app.use('/data-fair', proxy({
+app.use('/data-fair', createProxyMiddleware({
   target: dfUrl.origin,
   pathRewrite: { '^/data-fair': dfUrl.pathname },
   secure: false,
   changeOrigin: true,
   ws: true,
   selfHandleResponse: true, // so that the onProxyRes takes care of sending the response
-  onProxyReq(proxyReq) {
+  onProxyReq (proxyReq) {
     // no gzip so that we can process the content
     proxyReq.setHeader('accept-encoding', 'identity')
     proxyReq.setHeader('cookie', '')
@@ -218,7 +218,7 @@ exports.run = async () => {
   return server
 }
 
-exports.stop = async() => {
+exports.stop = async () => {
   if (spawnedDevSrc) kill(spawnedDevSrc.pid)
   if (ws) ws.terminate()
   server.close()

package/.eslintrc.js

@@ -1,31 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: 'babel-eslint',
-    sourceType: 'module'
-  },
-  extends: [
-    // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-    'standard',
-    // https://github.com/vuejs/eslint-plugin-vue,
-     'plugin:vue/recommended'
-  ],
-  plugins: [],
-  // add your custom rules here
-  rules: {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow async-await
-    'generator-star-spacing': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    // This rule is required because atom vue-format package remove the space
-    'space-before-function-paren': 0,
-    // Turn off vuejs rules, not because ther are not good, but mostly because
-    // they are very present in initial code base.. Maybe we should clean that up someday..
-    'vue/max-attributes-per-line': 'off',
-    'vue/require-prop-types': 'off',
-    'no-new': 'off',
-    'no-template-curly-in-string': 'off'
-  }
-}