Skip to content

Commit 1d176b9

Browse files
author
Daniel Del Core
committed
Internal code changes (import structure) to support ESM
1 parent 5d04aa3 commit 1d176b9

File tree

15 files changed

+38
-33
lines changed

15 files changed

+38
-33
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
#!/usr/bin/env node
2-
const path = require('path');
3-
4-
require(path.join('..', 'dist', 'index.js'));
2+
export * from '@hypermod/cli';

packages/cli-alias/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"start:dev": "tsx src/index.ts"
1717
},
1818
"dependencies": {
19-
"@hypermod/cli": "^0.24.0",
19+
"@hypermod/cli": "^0.24.0"
20+
},
21+
"devDependencies": {
2022
"tsx": "^4.19.1"
2123
},
2224
"engines": {

packages/cli/bin/hypermod-cli.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
#!/usr/bin/env node
2-
const path = require('path');
3-
4-
require(path.join('..', 'dist', 'index.js'));
2+
export * from '../dist/index.js';

packages/cli/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
"live-plugin-manager": "^0.18.1",
3434
"lodash": "^4.17.21",
3535
"ora": "^5.4.1",
36-
"semver": "^7.3.5",
36+
"semver": "^7.3.5"
37+
},
38+
"devDependencies": {
3739
"tsx": "^4.19.1"
3840
},
3941
"engines": {

packages/cli/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { readFileSync } from 'fs';
33
import chalk from 'chalk';
44
import { Command, Option, CommanderError } from 'commander';
55

6-
import main from './main';
7-
import list from './list';
8-
import init from './init';
9-
import validate from './validate';
10-
import { InvalidUserInputError, InvalidConfigError } from './errors';
6+
import main from './main.js';
7+
import list from './list.js';
8+
import init from './init.js';
9+
import validate from './validate.js';
10+
import { InvalidUserInputError, InvalidConfigError } from './errors.js';
1111

1212
const packageJson = readFileSync(
1313
path.join(__dirname, '..', 'package.json'),

packages/cli/src/list.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.mock('live-plugin-manager');
33
import chalk from 'chalk';
44
import { PluginManager } from 'live-plugin-manager';
55

6-
import list from './list';
6+
import list from './list.js';
77

88
describe('list', () => {
99
beforeEach(() => {

packages/cli/src/list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import chalk from 'chalk';
22
import { PluginManager } from 'live-plugin-manager';
33

4-
import { fetchPackages } from './utils/fetch-package';
5-
import { getHypermodPackageName } from './utils/package-names';
4+
import { fetchPackages } from './utils/fetch-package.js';
5+
import { getHypermodPackageName } from './utils/package-names.js';
66

77
export default async function list(packages: string[]) {
88
const packageManager = new PluginManager() as any;

packages/cli/src/main.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import globby from 'globby';
1212

1313
import * as core from '@hypermod/core';
1414

15-
import main from './main';
15+
import main from './main.js';
1616

1717
const mockPath = 'src/pages/home-page/';
1818

packages/cli/src/main.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@ import {
1111
fetchConfigAtPath,
1212
} from '@hypermod/fetcher';
1313

14-
import { InvalidUserInputError } from './errors';
15-
import { fetchPackages } from './utils/fetch-package';
16-
import { mergeConfigs } from './utils/merge-configs';
17-
import { fetchConfigsForWorkspaces, getPackageJson } from './utils/file-system';
18-
import ModuleLoader from './utils/module-loader';
19-
import { getConfigPrompt, getMultiConfigPrompt } from './prompt';
14+
import { InvalidUserInputError } from './errors.js';
15+
import { fetchPackages } from './utils/fetch-package.js';
16+
import { mergeConfigs } from './utils/merge-configs.js';
17+
import {
18+
fetchConfigsForWorkspaces,
19+
getPackageJson,
20+
} from './utils/file-system.js';
21+
import ModuleLoader from './utils/module-loader.js';
22+
import { getConfigPrompt, getMultiConfigPrompt } from './prompt.js';
2023

2124
export default async function main(
2225
paths: string[],

packages/cli/src/utils/fetch-package.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '@hypermod/fetcher';
1010
import { isValidConfig } from '@hypermod/validator';
1111

12-
import { getHypermodPackageName } from './package-names';
12+
import { getHypermodPackageName } from './package-names.js';
1313

1414
export async function fetchPackages(
1515
packageName: string,

0 commit comments

Comments
 (0)