From e2d87b2fdc6de5ecf7b2b66c3e1f1cf327f8537a Mon Sep 17 00:00:00 2001 From: Robert Rossmann Date: Wed, 12 Dec 2018 13:16:11 +0100 Subject: [PATCH] chore: disable Babel's ES modules' interop helper By forcing to use the `import * as thing from 'thing'` syntax when importing CommonJS modules, Atom and VS Code can now provide type hints for imported modules, greatly improving developer experience. --- babel.config.js | 1 + packages/atlas/src/atlas.mjs | 8 ++++---- packages/atlas/src/private/mklog.mjs | 2 +- packages/atlas/test/democonfig/serialisers.mjs | 2 +- packages/atlas/test/init/init.test.mjs | 2 +- packages/aws/test/service/prepare.test.mjs | 2 +- packages/braintree/src/index.mjs | 2 +- packages/braintree/src/service.mjs | 2 +- packages/braintree/test/service/prepare.test.mjs | 2 +- packages/cli/src/bin/atlas.mjs | 2 +- packages/cli/src/command.mjs | 2 +- packages/cli/src/commands/exec.mjs | 2 +- packages/cli/src/commands/start.mjs | 2 +- packages/cli/src/index.mjs | 14 +++++++++----- packages/cli/test/cli.test.mjs | 2 +- packages/cli/test/command/command.test.mjs | 2 +- packages/cli/test/commands/start.test.mjs | 2 +- packages/firebase/src/index.mjs | 2 +- packages/firebase/test/service/prepare.test.mjs | 4 ++-- packages/firebase/test/service/stop.test.mjs | 2 +- packages/generator/generators/app/index.mjs | 2 +- .../generator/generators/boilerplate/index.mjs | 2 +- .../generator/generators/editorconfig/index.mjs | 2 +- packages/generator/generators/eslint/index.mjs | 2 +- packages/generator/generators/gitignore/index.mjs | 2 +- packages/generator/generators/testsuite/index.mjs | 2 +- .../testsuite/templates/test/bootstrap.mjs | 10 +++++----- packages/generator/generators/vscode/index.mjs | 2 +- packages/koa/src/server.mjs | 4 ++-- packages/koa/src/websocket.mjs | 2 +- packages/koa/test/server/prepare.test.mjs | 4 ++-- packages/koa/test/server/start.test.mjs | 2 +- packages/koa/test/server/stop.test.mjs | 2 +- packages/koa/test/websocket/api.test.mjs | 2 +- packages/mongoose/src/index.mjs | 2 +- packages/mongoose/src/service.mjs | 2 +- packages/mongoose/test/model/api.test.mjs | 2 +- packages/mongoose/test/service/prepare.test.mjs | 2 +- packages/mongoose/test/service/start.test.mjs | 2 +- packages/nodemailer/src/index.mjs | 2 +- packages/nodemailer/src/service.mjs | 2 +- packages/nodemailer/test/service/prepare.test.mjs | 6 +++--- packages/nodemailer/test/service/send.test.mjs | 2 +- packages/nodemailer/test/service/stop.test.mjs | 2 +- packages/objection/src/index.mjs | 2 +- packages/objection/src/migration.mjs | 4 ++-- packages/objection/src/service.mjs | 2 +- packages/objection/test/migration/down.test.mjs | 2 +- packages/objection/test/migration/pending.test.mjs | 2 +- packages/objection/test/migration/up.test.mjs | 2 +- packages/objection/test/service/prepare.test.mjs | 2 +- packages/objection/test/service/start.test.mjs | 2 +- packages/objection/test/service/stop.test.mjs | 2 +- packages/repl/src/action.mjs | 10 +++++----- packages/repl/test/action/enter.test.mjs | 10 +++++----- packages/sequelize/src/index.mjs | 2 +- packages/sequelize/src/migration.mjs | 4 ++-- packages/sequelize/src/service.mjs | 2 +- packages/sequelize/test/migration/down.test.mjs | 2 +- packages/sequelize/test/migration/pending.test.mjs | 2 +- packages/sequelize/test/migration/up.test.mjs | 2 +- packages/sequelize/test/models/api.test.mjs | 4 ++-- packages/sequelize/test/relations/api.test.mjs | 2 +- packages/sequelize/test/service/prepare.test.mjs | 2 +- packages/sequelize/test/service/start.test.mjs | 2 +- packages/sequelize/test/service/stop.test.mjs | 2 +- packages/templates/src/action.mjs | 4 ++-- test/bootstrap.mjs | 8 ++++---- 68 files changed, 103 insertions(+), 98 deletions(-) diff --git a/babel.config.js b/babel.config.js index 37c2a04..bbd80dc 100644 --- a/babel.config.js +++ b/babel.config.js @@ -8,6 +8,7 @@ module.exports = { '@babel/syntax-object-rest-spread', ['@babel/transform-modules-commonjs', { allowTopLevelThis: false, + noInterop: true, }], '@babel/proposal-class-properties', '@babel/proposal-function-bind', diff --git a/packages/atlas/src/atlas.mjs b/packages/atlas/src/atlas.mjs index 385fb15..ebc429f 100644 --- a/packages/atlas/src/atlas.mjs +++ b/packages/atlas/src/atlas.mjs @@ -1,10 +1,10 @@ // We use for-await pattern quite extensively here for legitimate purposes /* eslint-disable no-await-in-loop */ -import path from 'path' -import Ajv from 'ajv' -import ajvKeywords from 'ajv-keywords' -import pino from 'pino' +import * as path from 'path' +import * as Ajv from 'ajv' +import * as ajvKeywords from 'ajv-keywords' +import * as pino from 'pino' import { defaultsDeep as defaults, isPlainObject, diff --git a/packages/atlas/src/private/mklog.mjs b/packages/atlas/src/private/mklog.mjs index 324668a..6953d8a 100644 --- a/packages/atlas/src/private/mklog.mjs +++ b/packages/atlas/src/private/mklog.mjs @@ -1,4 +1,4 @@ -import pino from 'pino' +import * as pino from 'pino' /** * Create a new instance of logger (pino) diff --git a/packages/atlas/test/democonfig/serialisers.mjs b/packages/atlas/test/democonfig/serialisers.mjs index ef16450..3090c5c 100644 --- a/packages/atlas/test/democonfig/serialisers.mjs +++ b/packages/atlas/test/democonfig/serialisers.mjs @@ -1,4 +1,4 @@ -import pino from 'pino' +import * as pino from 'pino' const stdSerializers = { err: pino.stdSerializers.err, diff --git a/packages/atlas/test/init/init.test.mjs b/packages/atlas/test/init/init.test.mjs index 02051d7..575c2e0 100644 --- a/packages/atlas/test/init/init.test.mjs +++ b/packages/atlas/test/init/init.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { FrameworkError } from '@atlas.js/errors' import { Atlas } from '../..' import * as testservices from './demoapp/services' diff --git a/packages/aws/test/service/prepare.test.mjs b/packages/aws/test/service/prepare.test.mjs index 59d77d0..e1e8826 100644 --- a/packages/aws/test/service/prepare.test.mjs +++ b/packages/aws/test/service/prepare.test.mjs @@ -1,4 +1,4 @@ -import awssdk from 'aws-sdk' +import * as awssdk from 'aws-sdk' import { Service as AWS } from '../..' describe('AWS::prepare()', () => { diff --git a/packages/braintree/src/index.mjs b/packages/braintree/src/index.mjs index d748201..0a10bd6 100644 --- a/packages/braintree/src/index.mjs +++ b/packages/braintree/src/index.mjs @@ -1,4 +1,4 @@ -import Braintree from 'braintree' +import * as Braintree from 'braintree' import Service from './service' export { diff --git a/packages/braintree/src/service.mjs b/packages/braintree/src/service.mjs index 20ec243..a495e5e 100644 --- a/packages/braintree/src/service.mjs +++ b/packages/braintree/src/service.mjs @@ -1,4 +1,4 @@ -import braintree from 'braintree' +import * as braintree from 'braintree' import Service from '@atlas.js/service' class Braintree extends Service { diff --git a/packages/braintree/test/service/prepare.test.mjs b/packages/braintree/test/service/prepare.test.mjs index 392ee1b..83d13d3 100644 --- a/packages/braintree/test/service/prepare.test.mjs +++ b/packages/braintree/test/service/prepare.test.mjs @@ -1,4 +1,4 @@ -import braintree from 'braintree' +import * as braintree from 'braintree' import { Service as Braintree } from '../..' describe('Braintree::prepare()', () => { diff --git a/packages/cli/src/bin/atlas.mjs b/packages/cli/src/bin/atlas.mjs index bff9fec..ca67018 100644 --- a/packages/cli/src/bin/atlas.mjs +++ b/packages/cli/src/bin/atlas.mjs @@ -1,7 +1,7 @@ #!/usr/bin/env node import 'source-map-support/register' -import caporal from 'caporal' +import * as caporal from 'caporal' import cli from '..' cli(caporal, process.argv) diff --git a/packages/cli/src/command.mjs b/packages/cli/src/command.mjs index c656ea4..3b33056 100644 --- a/packages/cli/src/command.mjs +++ b/packages/cli/src/command.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' /** * The Command class represents a single CLI command diff --git a/packages/cli/src/commands/exec.mjs b/packages/cli/src/commands/exec.mjs index 4ef498c..88f6df5 100644 --- a/packages/cli/src/commands/exec.mjs +++ b/packages/cli/src/commands/exec.mjs @@ -1,4 +1,4 @@ -import os from 'os' +import * as os from 'os' import Command from '../command' /** diff --git a/packages/cli/src/commands/start.mjs b/packages/cli/src/commands/start.mjs index 36130ff..ad33bd4 100644 --- a/packages/cli/src/commands/start.mjs +++ b/packages/cli/src/commands/start.mjs @@ -1,4 +1,4 @@ -import cluster from 'cluster' +import * as cluster from 'cluster' import Command from '../command' class Start extends Command { diff --git a/packages/cli/src/index.mjs b/packages/cli/src/index.mjs index e8608ca..35be4b9 100644 --- a/packages/cli/src/index.mjs +++ b/packages/cli/src/index.mjs @@ -1,19 +1,23 @@ -import fs from 'fs' -import path from 'path' -import pkg from '../package' +import * as fs from 'fs' +import * as path from 'path' +import * as pkg from '../package' import commands from './commands' const help = fs.readFileSync(path.join(__dirname, 'more-info.txt'), 'utf8') +/** + * @typedef {import("caporal")} Caporal + */ + /** * The CLI entry point * * You should not call this function directly. * * @private - * @param {Object} caporal The caporal module + * @param {Caporal} caporal The caporal module * @param {Array} argv CLI arguments - * @return {caporal~Program} + * @return {void} */ export default function cli(caporal, argv) { caporal.version(pkg.version) diff --git a/packages/cli/test/cli.test.mjs b/packages/cli/test/cli.test.mjs index 20663ae..b0b5970 100644 --- a/packages/cli/test/cli.test.mjs +++ b/packages/cli/test/cli.test.mjs @@ -1,4 +1,4 @@ -import caporal from 'caporal' +import * as caporal from 'caporal' import commands from '../src/commands' import cli from '..' diff --git a/packages/cli/test/command/command.test.mjs b/packages/cli/test/command/command.test.mjs index 06177db..7e7eb6c 100644 --- a/packages/cli/test/command/command.test.mjs +++ b/packages/cli/test/command/command.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import Command from '../../src/command' describe('CLI: Command', () => { diff --git a/packages/cli/test/commands/start.test.mjs b/packages/cli/test/commands/start.test.mjs index 9e206ae..8562b6f 100644 --- a/packages/cli/test/commands/start.test.mjs +++ b/packages/cli/test/commands/start.test.mjs @@ -1,4 +1,4 @@ -import cluster from 'cluster' +import * as cluster from 'cluster' import Start from '../../src/commands/start' describe('CLI: start', () => { diff --git a/packages/firebase/src/index.mjs b/packages/firebase/src/index.mjs index 5f2fc6f..31bd061 100644 --- a/packages/firebase/src/index.mjs +++ b/packages/firebase/src/index.mjs @@ -1,4 +1,4 @@ -import firebase from 'firebase-admin' +import * as firebase from 'firebase-admin' import Service from './service' export { diff --git a/packages/firebase/test/service/prepare.test.mjs b/packages/firebase/test/service/prepare.test.mjs index d4d8495..7ec621d 100644 --- a/packages/firebase/test/service/prepare.test.mjs +++ b/packages/firebase/test/service/prepare.test.mjs @@ -1,5 +1,5 @@ -import path from 'path' -import Admin from 'firebase-admin' +import * as path from 'path' +import * as Admin from 'firebase-admin' import { Service as Firebase } from '../..' describe('Firebase::prepare()', () => { diff --git a/packages/firebase/test/service/stop.test.mjs b/packages/firebase/test/service/stop.test.mjs index a55a799..dc4192f 100644 --- a/packages/firebase/test/service/stop.test.mjs +++ b/packages/firebase/test/service/stop.test.mjs @@ -1,4 +1,4 @@ -import Admin from 'firebase-admin' +import * as Admin from 'firebase-admin' import { Service as Firebase } from '../..' let service diff --git a/packages/generator/generators/app/index.mjs b/packages/generator/generators/app/index.mjs index d272835..3f569c1 100644 --- a/packages/generator/generators/app/index.mjs +++ b/packages/generator/generators/app/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' const generators = { npm: require.resolve('generator-npm-init'), diff --git a/packages/generator/generators/boilerplate/index.mjs b/packages/generator/generators/boilerplate/index.mjs index 00d6d6d..8fc4571 100644 --- a/packages/generator/generators/boilerplate/index.mjs +++ b/packages/generator/generators/boilerplate/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' const files = [ ['env', '.env'], diff --git a/packages/generator/generators/editorconfig/index.mjs b/packages/generator/generators/editorconfig/index.mjs index 98e2a02..a750ef5 100644 --- a/packages/generator/generators/editorconfig/index.mjs +++ b/packages/generator/generators/editorconfig/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' class EditorConfig extends Generator { constructor(...args) { diff --git a/packages/generator/generators/eslint/index.mjs b/packages/generator/generators/eslint/index.mjs index c6fbf25..9b2d865 100644 --- a/packages/generator/generators/eslint/index.mjs +++ b/packages/generator/generators/eslint/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' const files = [ ['eslintrc.js', '.eslintrc.js'], diff --git a/packages/generator/generators/gitignore/index.mjs b/packages/generator/generators/gitignore/index.mjs index 5039f1d..a6b3a2e 100644 --- a/packages/generator/generators/gitignore/index.mjs +++ b/packages/generator/generators/gitignore/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' class Gitignore extends Generator { writing() { diff --git a/packages/generator/generators/testsuite/index.mjs b/packages/generator/generators/testsuite/index.mjs index 4de8d5c..2650575 100644 --- a/packages/generator/generators/testsuite/index.mjs +++ b/packages/generator/generators/testsuite/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' const files = [ 'test/mocha.opts', diff --git a/packages/generator/generators/testsuite/templates/test/bootstrap.mjs b/packages/generator/generators/testsuite/templates/test/bootstrap.mjs index 0abf4d9..e76cd68 100644 --- a/packages/generator/generators/testsuite/templates/test/bootstrap.mjs +++ b/packages/generator/generators/testsuite/templates/test/bootstrap.mjs @@ -1,9 +1,9 @@ import 'source-map-support/register' -import sinon from 'sinon' -import chai from 'chai' -import chaiAsPromised from 'chai-as-promised' -import sinonChai from 'sinon-chai' -import dirtyChai from 'dirty-chai' +import * as sinon from 'sinon' +import * as chai from 'chai' +import * as chaiAsPromised from 'chai-as-promised' +import * as sinonChai from 'sinon-chai' +import * as dirtyChai from 'dirty-chai' // Make sure our tests always run in the 'test' environment // eslint-disable-next-line no-process-env diff --git a/packages/generator/generators/vscode/index.mjs b/packages/generator/generators/vscode/index.mjs index 3774501..ff20479 100644 --- a/packages/generator/generators/vscode/index.mjs +++ b/packages/generator/generators/vscode/index.mjs @@ -1,4 +1,4 @@ -import Generator from 'yeoman-generator' +import * as Generator from 'yeoman-generator' const files = [ '.vscode/launch.json', diff --git a/packages/koa/src/server.mjs b/packages/koa/src/server.mjs index a34bb38..6d22c73 100644 --- a/packages/koa/src/server.mjs +++ b/packages/koa/src/server.mjs @@ -1,7 +1,7 @@ -import http from 'http' +import * as http from 'http' import Service from '@atlas.js/service' import { FrameworkError } from '@atlas.js/errors' -import Koa from 'koa' +import * as Koa from 'koa' import middleware from './middleware' class KoaService extends Service { diff --git a/packages/koa/src/websocket.mjs b/packages/koa/src/websocket.mjs index 6479ec6..30c8cd9 100644 --- a/packages/koa/src/websocket.mjs +++ b/packages/koa/src/websocket.mjs @@ -1,5 +1,5 @@ import Hook from '@atlas.js/hook' -import websocket from 'koa-websocket' +import * as websocket from 'koa-websocket' import middleware from './middleware' class WebsocketHook extends Hook { diff --git a/packages/koa/test/server/prepare.test.mjs b/packages/koa/test/server/prepare.test.mjs index 157ed2a..bbb93af 100644 --- a/packages/koa/test/server/prepare.test.mjs +++ b/packages/koa/test/server/prepare.test.mjs @@ -1,5 +1,5 @@ -import path from 'path' -import Koa from 'koa' +import * as path from 'path' +import * as Koa from 'koa' import { Server as Service } from '../..' import * as testmiddleware from './testmiddleware' diff --git a/packages/koa/test/server/start.test.mjs b/packages/koa/test/server/start.test.mjs index c697e57..663bc05 100644 --- a/packages/koa/test/server/start.test.mjs +++ b/packages/koa/test/server/start.test.mjs @@ -1,4 +1,4 @@ -import http from 'http' +import * as http from 'http' import { Server as Koa } from '../..' describe('Koa::start(instance)', () => { diff --git a/packages/koa/test/server/stop.test.mjs b/packages/koa/test/server/stop.test.mjs index c33b82b..16fb095 100644 --- a/packages/koa/test/server/stop.test.mjs +++ b/packages/koa/test/server/stop.test.mjs @@ -1,4 +1,4 @@ -import http from 'http' +import * as http from 'http' import { FrameworkError } from '@atlas.js/errors' import { Server as Koa } from '../..' diff --git a/packages/koa/test/websocket/api.test.mjs b/packages/koa/test/websocket/api.test.mjs index 9e50e8f..fbdf3d0 100644 --- a/packages/koa/test/websocket/api.test.mjs +++ b/packages/koa/test/websocket/api.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { Atlas } from '@atlas.js/atlas' import Hook from '@atlas.js/hook' import { WebsocketHook } from '../..' diff --git a/packages/mongoose/src/index.mjs b/packages/mongoose/src/index.mjs index 555c92f..2070c55 100644 --- a/packages/mongoose/src/index.mjs +++ b/packages/mongoose/src/index.mjs @@ -1,4 +1,4 @@ -import mongoose from 'mongoose' +import * as mongoose from 'mongoose' import Service from './service' import ModelsHook from './models' diff --git a/packages/mongoose/src/service.mjs b/packages/mongoose/src/service.mjs index d16a49d..cb6cd10 100644 --- a/packages/mongoose/src/service.mjs +++ b/packages/mongoose/src/service.mjs @@ -1,5 +1,5 @@ import Service from '@atlas.js/service' -import mongoose from 'mongoose' +import * as mongoose from 'mongoose' class Mongoose extends Service { static config = { diff --git a/packages/mongoose/test/model/api.test.mjs b/packages/mongoose/test/model/api.test.mjs index 44d4363..6d1d94d 100644 --- a/packages/mongoose/test/model/api.test.mjs +++ b/packages/mongoose/test/model/api.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { Atlas } from '@atlas.js/atlas' import { ModelsHook } from '../..' import * as testmodels from './testmodels' diff --git a/packages/mongoose/test/service/prepare.test.mjs b/packages/mongoose/test/service/prepare.test.mjs index 5328c96..7819535 100644 --- a/packages/mongoose/test/service/prepare.test.mjs +++ b/packages/mongoose/test/service/prepare.test.mjs @@ -1,4 +1,4 @@ -import mongoose from 'mongoose' +import * as mongoose from 'mongoose' import { Service as Mongoose } from '../..' describe('Mongoose::prepare()', () => { diff --git a/packages/mongoose/test/service/start.test.mjs b/packages/mongoose/test/service/start.test.mjs index 73654de..f42c7d5 100644 --- a/packages/mongoose/test/service/start.test.mjs +++ b/packages/mongoose/test/service/start.test.mjs @@ -1,4 +1,4 @@ -import mongoose from 'mongoose' +import * as mongoose from 'mongoose' import { Service as Mongoose } from '../..' describe('Mongoose::start()', () => { diff --git a/packages/nodemailer/src/index.mjs b/packages/nodemailer/src/index.mjs index 22ea9b8..63cd814 100644 --- a/packages/nodemailer/src/index.mjs +++ b/packages/nodemailer/src/index.mjs @@ -1,4 +1,4 @@ -import nodemailer from 'nodemailer' +import * as nodemailer from 'nodemailer' import Service from './service' export { diff --git a/packages/nodemailer/src/service.mjs b/packages/nodemailer/src/service.mjs index 1eb31e2..d9379e4 100644 --- a/packages/nodemailer/src/service.mjs +++ b/packages/nodemailer/src/service.mjs @@ -1,4 +1,4 @@ -import nodemailer from 'nodemailer' +import * as nodemailer from 'nodemailer' import Service from '@atlas.js/service' class Nodemailer extends Service { diff --git a/packages/nodemailer/test/service/prepare.test.mjs b/packages/nodemailer/test/service/prepare.test.mjs index 6c2bf19..a5e1e79 100644 --- a/packages/nodemailer/test/service/prepare.test.mjs +++ b/packages/nodemailer/test/service/prepare.test.mjs @@ -1,7 +1,7 @@ -import path from 'path' -import nodemailer from 'nodemailer' +import * as path from 'path' +import * as nodemailer from 'nodemailer' import { Service as Nodemailer } from '../..' -import dummytransport from './dummytransport' +import * as dummytransport from './dummytransport' describe('Nodemailer::prepare()', () => { let service diff --git a/packages/nodemailer/test/service/send.test.mjs b/packages/nodemailer/test/service/send.test.mjs index 344a08f..4947c32 100644 --- a/packages/nodemailer/test/service/send.test.mjs +++ b/packages/nodemailer/test/service/send.test.mjs @@ -1,4 +1,4 @@ -import nodemailer from 'nodemailer' +import * as nodemailer from 'nodemailer' import { Service as Nodemailer } from '../..' describe('Nodemailer - instance::send()', () => { diff --git a/packages/nodemailer/test/service/stop.test.mjs b/packages/nodemailer/test/service/stop.test.mjs index 3a2da4e..ab1556e 100644 --- a/packages/nodemailer/test/service/stop.test.mjs +++ b/packages/nodemailer/test/service/stop.test.mjs @@ -1,4 +1,4 @@ -import nodemailer from 'nodemailer' +import * as nodemailer from 'nodemailer' import { Service as Nodemailer } from '../..' describe('Nodemailer::stop()', () => { diff --git a/packages/objection/src/index.mjs b/packages/objection/src/index.mjs index 8b3a893..dacbac5 100644 --- a/packages/objection/src/index.mjs +++ b/packages/objection/src/index.mjs @@ -1,4 +1,4 @@ -import objection from 'objection' +import * as objection from 'objection' import Service from './service' import MigrationAction from './migration' diff --git a/packages/objection/src/migration.mjs b/packages/objection/src/migration.mjs index 71643ec..2af0c6c 100644 --- a/packages/objection/src/migration.mjs +++ b/packages/objection/src/migration.mjs @@ -1,5 +1,5 @@ -import path from 'path' -import Umzug from 'umzug' +import * as path from 'path' +import * as Umzug from 'umzug' import Action from '@atlas.js/action' class Migration extends Action { diff --git a/packages/objection/src/service.mjs b/packages/objection/src/service.mjs index 19dd495..748cc78 100644 --- a/packages/objection/src/service.mjs +++ b/packages/objection/src/service.mjs @@ -1,4 +1,4 @@ -import knex from 'knex' +import * as knex from 'knex' import Service from '@atlas.js/service' import { FrameworkError } from '@atlas.js/errors' diff --git a/packages/objection/test/migration/down.test.mjs b/packages/objection/test/migration/down.test.mjs index 3ee1282..65942ad 100644 --- a/packages/objection/test/migration/down.test.mjs +++ b/packages/objection/test/migration/down.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' describe('Migration::down()', () => { diff --git a/packages/objection/test/migration/pending.test.mjs b/packages/objection/test/migration/pending.test.mjs index 1de6566..65a8a1d 100644 --- a/packages/objection/test/migration/pending.test.mjs +++ b/packages/objection/test/migration/pending.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' describe('Migration::pending()', () => { diff --git a/packages/objection/test/migration/up.test.mjs b/packages/objection/test/migration/up.test.mjs index c5697c5..c6b60b8 100644 --- a/packages/objection/test/migration/up.test.mjs +++ b/packages/objection/test/migration/up.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' describe('Migration::up()', () => { diff --git a/packages/objection/test/service/prepare.test.mjs b/packages/objection/test/service/prepare.test.mjs index 1bebd33..64540e9 100644 --- a/packages/objection/test/service/prepare.test.mjs +++ b/packages/objection/test/service/prepare.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { errors } from '@atlas.js/atlas' import { Service as Objection } from '../..' import * as models from './models' diff --git a/packages/objection/test/service/start.test.mjs b/packages/objection/test/service/start.test.mjs index bfa6760..0a6825c 100644 --- a/packages/objection/test/service/start.test.mjs +++ b/packages/objection/test/service/start.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { Service as Objection } from '../..' import * as models from './models' diff --git a/packages/objection/test/service/stop.test.mjs b/packages/objection/test/service/stop.test.mjs index 78d12a0..56f59cd 100644 --- a/packages/objection/test/service/stop.test.mjs +++ b/packages/objection/test/service/stop.test.mjs @@ -1,4 +1,4 @@ -import path from 'path' +import * as path from 'path' import { Service as Objection } from '../..' describe('Objection::stop()', () => { diff --git a/packages/repl/src/action.mjs b/packages/repl/src/action.mjs index f4ea56f..8ba6db8 100644 --- a/packages/repl/src/action.mjs +++ b/packages/repl/src/action.mjs @@ -1,8 +1,8 @@ -import os from 'os' -import fs from 'fs' -import path from 'path' -import repl from 'repl' -import fsp from 'promisified-core/fs' +import * as os from 'os' +import * as fs from 'fs' +import * as path from 'path' +import * as repl from 'repl' +import * as fsp from 'promisified-core/fs' import Action from '@atlas.js/action' class Repl extends Action { diff --git a/packages/repl/test/action/enter.test.mjs b/packages/repl/test/action/enter.test.mjs index 5dcbed5..190984f 100644 --- a/packages/repl/test/action/enter.test.mjs +++ b/packages/repl/test/action/enter.test.mjs @@ -1,10 +1,10 @@ -import repl from 'repl' +import * as repl from 'repl' import { EventEmitter } from 'events' import { PassThrough } from 'stream' -import crypto from 'crypto' -import path from 'path' -import os from 'os' -import fsp from 'promisified-core/fs' +import * as crypto from 'crypto' +import * as path from 'path' +import * as os from 'os' +import * as fsp from 'promisified-core/fs' import { Action as Repl } from '../..' function waitForCall(spy, callCount) { diff --git a/packages/sequelize/src/index.mjs b/packages/sequelize/src/index.mjs index 6c31c61..732dd51 100644 --- a/packages/sequelize/src/index.mjs +++ b/packages/sequelize/src/index.mjs @@ -1,4 +1,4 @@ -import sequelize from 'sequelize' +import * as sequelize from 'sequelize' import Service from './service' import ModelsHook from './models' import RelationsHook from './relations' diff --git a/packages/sequelize/src/migration.mjs b/packages/sequelize/src/migration.mjs index 8fe6e22..7ebe5c8 100644 --- a/packages/sequelize/src/migration.mjs +++ b/packages/sequelize/src/migration.mjs @@ -1,5 +1,5 @@ -import path from 'path' -import Umzug from 'umzug' +import * as path from 'path' +import * as Umzug from 'umzug' import Action from '@atlas.js/action' import { DataTypes } from 'sequelize' diff --git a/packages/sequelize/src/service.mjs b/packages/sequelize/src/service.mjs index 52c3fd8..741493e 100644 --- a/packages/sequelize/src/service.mjs +++ b/packages/sequelize/src/service.mjs @@ -1,5 +1,5 @@ import Service from '@atlas.js/service' -import Database from 'sequelize' +import * as Database from 'sequelize' class Sequelize extends Service { static config = { diff --git a/packages/sequelize/test/migration/down.test.mjs b/packages/sequelize/test/migration/down.test.mjs index a8cd73c..ff65559 100644 --- a/packages/sequelize/test/migration/down.test.mjs +++ b/packages/sequelize/test/migration/down.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' import mksequelizemock from './sequelizemock' diff --git a/packages/sequelize/test/migration/pending.test.mjs b/packages/sequelize/test/migration/pending.test.mjs index 380a637..7a4d9fb 100644 --- a/packages/sequelize/test/migration/pending.test.mjs +++ b/packages/sequelize/test/migration/pending.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' import mksequelizemock from './sequelizemock' diff --git a/packages/sequelize/test/migration/up.test.mjs b/packages/sequelize/test/migration/up.test.mjs index eb6b177..57fa984 100644 --- a/packages/sequelize/test/migration/up.test.mjs +++ b/packages/sequelize/test/migration/up.test.mjs @@ -1,4 +1,4 @@ -import Umzug from 'umzug' +import * as Umzug from 'umzug' import { MigrationAction as Migration } from '../..' import mksequelizemock from './sequelizemock' diff --git a/packages/sequelize/test/models/api.test.mjs b/packages/sequelize/test/models/api.test.mjs index d285450..fac39d2 100644 --- a/packages/sequelize/test/models/api.test.mjs +++ b/packages/sequelize/test/models/api.test.mjs @@ -1,6 +1,6 @@ -import path from 'path' +import * as path from 'path' import { Atlas } from '@atlas.js/atlas' -import Sequelize from 'sequelize' +import * as Sequelize from 'sequelize' import { ModelsHook } from '../..' import * as testmodels from '../testmodels' diff --git a/packages/sequelize/test/relations/api.test.mjs b/packages/sequelize/test/relations/api.test.mjs index 3dc70af..52f8af1 100644 --- a/packages/sequelize/test/relations/api.test.mjs +++ b/packages/sequelize/test/relations/api.test.mjs @@ -1,5 +1,5 @@ import { FrameworkError } from '@atlas.js/errors' -import Sequelize from 'sequelize' +import * as Sequelize from 'sequelize' import { RelationsHook } from '../..' import * as testmodels from '../testmodels' diff --git a/packages/sequelize/test/service/prepare.test.mjs b/packages/sequelize/test/service/prepare.test.mjs index 739789b..e70c13d 100644 --- a/packages/sequelize/test/service/prepare.test.mjs +++ b/packages/sequelize/test/service/prepare.test.mjs @@ -1,4 +1,4 @@ -import Sequelize from 'sequelize' +import * as Sequelize from 'sequelize' import { Service as Database } from '../..' describe('Sequelize::prepare()', () => { diff --git a/packages/sequelize/test/service/start.test.mjs b/packages/sequelize/test/service/start.test.mjs index 9365725..c5ca557 100644 --- a/packages/sequelize/test/service/start.test.mjs +++ b/packages/sequelize/test/service/start.test.mjs @@ -1,4 +1,4 @@ -import Sequelize from 'sequelize' +import * as Sequelize from 'sequelize' import { Service as Database } from '../..' describe('Sequelize::start()', () => { diff --git a/packages/sequelize/test/service/stop.test.mjs b/packages/sequelize/test/service/stop.test.mjs index fc0342d..c77288a 100644 --- a/packages/sequelize/test/service/stop.test.mjs +++ b/packages/sequelize/test/service/stop.test.mjs @@ -1,4 +1,4 @@ -import Sequelize from 'sequelize' +import * as Sequelize from 'sequelize' import { Service as Database } from '../..' describe('Sequelize::stop()', () => { diff --git a/packages/templates/src/action.mjs b/packages/templates/src/action.mjs index 92cd1fc..e3ba2a9 100644 --- a/packages/templates/src/action.mjs +++ b/packages/templates/src/action.mjs @@ -1,5 +1,5 @@ -import path from 'path' -import consolidate from 'consolidate' +import * as path from 'path' +import * as consolidate from 'consolidate' import Action from '@atlas.js/action' import { FrameworkError } from '@atlas.js/errors' diff --git a/test/bootstrap.mjs b/test/bootstrap.mjs index 3a67c13..ad6812d 100644 --- a/test/bootstrap.mjs +++ b/test/bootstrap.mjs @@ -1,7 +1,7 @@ -import sinon from 'sinon' -import chai from 'chai' -import chaiAsPromised from 'chai-as-promised' -import sinonChai from 'sinon-chai' +import * as sinon from 'sinon' +import * as chai from 'chai' +import * as chaiAsPromised from 'chai-as-promised' +import * as sinonChai from 'sinon-chai' // Make sure our tests always run in the 'test' environment // eslint-disable-next-line no-process-env