Change package name and artefacts

wasm/CMakeLists.txt

@@ -46,13 +46,19 @@ set(EMCC_LINKER_FLAGS
     "-s DISABLE_EXCEPTION_CATCHING=0"
     "-gsource-map"
     "-g"
-    "--emit-tsd mujoco_wasm.d.ts"
+    "--emit-tsd mujoco.d.ts"
 )
 string (REPLACE ";" " " EMCC_LINKER_FLAGS_STR "${EMCC_LINKER_FLAGS}")
 
 add_executable(mujoco_wasm ${MUJOCO_WASM_FILES})
 
-set_target_properties(mujoco_wasm PROPERTIES LINK_FLAGS "${EMCC_LINKER_FLAGS_STR}")
+# Keep the internal target name distinct to avoid colliding with the native
+# `mujoco` library target, but emit artifacts named `mujoco.*` by setting the
+# output name. Also apply the emscripten linker flags to the wasm target.
+set_target_properties(mujoco_wasm PROPERTIES
+    LINK_FLAGS "${EMCC_LINKER_FLAGS_STR}"
+    OUTPUT_NAME "mujoco"
+)
 
 target_link_libraries(mujoco_wasm ccd lodepng mujoco tinyxml2 qhullstatic_r)
 

wasm/README.npm.md

@@ -6,13 +6,13 @@ Official WebAssembly (WASM) bindings for the MuJoCo physics engine, compiled fro
 
 ## Install
 ```sh
-npm install mujoco_wasm
+npm install mujoco
 ```
 
 ## Quick start (ESM / TypeScript)
 
 ```ts
-import loadMujoco from 'mujoco_wasm';
+import loadMujoco from 'mujoco';
 
 const mujoco = await loadMujoco();
 
@@ -190,8 +190,7 @@ This will return a javascript array representation of the values in MuJoCo `mjFR
 ## Notes
 The package is ESM (`type: module`) and ships TypeScript types.
 
-Ensure your bundler or dev server serves the `.wasm` asset from
+Ensure your bundler or dev server serves the `.wasm` asset at runtime.
-`node_modules/mujoco_wasm/` at runtime.
 
 ### Development
 For detailed build instructions see the repository [README](https://github.com/google-deepmind/mujoco/tree/main/wasm#mujoco-javascript-bindings) (Emscripten toolchain, Embind bindings, producing the .wasm artifact, and targets for Node and browser).

wasm/codegen/tests/enums_test_generator.py

@@ -26,8 +26,8 @@ def generate_typescript_enum_tests():
   output = textwrap.dedent("""\
     import 'jasmine';
 
-    import { MainModule } from "../dist/mujoco_wasm"
+    import { MainModule } from "../dist/mujoco"
-    import loadMujoco from "../dist/mujoco_wasm.js"
+    import loadMujoco from "../dist/mujoco.js"
 
     let mujoco: MainModule;
 

wasm/demo_app/app.ts

@@ -14,7 +14,7 @@
 
 import * as THREE from "three"
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"
-import loadMujoco from "../dist/mujoco_wasm.js"
+import loadMujoco from "../dist/mujoco.js"
 
 declare function loadMujoco(): Promise<MainModule>;
 

wasm/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "mujoco_wasm",
+  "name": "mujoco",
   "version": "1.0.0-alpha.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "mujoco_wasm",
+      "name": "mujoco",
       "version": "1.0.0-alpha.1",
       "license": "Apache-2.0",
       "devDependencies": {

wasm/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "mujoco_wasm",
+  "name": "mujoco",
   "version": "1.0.0-alpha.1",
   "description": "MuJoCo JavaScript Bindings",
   "directories": {

wasm/package.npm.json

@@ -1,5 +1,5 @@
 {
-  "name": "mujoco_wasm",
+  "name": "mujoco",
   "version": "0.0.0",
   "description": "MuJoCo WASM bindings",
   "repository": {
@@ -23,13 +23,13 @@
     "javascript",
     "typescript"
   ],
-  "main": "mujoco_wasm.js",
+  "main": "mujoco.js",
-  "types": "mujoco_wasm.d.ts",
+  "types": "mujoco.d.ts",
   "files": [
-    "mujoco_wasm.js",
+    "mujoco.js",
-    "mujoco_wasm.d.ts",
+    "mujoco.d.ts",
-    "mujoco_wasm.wasm",
+    "mujoco.wasm",
-    "mujoco_wasm.wasm.map",
+    "mujoco.wasm.map",
     "README.md"
   ],
   "author": "Google DeepMind",

wasm/tests/bindings_test.ts

@@ -17,9 +17,9 @@ import 'jasmine';
 import {MainModule, MjContact, MjContactVec, MjData, MjLROpt, MjModel,
 MjOption, MjsGeom, MjSolverStat, MjSpec, MjStatistic, MjTimerStat, MjvCamera,
 MjvFigure, MjvGeom, MjvGLCamera, MjvLight, MjvOption, MjvPerturb, MjvScene,
-MjWarningStat, MjVFS, Uint8Buffer} from '../dist/mujoco_wasm.js';
+MjWarningStat, MjVFS, Uint8Buffer} from '../dist/mujoco.js';
 
-import loadMujoco from '../dist/mujoco_wasm.js'
+import loadMujoco from '../dist/mujoco.js'
 
 function assertExists<T>(value: T | null | undefined, message?: string):
 asserts value is T {

wasm/tests/enums_test.ts

@@ -14,8 +14,8 @@
 
 import 'jasmine';
 
-import { MainModule } from "../dist/mujoco_wasm"
+import { MainModule } from "../dist/mujoco"
-import loadMujoco from "../dist/mujoco_wasm.js"
+import loadMujoco from "../dist/mujoco.js"
 
 let mujoco: MainModule;
 

wasm/tests/sandbox/main.ts

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { MainModule, MjData, MjModel } from "../../dist/mujoco_wasm"
+import { MainModule, MjData, MjModel } from "../../dist/mujoco"
-import loadMujoco from "../../dist/mujoco_wasm.js"
+import loadMujoco from "../../dist/mujoco.js"
 
 declare function loadMujoco(): Promise<MainModule>;