Skip to content

Commit b7b18c4

Browse files
Rename scripts/generators to .cjs for ESM migration
1 parent bc18c54 commit b7b18c4

41 files changed

Lines changed: 55 additions & 55 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

binding.gyp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
}
99
},
1010
'variables': {
11-
'ros_version': '<!(node scripts/ros_distro.js)',
11+
'ros_version': '<!(node scripts/ros_distro.cjs)',
1212
'runtime%': 'node',
13-
'ros_lib_dir': "<!(node -p \"require('./scripts/config.js').getROSLibPath()\")",
14-
'ros_include_root': "<!(node -p \"require('./scripts/config.js').getROSIncludeRootPath()\")",
13+
'ros_lib_dir': "<!(node -p \"require('./scripts/config.cjs').getROSLibPath()\")",
14+
'ros_include_root': "<!(node -p \"require('./scripts/config.cjs').getROSIncludeRootPath()\")",
1515
'node_major_version': '<!(node -p \"process.versions.node.split(\'.\')[0]\")',
1616
},
1717
'targets': [
@@ -167,7 +167,7 @@
167167
# After Galactic, e.g., Humble, Jazzy, Rolling.
168168
'ros_version > 2105', {
169169
'include_dirs': [
170-
"<!@(node -p \"require('./scripts/config.js').getIncludePaths().forEach(p => console.log(JSON.stringify(p)))\")"
170+
"<!@(node -p \"require('./scripts/config.cjs').getIncludePaths().forEach(p => console.log(JSON.stringify(p)))\")"
171171
],
172172
'library_dirs': [
173173
'<(ros_lib_dir)',

example/rosidl/README.md

Lines changed: 1 addition & 1 deletion

example/rosidl/rosidl-parse-action-example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
const rosInstallPath = process.env.AMENT_PREFIX_PATH;
1616
const packageName = 'test_msgs';
1717
const packagePath = rosInstallPath + '/share/test_msgs/action/Fibonacci.action';
18-
const parser = require('../../rosidl_parser/rosidl_parser.js');
18+
const parser = require('../../rosidl_parser/rosidl_parser.cjs');
1919

2020
parser
2121
.parseActionFile(packageName, packagePath)

example/rosidl/rosidl-parse-msg-example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
'use strict';
1616

17-
const parser = require('../../rosidl_parser/rosidl_parser.js');
17+
const parser = require('../../rosidl_parser/rosidl_parser.cjs');
1818

1919
const rosInstallPath = process.env.AMENT_PREFIX_PATH;
2020
const packageName = 'std_msgs';

example/rosidl/rosidl-parse-srv-example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
'use strict';
1616

17-
const parser = require('../../rosidl_parser/rosidl_parser.js');
17+
const parser = require('../../rosidl_parser/rosidl_parser.cjs');
1818

1919
const rosInstallPath = process.env.AMENT_PREFIX_PATH;
2020
const packageName = 'std_srvs';

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const Context = require('./lib/context.js');
2525
const debug = require('debug')('rclnodejs');
2626
const Duration = require('./lib/duration.js');
2727
const fs = require('fs');
28-
const generator = require('./rosidl_gen/index.js');
28+
const generator = require('./rosidl_gen/index.cjs');
2929
const loader = require('./lib/interface_loader.js');
3030
const logging = require('./lib/logging.js');
3131
const NodeOptions = require('./lib/node_options.js');
@@ -40,7 +40,7 @@ const {
4040
const path = require('path');
4141
const QoS = require('./lib/qos.js');
4242
const rclnodejs = require('./lib/native_loader.js');
43-
const tsdGenerator = require('./rostsd_gen/index.js');
43+
const tsdGenerator = require('./rostsd_gen/index.cjs');
4444
const validator = require('./lib/validator.js');
4545
const Time = require('./lib/time.js');
4646
const ActionClient = require('./lib/action/client.js');

lib/interface_loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
const path = require('path');
1818
const fs = require('fs');
19-
const generator = require('../rosidl_gen/index.js');
19+
const generator = require('../rosidl_gen/index.cjs');
2020
const { TypeValidationError, ValidationError } = require('./errors.js');
2121

2222
let interfaceLoader = {

lib/message_introspector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'use strict';
1616

1717
const loader = require('./interface_loader.js');
18-
const { toPlainObject } = require('../rosidl_gen/message_translator.js');
18+
const { toPlainObject } = require('../rosidl_gen/message_translator.cjs');
1919
const { TypeValidationError } = require('./errors.js');
2020

2121
/**

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rclnodejs",
33
"version": "1.7.0",
44
"description": "ROS2.0 JavaScript client with Node.js",
5-
"main": "index.js",
5+
"main": "./index.js",
66
"types": "types/index.d.ts",
77
"keywords": [
88
"rclnodejs",
@@ -17,24 +17,24 @@
1717
"build:dev": "node-gyp -j 16 build --debug",
1818
"rebuild": "npm run clean && node-gyp -j 16 rebuild",
1919
"rebuild:dev": "npm run clean && node-gyp -j 16 rebuild --debug",
20-
"generate-messages": "node scripts/generate_messages.js",
21-
"generate-messages-idl": "node scripts/generate_messages.js --idl",
22-
"generate-messages:dev": "node scripts/generate_messages.js --debug",
23-
"generate-tsd-messages": "node scripts/generate_tsd.js",
20+
"generate-messages": "node scripts/generate_messages.cjs",
21+
"generate-messages-idl": "node scripts/generate_messages.cjs --idl",
22+
"generate-messages:dev": "node scripts/generate_messages.cjs --debug",
23+
"generate-tsd-messages": "node scripts/generate_tsd.cjs",
2424
"clean": "node-gyp clean && npx rimraf ./generated",
25-
"install": "node scripts/install.js",
25+
"install": "node scripts/install.cjs",
2626
"postinstall": "npm run generate-messages",
2727
"docs": "cd docs && make",
28-
"test": "nyc node --expose-gc ./scripts/run_test.js && tsd",
29-
"test-idl": "nyc node --expose-gc ./scripts/run_test.js --idl",
30-
"lint": "eslint && node ./scripts/cpplint.js",
28+
"test": "nyc node --expose-gc ./scripts/run_test.cjs && tsd",
29+
"test-idl": "nyc node --expose-gc ./scripts/run_test.cjs --idl",
30+
"lint": "eslint && node ./scripts/cpplint.cjs",
3131
"format": "clang-format -i -style=file ./src/*.cpp ./src/*.h && npx --yes prettier --write \"{lib,rosidl_gen,rostsd_gen,rosidl_parser,types,example,test,scripts,benchmark,rostsd_gen}/**/*.{js,md,ts}\" ./*.{js,md,ts}",
3232
"prepare": "husky",
3333
"coverage": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
34-
"prebuild": "prebuildify --napi --strip --target 16.20.2 --target electron@23.0.0 && node scripts/tag_prebuilds.js"
34+
"prebuild": "prebuildify --napi --strip --target 16.20.2 --target electron@23.0.0 && node scripts/tag_prebuilds.cjs"
3535
},
3636
"bin": {
37-
"generate-ros-messages": "./scripts/generate_messages.js"
37+
"generate-ros-messages": "./scripts/generate_messages.cjs"
3838
},
3939
"authors": [
4040
"Minggang Wang <minggangw@gmail.com>",
@@ -100,6 +100,6 @@
100100
"directory": "test/types"
101101
},
102102
"engines": {
103-
"node": ">= 16.13.0"
103+
"node": ">= 18.0.0"
104104
}
105105
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const path = require('path');
1919
const fse = require('../lib/utils.js');
2020
const execFile = require('child_process').execFile;
2121
const pythonExecutable =
22-
require('../rosidl_parser/py_utils').getPythonExecutable('python3');
22+
require('../rosidl_parser/py_utils.cjs').getPythonExecutable('python3');
2323

2424
async function convertIDLToROS2IDL(pkgName, idlFilePath, outputDir) {
2525
const packagePath = path.join(outputDir, pkgName);

0 commit comments

Comments
 (0)