Merge pull request #33 from frandiox/esm

Use ES modules in server

package.json

@@ -67,7 +67,7 @@
     "stylelint-config-prettier": "^3.3.0",
     "stylelint-config-recess-order": "^2.0.0",
     "stylelint-config-standard": "^18.2.0",
-    "stylelint-scss": "^3.1.3",
+    "stylelint-scss": "^3.2.0",
     "vue-cli-plugin-apollo": "^0.15.0",
     "vue-jest": "^2.6.0",
     "vue-template-compiler": "^2.5.16",

server/.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: false,
   parserOptions: {
-    sourceType: 'script',
+    sourceType: 'module',
     ecmaVersion: '2018',
   },
   extends: [
@@ -10,5 +10,12 @@ module.exports = {
   ],
   rules: {
     'node/no-unpublished-require': 'off',
+    'node/no-unpublished-import': 'off',
+    'node/no-extraneous-import': 'error',
+    'node/no-missing-import': 'error',
+    'node/no-unsupported-features/es-syntax': [
+      'error',
+      { ignores: ['modules'] },
+    ],
   },
 }

server/package.json

@@ -2,13 +2,14 @@
   "name": "backend",
   "version": "0.0.0",
   "scripts": {
-    "start": "node -r multienv-loader/load src/index.js",
-    "dev": "nodemon -e js,json,graphql,gql -x node -r multienv-loader/load src/index.js",
-    "debug": "nodemon -e js,json,graphql,gql -x node -r multienv-loader/load --inspect src/index.js",
+    "start": "node -r multienv-loader/load -r esm src/index.js",
+    "dev": "nodemon -e js,json,graphql,gql -x node -r multienv-loader/load -r esm src/index.js",
+    "debug": "nodemon -e js,json,graphql,gql -x node -r multienv-loader/load -r esm --inspect src/index.js",
     "playground": "graphql --dotenv .env playground",
     "prisma": "prisma"
   },
   "dependencies": {
+    "esm": "^3.0.72",
     "graphql-yoga": "^1.14.12",
     "jsonwebtoken": "^8.3.0",
     "multienv-loader": "^1.1.0",

server/src/directives/index.js

@@ -1,4 +1,4 @@
-const { AuthError } = require('../errors')
+import { AuthError } from '../errors'
 
 const getUser = ({ request: { user } = {} }) => user
 
@@ -7,7 +7,7 @@ const hasRole = (roles, ctx) => {
   return role && roles.includes(role)
 }
 
-module.exports = {
+export default {
   isAuthenticated(next, source, args, ctx) {
     if (getUser(ctx)) return next()
     throw new AuthError('Access Token is missing or might be expired')

server/src/errors/index.js

@@ -4,19 +4,14 @@ class DefaultError extends Error {
   }
 }
 
-class AuthError extends DefaultError {
+export class AuthError extends DefaultError {
   constructor(...messages) {
     super('Not authorized', ...messages)
   }
 }
 
-class BadRequestError extends DefaultError {
+export class BadRequestError extends DefaultError {
   constructor(...messages) {
     super('Bad request', ...messages)
   }
 }
-
-module.exports = {
-  AuthError,
-  BadRequestError,
-}

server/src/index.js

@@ -1,11 +1,11 @@
-const { GraphQLServer } = require('graphql-yoga')
-const { Prisma } = require('prisma-binding')
+import { GraphQLServer } from 'graphql-yoga'
+import { Prisma } from 'prisma-binding'
 
-const verifyAccessToken = require('./middleware/verify-access-token')
-const getUserFromDB = require('./middleware/get-user-from-db')
+import verifyAccessToken from './middleware/verify-access-token'
+import getUserFromDB from './middleware/get-user-from-db'
 
-const resolvers = require('./resolvers')
-const directiveResolvers = require('./directives')
+import directiveResolvers from './directives'
+import * as resolvers from './resolvers'
 
 const db = new Prisma({
   typeDefs: 'src/generated/prisma.graphql', // the Prisma DB schema

server/src/middleware/get-user-from-db.js

@@ -1,4 +1,4 @@
-module.exports = async (req, res, next, db) => {
+export default async function(req, res, next, db) {
   if (req.user) {
     const user = await db.query.user({
       where: { auth0id: req.user.sub.split(`|`)[1] },

server/src/middleware/verify-access-token.js

@@ -1,11 +1,11 @@
-const jwksClient = require('jwks-rsa')
-const jwt = require('express-jwt')
+import jwksClient from 'jwks-rsa'
+import jwt from 'express-jwt'
 
 // Authentication middleware. When used,
 // if the access token exists, it will be
 // verified against the Auth0 JSON Web Key Set
 
-module.exports = jwt({
+export default jwt({
   // Dynamically provide a signing key
   // based on the kid in the header and
   // the signing keys provided by the JWKS endpoint.

server/src/resolvers/index.js

@@ -1,5 +1,2 @@
-module.exports = {
-  Query: require('./query'),
-  Mutation: require('./mutation'),
-  // Subscription: require('./subscription'),
-}
+export { default as Query } from './query'
+export { default as Mutation } from './mutation'

server/src/resolvers/mutation/auth.js

@@ -1,6 +1,6 @@
-const jwksClient = require('jwks-rsa')
-const jwt = require('jsonwebtoken')
-const { AuthError } = require('../../errors')
+import jwksClient from 'jwks-rsa'
+import jwt from 'jsonwebtoken'
+import { AuthError } from '../../errors'
 
 const jwks = jwksClient({
   cache: true,
@@ -37,7 +37,7 @@ function verifyAndDecodeIdToken(idToken) {
   })
 }
 
-module.exports = {
+export default {
   async authenticate(parent, { idToken }, ctx, info) {
     let userToken = null
 

server/src/resolvers/mutation/index.js

@@ -1,2 +1,2 @@
-const { mergeDirectoryModules } = require('../../utils')
-module.exports = mergeDirectoryModules(__dirname)
+import { mergeDirectoryModules } from '../../utils'
+export default mergeDirectoryModules(__dirname)

server/src/resolvers/mutation/post.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   async createDraft(parent, { title, text }, ctx, info) {
     const userId = ctx.request.user.id
     return ctx.db.mutation.createPost(

server/src/resolvers/query.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   feed(parent, args, ctx, info) {
     return ctx.db.query.posts({ where: { isPublished: true } }, info)
   },

server/src/resolvers/subscription.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   feedSubscription: {
     subscribe: (parent, args, ctx, info) => {
       return ctx.db.subscription.post({}, info)

server/src/utils/index.js

@@ -1,17 +1,15 @@
-const fs = require('fs')
-const path = require('path')
+import fs from 'fs'
+import path from 'path'
 
 // Require all the modules in the specified directory
-const mergeDirectoryModules = dirpath =>
+export const mergeDirectoryModules = dirpath =>
   fs
     .readdirSync(dirpath, 'utf8')
     .filter(filename => !/^[_|index.]/.test(filename))
     .reduce(
       (acc, filename) => ({
         ...acc,
-        ...require(path.resolve(dirpath, filename)),
+        ...require(path.resolve(dirpath, filename)).default,
       }),
       {}
     )
-
-module.exports = { mergeDirectoryModules }

yarn.lock

@@ -5224,6 +5224,10 @@ esm@^3.0.64:
   version "3.0.71"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.71.tgz#3824987412d7d8fd7782d2381e990a621519a993"
 
+esm@^3.0.72:
+  version "3.0.72"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.72.tgz#8f71b3f54b978bbbcbb9788f7f3569a36578c136"
+
 espree@^3.5.2, espree@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
@@ -13473,9 +13477,9 @@ stylelint-order@^0.8.1:
     postcss "^6.0.14"
     postcss-sorting "^3.1.0"
 
-stylelint-scss@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.1.3.tgz#28f881ae298c3f5db667b10b6cf94a1a219001d6"
+stylelint-scss@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.2.0.tgz#13545a1be5ab5435ea94e761b2d4824eb32033b3"
   dependencies:
     lodash "^4.17.10"
     postcss-media-query-parser "^0.2.3"