Skip to content

Commit

Permalink
馃敡 Use babel-plugin-module-extension-resolver`
Browse files Browse the repository at this point in the history
  • Loading branch information
carloscuesta committed Sep 27, 2022
1 parent cc0be44 commit 9aec7df
Show file tree
Hide file tree
Showing 31 changed files with 74 additions and 67 deletions.
3 changes: 2 additions & 1 deletion babel.config.json
Expand Up @@ -13,7 +13,8 @@
}
}
],
"@babel/plugin-syntax-import-assertions"
"@babel/plugin-syntax-import-assertions",
"module-extension-resolver"
],
"env": {
"test": {
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -64,6 +64,7 @@
"@babel/plugin-syntax-import-assertions": "^7.18.6",
"@babel/preset-env": "7.19.1",
"@babel/preset-flow": "7.18.6",
"babel-plugin-module-extension-resolver": "^1.0.0-rc.2",
"babel-plugin-module-resolver": "^4.1.0",
"babel-plugin-transform-import-meta": "^2.2.0",
"codecov": "3.8.3",
Expand Down
6 changes: 3 additions & 3 deletions src/cli.js
Expand Up @@ -4,9 +4,9 @@ import meow from 'meow'
import updateNotifier from 'update-notifier'
import { readFileSync } from 'fs'

import commands from '@commands/index.js'
import FLAGS from '@constants/flags.js'
import findGitmojiCommand from '@utils/findGitmojiCommand.js'
import FLAGS from '@constants/flags'
import findGitmojiCommand from '@utils/findGitmojiCommand'
import commands from './commands'

const packageJson: Object = readFileSync(
new URL('../package.json', import.meta.url)
Expand Down
10 changes: 5 additions & 5 deletions src/commands/commit/index.js
@@ -1,14 +1,14 @@
// @flow
import inquirer from 'inquirer'

import getEmojis from '@utils/getEmojis.js'
import COMMIT_MODES from '@constants/commit.js'
import getEmojis from '@utils/getEmojis'
import COMMIT_MODES from '@constants/commit'
import withHook, {
registerHookInterruptionHandler,
cancelIfNeeded
} from './withHook/index.js'
import withClient from './withClient/index.js'
import prompts from './prompts.js'
} from './withHook'
import withClient from './withClient'
import prompts from './prompts'

export type CommitOptions = {
message?: string,
Expand Down
10 changes: 5 additions & 5 deletions src/commands/commit/prompts.js
Expand Up @@ -2,11 +2,11 @@
import inquirer from 'inquirer'
import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'

import configurationVault from '@utils/configurationVault/index.js'
import filterGitmojis from '@utils/filterGitmojis.js'
import getDefaultCommitContent from '@utils/getDefaultCommitContent.js'
import { type CommitOptions } from './index.js'
import guard from './guard.js'
import configurationVault from '@utils/configurationVault'
import filterGitmojis from '@utils/filterGitmojis'
import getDefaultCommitContent from '@utils/getDefaultCommitContent'
import { type CommitOptions } from '.'
import guard from './guard'

const TITLE_MAX_LENGTH_COUNT: number = 48

Expand Down
6 changes: 3 additions & 3 deletions src/commands/commit/withClient/index.js
Expand Up @@ -3,9 +3,9 @@ import { execa } from 'execa'
import fs from 'fs'
import chalk from 'chalk'

import isHookCreated from '@utils/isHookCreated.js'
import configurationVault from '@utils/configurationVault/index.js'
import { type Answers } from '../prompts.js'
import isHookCreated from '@utils/isHookCreated'
import configurationVault from '@utils/configurationVault'
import { type Answers } from '../prompts'

const withClient = async (answers: Answers): Promise<void> => {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/commit/withHook/index.js
Expand Up @@ -2,7 +2,7 @@
import { execa } from 'execa'
import fs from 'fs'

import { type Answers } from '../prompts.js'
import { type Answers } from '../prompts'

const withHook = (answers: Answers) => {
try {
Expand Down
6 changes: 3 additions & 3 deletions src/commands/config/index.js
@@ -1,9 +1,9 @@
// @flow
import inquirer from 'inquirer'

import configurationPrompts from './prompts.js'
import { CONFIG } from '@constants/configuration.js'
import configurationVault from '@utils/configurationVault/index.js'
import configurationPrompts from './prompts'
import { CONFIG } from '@constants/configuration'
import configurationVault from '@utils/configurationVault'

const config = () => {
inquirer.prompt(configurationPrompts()).then((answers) => {
Expand Down
6 changes: 3 additions & 3 deletions src/commands/config/prompts.js
@@ -1,7 +1,7 @@
// @flow
import configurationVault from '@utils/configurationVault/index.js'
import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration.js'
import guard from './guard.js'
import configurationVault from '@utils/configurationVault'
import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration'
import guard from './guard'

export default (): Array<Object> => [
{
Expand Down
4 changes: 2 additions & 2 deletions src/commands/hook/create/index.js
Expand Up @@ -2,8 +2,8 @@
import fs from 'fs'
import ora from 'ora'

import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath.js'
import HOOK from '../hook.js'
import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath'
import HOOK from '../hook'

const createHook = async () => {
const spinner = ora('Creating the gitmoji commit hook').start()
Expand Down
4 changes: 2 additions & 2 deletions src/commands/hook/index.js
@@ -1,5 +1,5 @@
import create from './create/index.js'
import remove from './remove/index.js'
import create from './create'
import remove from './remove'

export default {
create,
Expand Down
4 changes: 2 additions & 2 deletions src/commands/hook/remove/index.js
Expand Up @@ -2,8 +2,8 @@
import fs from 'fs'
import ora from 'ora'

import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath.js'
import HOOK from '../hook.js'
import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath'
import HOOK from '../hook'

const removeHook = async () => {
const spinner = ora('Creating the gitmoji commit hook').start()
Expand Down
12 changes: 6 additions & 6 deletions src/commands/index.js
@@ -1,10 +1,10 @@
// @flow
import commit from './commit/index.js'
import config from './config/index.js'
import hook from './hook/index.js'
import list from './list/index.js'
import search from './search/index.js'
import update from './update/index.js'
import commit from './commit'
import config from './config'
import hook from './hook'
import list from './list'
import search from './search'
import update from './update'

export default {
commit,
Expand Down
6 changes: 3 additions & 3 deletions src/commands/search/index.js
@@ -1,7 +1,7 @@
// @flow
import filterGitmojis from '@utils/filterGitmojis.js'
import getEmojis from '@utils/getEmojis.js'
import printEmojis from '@utils/printEmojis.js'
import filterGitmojis from '@utils/filterGitmojis'
import getEmojis from '@utils/getEmojis'
import printEmojis from '@utils/printEmojis'

const search = (query: string): Promise<void> => {
return getEmojis()
Expand Down
4 changes: 2 additions & 2 deletions src/commands/update/index.js
@@ -1,6 +1,6 @@
// @flow
import getEmojis from '@utils/getEmojis.js'
import printEmojis from '@utils/printEmojis.js'
import getEmojis from '@utils/getEmojis'
import printEmojis from '@utils/printEmojis'

const update = (): Promise<void> =>
getEmojis(true).then((gitmojis) => printEmojis(gitmojis))
Expand Down
2 changes: 1 addition & 1 deletion src/utils/configurationVault/getConfiguration.js
Expand Up @@ -2,7 +2,7 @@ import Conf from 'conf'
import { cwd } from 'process'
import { pathExistsSync } from 'path-exists'

import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration.js'
import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration'

const DEFAULT_CONFIGURATION = {
[CONFIG.AUTO_ADD]: false,
Expand Down
4 changes: 2 additions & 2 deletions src/utils/configurationVault/index.js
@@ -1,6 +1,6 @@
// @flow
import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration.js'
import getConfiguration from './getConfiguration.js'
import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration'
import getConfiguration from './getConfiguration'

const configuration = getConfiguration()

Expand Down
2 changes: 1 addition & 1 deletion src/utils/filterGitmojis.js
@@ -1,7 +1,7 @@
// @flow
import Fuse from 'fuse.js'

import { type Gitmoji } from '@commands/commit/prompts.js'
import { type Gitmoji } from '@commands/commit/prompts'

export const options = {
threshold: 0.5,
Expand Down
4 changes: 2 additions & 2 deletions src/utils/findGitmojiCommand.js
@@ -1,6 +1,6 @@
// @flow
import COMMIT_MODES from '@constants/commit.js'
import FLAGS from '@constants/flags.js'
import COMMIT_MODES from '@constants/commit'
import FLAGS from '@constants/flags'

const getOptionsForCommand = (command: ?string, flags: Object): ?Object => {
const commandsWithOptions = [FLAGS.COMMIT, FLAGS.HOOK]
Expand Down
4 changes: 2 additions & 2 deletions src/utils/getDefaultCommitContent.js
@@ -1,8 +1,8 @@
// @flow
import fs from 'fs'

import { type CommitOptions } from '@commands/commit/index.js'
import COMMIT_MODES from '@constants/commit.js'
import { type CommitOptions } from '@commands/commit'
import COMMIT_MODES from '@constants/commit'

const COMMIT_FILE_PATH_INDEX = 3
const COMMIT_TITLE_LINE_INDEX = 0
Expand Down
6 changes: 3 additions & 3 deletions src/utils/getEmojis.js
Expand Up @@ -3,9 +3,9 @@ import chalk from 'chalk'
import fetch from 'node-fetch'
import ora from 'ora'

import cache from './emojisCache.js'
import buildFetchOptions from './buildFetchOptions.js'
import configurationVault from './configurationVault/index.js'
import cache from './emojisCache'
import buildFetchOptions from './buildFetchOptions'
import configurationVault from './configurationVault'

const getEmojis = async (
skipCache: boolean = false
Expand Down
4 changes: 2 additions & 2 deletions src/utils/isHookCreated.js
@@ -1,8 +1,8 @@
// @flow
import fs from 'fs'

import HOOK from '@commands/hook/hook.js'
import getAbsoluteHooksPath from './getAbsoluteHooksPath.js'
import HOOK from '@commands/hook/hook'
import getAbsoluteHooksPath from './getAbsoluteHooksPath'

const isHookCreated = async (): Promise<?boolean> => {
try {
Expand Down
6 changes: 3 additions & 3 deletions test/commands/commit.spec.js
Expand Up @@ -4,9 +4,9 @@ import fs from 'fs'
import chalk from 'chalk'
const mockProcess = require('jest-mock-process')

import configurationVault from '@utils/configurationVault/index.js'
import getDefaultCommitContent from '@utils/getDefaultCommitContent.js'
import getEmojis from '@utils/getEmojis.js'
import configurationVault from '@utils/configurationVault'
import getDefaultCommitContent from '@utils/getDefaultCommitContent'
import getEmojis from '@utils/getEmojis'
import isHookCreated from '@utils/isHookCreated'
import commit from '@commands/commit'
import guard from '@commands/commit/guard'
Expand Down
2 changes: 1 addition & 1 deletion test/commands/config.spec.js
Expand Up @@ -3,7 +3,7 @@ import inquirer from 'inquirer'
import config from '@commands/config'
import configurationPrompts from '@commands/config/prompts'
import guard from '@commands/config/guard'
import configurationVault from '@utils/configurationVault/index.js'
import configurationVault from '@utils/configurationVault'
import * as stubs from './stubs'

jest.mock('@utils/configurationVault')
Expand Down
2 changes: 1 addition & 1 deletion test/commands/hook.spec.js
Expand Up @@ -2,7 +2,7 @@ import fs from 'fs'

import hook from '@commands/hook'
import hookConfig from '@commands/hook/hook'
import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath.js'
import getAbsoluteHooksPath from '@utils/getAbsoluteHooksPath'
import * as stubs from './stubs'

jest.mock('@utils/getAbsoluteHooksPath')
Expand Down
4 changes: 2 additions & 2 deletions test/commands/list.spec.js
@@ -1,5 +1,5 @@
import getEmojis from '@utils/getEmojis.js'
import printEmojis from '@utils/printEmojis.js'
import getEmojis from '@utils/getEmojis'
import printEmojis from '@utils/printEmojis'
import list from '@commands/list'

import * as stubs from './stubs'
Expand Down
4 changes: 2 additions & 2 deletions test/commands/search.spec.js
@@ -1,5 +1,5 @@
import getEmojis from '@utils/getEmojis.js'
import printEmojis from '@utils/printEmojis.js'
import getEmojis from '@utils/getEmojis'
import printEmojis from '@utils/printEmojis'
import search from '@commands/search'

import * as stubs from './stubs'
Expand Down
4 changes: 2 additions & 2 deletions test/commands/update.spec.js
@@ -1,5 +1,5 @@
import getEmojis from '@utils/getEmojis.js'
import printEmojis from '@utils/printEmojis.js'
import getEmojis from '@utils/getEmojis'
import printEmojis from '@utils/printEmojis'
import update from '@commands/update'

import * as stubs from './stubs'
Expand Down
2 changes: 1 addition & 1 deletion test/utils/configurationVault/defaults.spec.js
@@ -1,4 +1,4 @@
import configurationVault from '@utils/configurationVault/index.js'
import configurationVault from '@utils/configurationVault'

describe('index', () => {
it('should match the module', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/utils/configurationVault/vault.spec.js
@@ -1,4 +1,4 @@
import configurationVault from '@utils/configurationVault/index.js'
import configurationVault from '@utils/configurationVault'
import getConfiguration from '@utils/configurationVault/getConfiguration'
import {
CONFIG,
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Expand Up @@ -1626,6 +1626,11 @@ babel-plugin-jest-hoist@^29.0.2:
"@types/babel__core" "^7.1.14"
"@types/babel__traverse" "^7.0.6"

babel-plugin-module-extension-resolver@^1.0.0-rc.2:
version "1.0.0-rc.2"
resolved "https://registry.yarnpkg.com/babel-plugin-module-extension-resolver/-/babel-plugin-module-extension-resolver-1.0.0-rc.2.tgz#c12a5bc29c478cc87cdf9359188bf500db53eae9"
integrity sha512-nSvCi7Eq079snAYgWbq+VM8eci7OER9MAhDchuxpdimuyJr06x/Stsmc2b6zP5CDv4XR54Etkpf7jOo5NfzgVg==

babel-plugin-module-resolver@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
Expand Down

0 comments on commit 9aec7df

Please sign in to comment.