javascript/.eslintrc.js

@@ -7,20 +7,20 @@
  * @format
  */
 
-const path = require("path");
+const path = require('path');
 
 module.exports = {
   root: true,
-  ignorePatterns: ["dist/**", "tests/generated/**"],
+  ignorePatterns: ['dist/**', 'tests/generated/**'],
-  extends: ["eslint:recommended", "plugin:prettier/recommended"],
+  extends: ['eslint:recommended', 'plugin:prettier/recommended'],
-  plugins: ["prettier"],
+  plugins: ['prettier'],
   rules: {
-    "no-var": "error",
+    'no-var': 'error',
-    "prefer-arrow-callback": "error",
+    'prefer-arrow-callback': 'error',
-    "prefer-const": "error",
+    'prefer-const': 'error',
-    "prefer-object-spread": "error",
+    'prefer-object-spread': 'error',
-    "prefer-spread": "error",
+    'prefer-spread': 'error',
-    "require-await": "error",
+    'require-await': 'error',
   },
   env: {
     commonjs: true,
@@ -28,44 +28,44 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["**/*.js"],
+      files: ['**/*.js'],
-      parser: "@babel/eslint-parser",
+      parser: '@babel/eslint-parser',
       parserOptions: {
         babelOptions: {
-          configFile: path.join(__dirname, ".babelrc.js"),
+          configFile: path.join(__dirname, '.babelrc.js'),
         },
       },
     },
     {
-      files: ["**/*.ts"],
+      files: ['**/*.ts'],
-      extends: ["plugin:@typescript-eslint/recommended"],
+      extends: ['plugin:@typescript-eslint/recommended'],
-      parser: "@typescript-eslint/parser",
+      parser: '@typescript-eslint/parser',
       parserOptions: {
-        project: path.join(__dirname, "tsconfig.json"),
+        project: path.join(__dirname, 'tsconfig.json'),
       },
-      plugins: ["@typescript-eslint"],
+      plugins: ['@typescript-eslint'],
       rules: {
-        "@typescript-eslint/no-var-requires": "off",
+        '@typescript-eslint/no-var-requires': 'off',
       },
     },
     {
-      files: ["**/.eslintrc.js", "**/just.config.js"],
+      files: ['**/.eslintrc.js', '**/just.config.js'],
       env: {
         node: true,
       },
     },
     {
-      files: ["jest.*", "tests/**"],
+      files: ['jest.*', 'tests/**'],
       env: {
         node: true,
       },
-      extends: ["plugin:jest/recommended"],
+      extends: ['plugin:jest/recommended'],
       globals: {
-        getMeasureCounter: "writable",
+        getMeasureCounter: 'writable',
-        getMeasureCounterMax: "writable",
+        getMeasureCounterMax: 'writable',
-        getMeasureCounterMin: "writable",
+        getMeasureCounterMin: 'writable',
-        Yoga: "writable",
+        Yoga: 'writable',
-        YGBENCHMARK: "writable",
+        YGBENCHMARK: 'writable',
       },
     },
   ],

javascript/.gitignore

@@ -1,3 +1,4 @@
+/binaries
 /build
 /dist
 /node_modules

javascript/CMakeLists.txt

@@ -49,7 +49,7 @@ link_libraries(embind)
 
 add_library(yogaObjLib OBJECT ${SOURCES})
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/build)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/binaries)
 
 add_executable(asmjs-sync $<TARGET_OBJECTS:yogaObjLib>)
 target_link_options(asmjs-sync PUBLIC

javascript/README.md

@@ -44,7 +44,7 @@ For better performance and smaller packages, WebAssembly is preferred to asm.js
 A specific entrypoint may be specified on platforms which do not understand export conditions.
 
 ```ts
-import {loadYoga} from 'yoga-layout/dist/entrypoint/wasm-async';
+import {loadYoga} from 'yoga-layout/wasm-async';
 ```
 
 

javascript/jest.setup.ts

@@ -9,13 +9,13 @@
 
 module.exports = async () => {
   if (process.env['SYNC'] === '1' && process.env['WASM'] === '1') {
-    globalThis.Yoga = require('./dist/entrypoint/wasm-sync');
+    globalThis.Yoga = require('yoga-layout/wasm-sync').default;
   } else if (process.env['SYNC'] === '1') {
-    globalThis.Yoga = require('./dist/entrypoint/asmjs-sync');
+    globalThis.Yoga = require('yoga-layout/asmjs-sync').default;
   } else if (process.env['WASM'] === '1') {
-    globalThis.Yoga = await require('./dist/entrypoint/wasm-async').loadYoga();
+    globalThis.Yoga = await require('yoga-layout/wasm-async').loadYoga();
   } else {
-    globalThis.Yoga = await require('./dist/entrypoint/asmjs-async').loadYoga();
+    globalThis.Yoga = await require('yoga-layout/asmjs-async').loadYoga();
   }
 };
 

javascript/just.config.ts

@@ -21,6 +21,8 @@ import {
   tscTask,
 } from 'just-scripts';
 
+import {readFile, writeFile} from 'fs/promises';
+
 import glob from 'glob';
 import path from 'path';
 import which from 'which';
@@ -84,15 +86,38 @@ task(
   ),
 );
 
+task('prepack-package-json', async () => {
+  const packageJsonPath = path.join(__dirname, 'package.json');
+  const packageJsonContents = await readFile(packageJsonPath);
+  const packageJson = JSON.parse(packageJsonContents.toString('utf-8'));
+
+  recursiveReplace(packageJson, /(.\/src\/.*)\.ts/, '$1.js');
+  await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+});
+
 task(
-  'prepublish',
+  'prepack',
-  parallel(
+  series(
-    'build',
+    parallel('build', tscTask({emitDeclarationOnly: true})),
-    tscTask({emitDeclarationOnly: true}),
     babelTransformTask({dir: 'src'}),
+    'prepack-package-json',
   ),
 );
 
+function recursiveReplace(
+  obj: Record<string, unknown>,
+  pattern: RegExp,
+  replacement: string,
+) {
+  for (const [key, value] of Object.entries(obj)) {
+    if (typeof value === 'string') {
+      obj[key] = value.replace(pattern, replacement);
+    } else if (typeof value === 'object' && value != null) {
+      recursiveReplace(value as Record<string, unknown>, pattern, replacement);
+    }
+  }
+}
+
 function babelTransformTask(opts: {dir: string}) {
   return () => {
     const args = [

javascript/package.json

@@ -7,22 +7,24 @@
     "type": "git",
     "url": "git@github.com:facebook/yoga.git"
   },
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts",
   "exports": {
     ".": {
-      "browser": "./src/entrypoint/wasm-async.js",
+      "browser": "./src/entrypoint/wasm-async.ts",
-      "node": "./src/entrypoint/wasm-async.js",
+      "node": "./src/entrypoint/wasm-async.ts",
-      "default": "./src/entrypoint/asmjs-async.js"
+      "default": "./src/entrypoint/asmjs-async.ts"
     },
     "./sync": {
-      "browser": "./src/entrypoint/asmjs-sync.js",
+      "browser": "./src/entrypoint/asmjs-sync.ts",
-      "node": "./src/entrypoint/wasm-sync.js",
+      "node": "./src/entrypoint/wasm-sync.ts",
-      "default": "./src/entrypoint/asmjs-sync.js"
+      "default": "./src/entrypoint/asmjs-sync.ts"
-    }
+    },
+    "./asmjs-async": "./src/entrypoint/asmjs-async.ts",
+    "./asmjs-sync": "./src/entrypoint/asmjs-sync.ts",
+    "./wasm-async": "./src/entrypoint/wasm-async.ts",
+    "./wasm-sync": "./src/entrypoint/wasm-sync.ts"
   },
   "files": [
-    "dist/**",
+    "binaries/**",
     "src/**"
   ],
   "scripts": {
@@ -31,7 +33,7 @@
     "clean": "just clean",
     "lint": "just lint",
     "lint:fix": "just lint --fix",
-    "prepublish": "just prepublish",
+    "prepack": "just prepack",
     "test": "just test",
     "test:asmjs-async": "just test:asmjs-async",
     "test:asmjs-sync": "just test:asmjs-sync",

javascript/src/entrypoint/_entryAsync.js

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const wrapAsm = require('../wrapAsm');
-
-module.exports = loadAsm => ({
-  loadYoga: () => loadAsm().then(wrapAsm),
-  ...require('../generated/YGEnums'),
-});

javascript/src/entrypoint/_entrySync.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const wrapAsm = require('../wrapAsm');
-module.exports = asm => wrapAsm(asm());

javascript/src/entrypoint/asmjs-async.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const asm = require('../build/asmjs-async');
-module.exports = require('./_entryAsync')(asm);

javascript/src/entrypoint/asmjs-async.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import wrapAssembly from '../wrapAssembly';
+import type {Yoga} from '../wrapAssembly';
+
+export * from '../generated/YGEnums';
+export type {
+  Config,
+  DirtiedFunction,
+  MeasureFunction,
+  Node,
+  Yoga,
+} from '../wrapAssembly';
+
+const loadAssembly = require('../../binaries/asmjs-async');
+
+export async function loadYoga(): Promise<Yoga> {
+  return wrapAssembly(await loadAssembly());
+}

javascript/src/entrypoint/asmjs-sync.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const asm = require('../build/asmjs-sync');
-module.exports = require('./_entrySync')(asm);

javascript/src/entrypoint/asmjs-sync.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import wrapAssembly from '../wrapAssembly';
+
+export * from '../generated/YGEnums';
+export type {
+  Config,
+  DirtiedFunction,
+  MeasureFunction,
+  Node,
+  Yoga,
+} from '../wrapAssembly';
+
+const loadAssembly = require('../../binaries/asmjs-sync');
+const Yoga = wrapAssembly(loadAssembly());
+export default Yoga;

javascript/src/entrypoint/wasm-async.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const asm = require('../build/wasm-async');
-module.exports = require('./_entryAsync')(asm);

javascript/src/entrypoint/wasm-async.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import wrapAssembly from '../wrapAssembly';
+import type {Yoga} from '../wrapAssembly';
+
+export * from '../generated/YGEnums';
+export type {
+  Config,
+  DirtiedFunction,
+  MeasureFunction,
+  Node,
+  Yoga,
+} from '../wrapAssembly';
+
+const loadAssembly = require('../../binaries/wasm-async');
+
+export async function loadYoga(): Promise<Yoga> {
+  return wrapAssembly(await loadAssembly());
+}

javascript/src/entrypoint/wasm-sync.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-const asm = require('../build/wasm-sync');
-module.exports = require('./_entrySync')(asm);

javascript/src/entrypoint/wasm-sync.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import wrapAssembly from '../wrapAssembly';
+
+export * from '../generated/YGEnums';
+export type {
+  Config,
+  DirtiedFunction,
+  MeasureFunction,
+  Node,
+  Yoga,
+} from '../wrapAssembly';
+
+const loadAssembly = require('../../binaries/wasm-sync');
+const Yoga = wrapAssembly(loadAssembly());
+export default Yoga;

javascript/src/index.d.ts

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-import type {Yoga} from './wrapAsm';
-
-export * from './generated/YGEnums';
-export * from './wrapAsm';
-
-export function loadYoga(): Promise<Yoga>;

javascript/src/index.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-// Fallback for when the export map is not followed
-module.exports = require('./entrypoint/asmjs-async');

javascript/src/sync.d.ts

@@ -1,16 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-import type {Yoga} from './wrapAsm';
-
-export * from './generated/YGEnums';
-export * from './wrapAsm';
-
-declare const yoga: Yoga;
-export default yoga;

javascript/src/sync.js

@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-// Fallback for when the export map is not followed
-module.exports = require('./entrypoint/asmjs-sync');

javascript/src/wrapAssembly.d.ts

@@ -187,5 +187,5 @@ export type Yoga = {
   };
 } & typeof YGEnums;
 
-declare const wrapAsm: () => Yoga;
+declare const wrapAsm: (assembly: unknown) => Yoga;
 export default wrapAsm;

javascript/tests/bin/run-bench.ts

@@ -10,6 +10,9 @@
 
 import path from 'path';
 
+import YogaAsmjs from 'yoga-layout/asmjs-sync';
+import YogaWasm from 'yoga-layout/wasm-sync';
+
 const WARMUP_ITERATIONS = 3;
 const BENCHMARK_ITERATIONS = 10;
 
@@ -18,9 +21,7 @@ const testFiles = process.argv.slice(2);
 const testResults = new Map<string, Map<string, number>>();
 
 for (const type of ['asmjs', 'wasm']) {
-  globalThis.Yoga = require(type === 'asmjs'
+  globalThis.Yoga = type === 'asmjs' ? YogaAsmjs : YogaWasm;
-    ? '../../dist/entrypoint/asmjs-sync'
-    : '../../dist/entrypoint/wasm-sync');
 
   for (const file of testFiles) {
     globalThis.YGBENCHMARK = (name: string, fn: () => void) => {

javascript/tsconfig.json

@@ -6,8 +6,11 @@
     "declaration": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
+    // TODO: moduleResolution: "nodenext" is buggy with this if the absolute
+    // path contains any capital letters
+    "forceConsistentCasingInFileNames": false,
     "baseUrl": ".",
+    "moduleResolution": "nodenext",
     "paths": {
       "yoga-layout": ["src"]
     }