Improve ESM usage of Babylon

Author: me4502

.eslintrc.js

@@ -22,7 +22,7 @@ module.exports = {
     rules: {
         '@typescript-eslint/consistent-type-imports': [
             'error',
-            { prefer: 'type-imports' },
+            { prefer: 'type-imports', fixStyle: 'inline-type-imports' },
         ],
         '@typescript-eslint/consistent-type-exports': [
             'error',

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

@@ -1,7 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
+
+enableGlobalCache: false
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.0.cjs

.yarn/releases/yarn-3.6.1.cjs

@@ -1,13 +1,25 @@
 {
     "name": "@enginehub/schematicwebviewer",
-    "version": "4.7.0",
+    "version": "4.8.0",
     "description": "A web viewer for modern Minecraft schematics",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",
     "types": "dist/esm/index.d.ts",
     "files": [
         "dist/"
     ],
+    "exports": {
+        ".": {
+            "import": {
+                "default": "./dist/esm/index.js",
+                "types": "./dist/esm/index.d.ts"
+            },
+            "require": {
+                "default": "./dist/cjs/index.js",
+                "types": "./dist/cjs/index.d.ts"
+            }
+        }
+    },
     "scripts": {
         "prepack": "yarn build",
         "clean": "rm -rf dist",
@@ -28,25 +40,25 @@
     },
     "homepage": "https://github.com/EngineHub/SchematicWebViewer#readme",
     "dependencies": {
+        "@babylonjs/core": "^6.26.0",
         "@enginehub/schematicjs": "^0.9.1",
-        "babylonjs": "6.13.0",
         "buffer": "^6.0.3",
         "deepmerge": "^4.3.1",
         "gzip-js": "^0.3.2",
         "jszip": "^3.10.1",
         "nbt-ts": "^1.3.5"
     },
     "devDependencies": {
-        "@types/gzip-js": "^0.3.3",
-        "@typescript-eslint/eslint-plugin": "^5.57.0",
-        "@typescript-eslint/parser": "^5.57.0",
-        "eslint": "^8.45.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "parcel": "^2.9.3",
-        "prettier": "^3.0.0",
-        "prettier-eslint": "^15.0.1",
-        "typescript": "^5.1.6"
+        "@types/gzip-js": "^0.3.4",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
+        "eslint": "^8.52.0",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-prettier": "^5.0.1",
+        "parcel": "^2.10.1",
+        "prettier": "^3.0.3",
+        "prettier-eslint": "^16.1.1",
+        "typescript": "^5.2.2"
     },
     "browserslist": [
         "last 1 Chrome version"
@@ -55,5 +67,5 @@
         "process": false
     },
     "sideEffects": false,
-    "packageManager": "yarn@3.6.1"
+    "packageManager": "yarn@4.0.0"
 }

.yarn/releases/yarn-4.0.0.cjs

@@ -1,18 +1,4 @@
 import type { Block } from '@enginehub/schematicjs';
-import type { InstancedMesh, Material, Mesh, Scene } from 'babylonjs';
-import {
-    Axis,
-    Color3,
-    Color4,
-    MeshBuilder,
-    MultiMaterial,
-    Space,
-    StandardMaterial,
-    SubMesh,
-    Texture,
-    Vector3,
-    Vector4,
-} from 'babylonjs';
 import deepmerge from 'deepmerge';
 import type { ResourceLoader } from '../../resource/resourceLoader';
 import { TRANSPARENT_BLOCKS } from '../utils';
@@ -26,6 +12,23 @@ import type {
     Vector,
 } from './types';
 import { POSSIBLE_FACES } from './types';
+import {
+    Axis,
+    Color3,
+    Color4,
+    type InstancedMesh,
+    type Material,
+    type Mesh,
+    MeshBuilder,
+    MultiMaterial,
+    type Scene,
+    Space,
+    StandardMaterial,
+    SubMesh,
+    Texture,
+    Vector3,
+    Vector4,
+} from '@babylonjs/core';
 
 const TINT_COLOR = new Color4(145 / 255, 189 / 255, 89 / 255, 1);
 const WATER_COLOR = new Color4(36 / 255, 57 / 255, 214 / 255, 1);

.yarnrc.yml

@@ -12,19 +12,19 @@ import {
     NON_OCCLUDING_BLOCKS,
     parseNbt,
 } from './utils';
+import { loadBlockStateDefinition } from './model/parser';
+import { addArrowToScene, addBarsToScene } from './shapes';
 import {
-    Engine,
-    Scene,
-    Vector3,
     ArcRotateCamera,
-    HemisphericLight,
     Color3,
     Color4,
+    Engine,
+    HemisphericLight,
     Mesh,
+    Scene,
     ScenePerformancePriority,
-} from 'babylonjs';
-import { loadBlockStateDefinition } from './model/parser';
-import { addArrowToScene, addBarsToScene } from './shapes';
+    Vector3,
+} from '@babylonjs/core';
 
 const CASSETTE_DECK_URL = `https://services.enginehub.org/cassette-deck/minecraft-versions/find?dataVersion=`;
 const URL_1_13 =

package.json

@@ -1,5 +1,10 @@
-import type { Scene } from 'babylonjs';
-import { Axis, Color3, MeshBuilder, StandardMaterial } from 'babylonjs';
+import {
+    type Scene,
+    Axis,
+    Color3,
+    MeshBuilder,
+    StandardMaterial,
+} from '@babylonjs/core';
 
 export function addArrowToScene(scene: Scene, cameraOffset: number): void {
     const arrowMaterial = new StandardMaterial('arrow', scene);

src/renderer/model/loader.ts

@@ -1,4 +1,4 @@
-import type { Engine } from 'babylonjs';
+import type { Engine } from '@babylonjs/core';
 
 export interface SchematicHandles {
     /**