Skip to content

Commit e26b0e6

Browse files
committed
Use esm where possible
It makes the code of CLI utilities simpler. make test still uses @babel/plugin-transform-modules-commonjs, however, so that fluent-react can transpile the JSX in tests.
1 parent c92deb1 commit e26b0e6

File tree

9 files changed

+9
-26
lines changed

9 files changed

+9
-26
lines changed

fluent-syntax/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ compat.js: $(SOURCES)
2525

2626
.PHONY: test-without-babel-polyfill
2727
test-without-babel-polyfill:
28-
@mocha --recursive --ui tdd --require mocha_setup test/**/*_test.js
28+
@mocha --recursive --ui tdd --require esm test/**/*_test.js
2929

3030
clean:
3131
@rm -f $(PACKAGE).js compat.js

fluent-syntax/mocha_setup.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

fluent/test/fixtures_behavior/make_fixtures.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
const fs = require('fs');
66
const program = require('commander');
77

8-
require('@babel/register')({
9-
plugins: ['@babel/plugin-transform-modules-commonjs']
10-
});
11-
8+
require = require('esm')(module);
129
const FluentSyntax = require('../../../fluent-syntax/src');
1310
const parser = new FluentSyntax.FluentParser({
1411
withSpans: false,

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"commander": "^2.12",
1919
"eslint": "^4.18.1",
2020
"eslint-plugin-mocha": "^4.11.0",
21+
"esm": "^3.0.34",
2122
"fuzzer": "^0.2.1",
2223
"gh-pages": "^1.1.0",
2324
"jsdoc": "^3.5.5",

tools/fluentfmt.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
const fs = require('fs');
66
const program = require('commander');
77

8-
require('@babel/register')({
9-
plugins: ["@babel/plugin-transform-modules-commonjs"]
10-
});
8+
require = require('esm')(module);
119
const FluentSyntax = require('../fluent-syntax/src');
1210

1311
program

tools/format.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ const program = require('commander');
88

99
require('@babel/register')({
1010
plugins: [
11-
"@babel/plugin-proposal-async-generator-functions",
12-
"@babel/plugin-transform-modules-commonjs"
11+
'@babel/plugin-proposal-async-generator-functions',
1312
]
1413
});
14+
require = require('esm')(module);
1515
require('../fluent-intl-polyfill/src');
1616
const Fluent = require('../fluent/src');
1717

tools/fuzz.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ const readline = require('readline');
77
const program = require('commander');
88
const fuzzer = require('fuzzer');
99

10-
require('@babel/register')({
11-
plugins: ["@babel/plugin-transform-modules-commonjs"]
12-
});
10+
require = require('esm')(module);
1311

1412
fuzzer.seed(Math.random() * 1000000000);
1513

tools/parse.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
const fs = require('fs');
66
const program = require('commander');
77

8-
require('@babel/register')({
9-
plugins: ["@babel/plugin-transform-modules-commonjs"]
10-
});
8+
require = require('esm')(module);
119
const FluentSyntax = require('../fluent-syntax/src');
1210

1311
program

tools/serialize.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
const fs = require('fs');
66
const program = require('commander');
77

8-
require('@babel/register')({
9-
plugins: ["@babel/plugin-transform-modules-commonjs"]
10-
});
8+
require = require('esm')(module);
119
const FluentSyntax = require('../fluent-syntax/src');
1210

1311
program

0 commit comments

Comments
 (0)