Skip to content

Commit 91ada6e

Browse files
StreetStriderStreetStrider
committed
migrate to standard esm.
1 parent 39a988b commit 91ada6e

27 files changed

+78
-94
lines changed

‎.eslintrc.js renamed to ‎.eslintrc.cjs

File renamed without changes.

‎Console.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11

2-
require = require('esm')(module)
3-
4-
module.exports = require('./lib/Console')
2+
export { default } from './lib/Console.js'

‎default.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
require = require('esm')(module)
2+
import Console from './Console.js'
33

4-
var Console = require('./Console').default
5-
6-
module.exports = Console()
4+
export default Console()

‎example/overview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
require('console-ultimate')
2+
import 'console-ultimate'
33

44
console.log('console.log()')
55
console.warn('console.warn()')

‎index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// TODO: esm
21

3-
require = require('esm')(module)
2+
import upgrade from './upgrade.js'
43

5-
var upgrade = require('./upgrade')
6-
7-
module.exports = upgrade({})
4+
export default upgrade({})

‎lib/Console.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22

33
var noop = () => void 0
44

5-
import { coalesce } from 'object-path'
65
import kleur from 'kleur'
76

8-
import Writer from './Writer'
9-
import Out from './Out'
10-
import Err from './Err'
11-
import Group from './Group'
12-
import Table from './Table'
13-
import Count from './Count'
14-
import Time from './Time'
15-
import Internal from './Internal'
7+
import object_path from 'object-path'
8+
const { coalesce } = object_path
9+
10+
import Writer from './Writer.js'
11+
import Out from './Out.js'
12+
import Err from './Err.js'
13+
import Group from './Group.js'
14+
import Table from './Table.js'
15+
import Count from './Count.js'
16+
import Time from './Time.js'
17+
import Internal from './Internal.js'
1618

1719

1820
var defaults =

‎lib/Count.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
import prefix from './prefix'
3-
import { time } from './unicode'
2+
import prefix from './prefix.js'
3+
import { time } from './unicode.js'
44

55
var def = Symbol('default')
66

‎lib/Err.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

2-
import { red } from 'kleur'
2+
import kleur from 'kleur'
3+
const { red } = kleur
34

4-
import Thru from './Thru'
5-
import Logformat from './Logformat'
6-
import Errformat from './Errformat'
7-
import { dot } from './unicode'
5+
import Thru from './Thru.js'
6+
import Logformat from './Logformat.js'
7+
import Errformat from './Errformat.js'
8+
import { dot } from './unicode.js'
89

910

1011
export default function Err ({ inspect_with, writer })

‎lib/Errformat.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

22
import Stack from 'stack-utils'
3-
import { red } from 'kleur'
3+
import kleur from 'kleur'
44

5-
import is_colors from './is-colors'
6-
import prefix from './prefix'
7-
import indent from './indent'
8-
import colorize from './colorize'
9-
import { dot } from './unicode'
5+
import is_colors from './is-colors.js'
6+
import prefix from './prefix.js'
7+
import indent from './indent.js'
8+
import colorize from './colorize.js'
9+
import { dot } from './unicode.js'
10+
11+
const { red } = kleur
1012

1113

1214
export default function Errformat (

‎lib/Group.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11

2-
import is_colors from './is-colors'
2+
import kleur from 'kleur'
3+
const { reset } = kleur
4+
const { bold } = kleur
5+
6+
7+
import is_colors from './is-colors.js'
38

49
export default function Group ({ inspect_with, stdout, stderr })
510
{
@@ -43,9 +48,7 @@ export default function Group ({ inspect_with, stdout, stderr })
4348
}
4449

4550

46-
import { reset } from 'kleur'
47-
48-
import indent from './indent'
51+
import indent from './indent.js'
4952

5053
var options =
5154
{
@@ -75,8 +78,6 @@ function title (label, options)
7578
}
7679

7780

78-
import { bold } from 'kleur'
79-
8081
function name (label, { colors, end })
8182
{
8283
if (label)

‎lib/Logformat.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
import { formatWithOptions as format } from './util'
2+
import { formatWithOptions as format } from './util.js'
33

4-
import is_colors from './is-colors'
5-
import prefix from './prefix'
6-
import indent from './indent'
7-
import colorize from './colorize'
8-
import { dot } from './unicode'
4+
import is_colors from './is-colors.js'
5+
import prefix from './prefix.js'
6+
import indent from './indent.js'
7+
import colorize from './colorize.js'
8+
import { dot } from './unicode.js'
99

1010

1111
export default function Logformat (

‎lib/Out.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11

22
import { inspect } from 'util'
33

4-
import { reset, green, blue, magenta, cyan } from 'kleur'
4+
import kleur from 'kleur'
5+
const { reset, green, blue, magenta, cyan } = kleur
56

67
import Name from 'function-name'
78

8-
import Thru from './Thru'
9-
import is_colors from './is-colors'
10-
import prefix from './prefix'
11-
import indent from './indent'
12-
import Logformat from './Logformat'
13-
import { dot } from './unicode'
9+
import Thru from './Thru.js'
10+
import is_colors from './is-colors.js'
11+
import prefix from './prefix.js'
12+
import indent from './indent.js'
13+
import Logformat from './Logformat.js'
14+
import { dot } from './unicode.js'
1415

1516

1617
export default function Out ({ inspect_with, writer })

‎lib/Table.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import T from 'cli-table'
77

88
import len from 'string-length'
99

10-
import { formatWithOptions as format } from './util'
11-
import is_colors from './is-colors'
10+
import { formatWithOptions as format } from './util.js'
11+
import is_colors from './is-colors.js'
1212

1313

1414
var Key = Symbol('⟨Key⟩')

‎lib/Time.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
import hrtime from 'pretty-hrtime'
33

4-
import prefix from './prefix'
5-
import { time as t } from './unicode'
4+
import prefix from './prefix.js'
5+
import { time as t } from './unicode.js'
66

77
var def = Symbol('default')
88

‎package.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "console-ultimate",
3-
"version": "3.0.1",
3+
"version": "4.0.0-pre",
44

55
"description": "Node-compatible console object with extra features",
66

@@ -21,17 +21,14 @@
2121
"node"
2222
],
2323

24-
"esm": true,
25-
26-
"engines":
27-
{
28-
"node": ">= 8.3"
29-
},
24+
"engines": { "node": ">= 8.3" },
3025

3126
"homepage": "https://github.com/StreetStrider/console-ultimate",
3227
"bugs": { "url": "https://github.com/StreetStrider/console-ultimate/issues" },
3328
"repository": { "url": "https://github.com/StreetStrider/console-ultimate.git", "type": "git" },
3429

30+
"type": "module",
31+
3532
"exports":
3633
{
3734
".": "./index.js",
@@ -51,20 +48,17 @@
5148

5249
"scripts":
5350
{
54-
"start": "node -r esm test/start.js",
51+
"start": "node test/start.js",
5552

5653
"st": "eslint *.js lib/ test/",
57-
"unit": "mocha -r esm -r test/globals test/*.test.js",
54+
"unit": "mocha -r test/globals.js test/*.test.js",
5855
"test": "npm run st && npm run unit",
5956

6057
"ex": "node example/overview.js"
6158
},
6259

6360
"dependencies":
6461
{
65-
"esm":
66-
"3.2.25",
67-
6862
"object-path":
6963
"0.11.8",
7064

‎test/.eslintrc.js renamed to ‎test/.eslintrc.cjs

File renamed without changes.

‎test/conform.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import $console from 'console'
3-
import Console from '../Console'
3+
import Console from 'console-ultimate/Console'
44

55
describe('conformance', () =>
66
{

‎test/console.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console', () =>
55
{

‎test/count.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console.count', () =>
55
{

‎test/error.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console.error, console.trace', () =>
55
{

‎test/globals.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11

22
import { expect } from 'chai'
33

4-
{
5-
global.expect = expect
6-
}
7-
8-
{
9-
let { resolve } = require('path')
10-
process.env.NODE_PATH = resolve(__dirname, '..')
11-
// eslint-disable-next-line no-underscore-dangle
12-
require('module')._initPaths()
13-
}
4+
global.expect = expect

‎test/group.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console.group', () =>
55
{

‎test/it-console.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
import Console from '../Console'
2+
import Console from 'console-ultimate/Console'
33

4-
import cat from './cat'
4+
import cat from './cat.js'
55

66
export default function it_console (options)
77
{

‎test/start.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// import Console from './Console'; var console = Console({ colors: false })
44
// import console from './default'
55
// import upgrade from './upgrade'; upgrade({ colors: false })
6-
import '..'
6+
7+
import 'console-ultimate'
78

89
var X = { x: 17, x2: 1, y: true, z: [ null, NaN, /xyz/ ] }
910
var Y = [ X, X, X ]

‎test/table.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console.table', () =>
55
{

‎test/time.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import it_console from './it-console'
2+
import it_console from './it-console.js'
33

44
describe('console.time', () =>
55
{

‎upgrade.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11

2-
require = require('esm')(module)
2+
import Console from './Console.js'
33

4-
var Console = require('./Console').default
5-
6-
module.exports = function upgrade (options)
4+
export default function upgrade (options)
75
{
86
var value = Console(options)
97

0 commit comments

Comments
 (0)