Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/dev/buildTools/src/packageMapping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export type DevPackageName =
| "loaders"
| "serializers"
| "inspector"
| "inspector-v2"
| "post-processes"
| "procedural-textures"
| "node-editor"
Expand All @@ -33,6 +34,7 @@ export type UMDPackageName =
| "babylonjs-materials"
| "babylonjs-procedural-textures"
| "babylonjs-inspector"
| "babylonjs-inspector-v2"
| "babylonjs-node-editor"
| "babylonjs-node-geometry-editor"
| "babylonjs-node-render-graph-editor"
Expand Down Expand Up @@ -124,6 +126,11 @@ export const umdPackageMapping: { [key in UMDPackageName]: { baseDir: string; ba
baseFilename: "babylon.inspector",
isBundle: true,
},
"babylonjs-inspector-v2": {
baseDir: "inspector",
baseFilename: "babylon.inspector-v2",
isBundle: true,
},
"babylonjs-node-editor": {
baseDir: "nodeEditor",
baseFilename: "babylon.nodeEditor",
Expand Down Expand Up @@ -197,6 +204,7 @@ const packageMapping: {
loaders: "babylonjs-loaders",
serializers: "babylonjs-serializers",
inspector: "babylonjs-inspector",
"inspector-v2": "babylonjs-inspector-v2",
"node-editor": (_filePath?: string) => {
// if (filePath && filePath.indexOf("sharedUiComponents") !== -1) {
// return "babylonjs-shared-ui-components";
Expand Down Expand Up @@ -244,6 +252,7 @@ const packageMapping: {
loaders: "@babylonjs/loaders",
serializers: "@babylonjs/serializers",
inspector: "@babylonjs/inspector",
"inspector-v2": "@babylonjs/inspector",
"node-editor": "@babylonjs/node-editor",
"node-geometry-editor": "@babylonjs/node-geometry-editor",
"node-render-graph-editor": "@babylonjs/node-render-graph-editor",
Expand All @@ -266,6 +275,7 @@ const packageMapping: {
loaders: "@babylonjs/esm",
serializers: "@babylonjs/esm",
inspector: "@babylonjs/esm",
"inspector-v2": "@babylonjs/esm",
"node-editor": "@babylonjs/esm",
"node-geometry-editor": "@babylonjs/esm",
"node-render-graph-editor": "@babylonjs/esm",
Expand Down Expand Up @@ -333,6 +343,18 @@ const packageMapping: {
}
return "INSPECTOR";
},
"inspector-v2": (filePath?: string) => {
filePath = filePath?.replaceAll("\\", "/");
if (filePath) {
if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
// was .endsWith
return "INSPECTOR.SharedUIComponents";
} else if (filePath.includes("babylonjs-gltf2interface")) {
return "BABYLON.GLTF2";
}
}
return "INSPECTOR";
},
"node-editor": (filePath?: string) => {
filePath = filePath?.replaceAll("\\", "/");
if (filePath) {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/buildTools/src/prepareSnapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const prepareSnapshot = () => {
Object.keys(umdPackageMapping).forEach((packageName) => {
const metadata = umdPackageMapping[packageName as UMDPackageName];
const corePath = path.join(baseDirectory, "packages", "public", "umd", packageName);
const coreUmd = globSync(`${corePath}/*+(.js|.d.ts|.map)`);
const coreUmd = globSync(`${corePath}/*+(.js|.d.ts|.map)`).filter((file) => path.basename(file) !== "webpack.config.js");
for (const file of coreUmd) {
copyFile(file, path.join(snapshotDirectory, metadata.baseDir, path.basename(file)), true);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/public/umd/babylonjs-inspector-v2/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import * as inspector from "inspector/legacy/legacy";
import * as inspector from "inspector-v2/legacy/legacy";
export { inspector };
export default inspector;
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src",
"declaration": false,
"paths": {
"inspector/*": ["dev/inspector-v2/dist/*"]
}
"declaration": false
},
"include": ["./src/**/*"]
}
7 changes: 1 addition & 6 deletions packages/public/umd/babylonjs-inspector-v2/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"extends": "../../../../tsconfig.json",
"compilerOptions": {
"paths": {
"inspector/*": ["dev/inspector-v2/src/*"]
}
}
"extends": "../../../../tsconfig.json"
}
3 changes: 1 addition & 2 deletions packages/public/umd/babylonjs-inspector-v2/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ module.exports = (env) => {
const commonConfig = commonConfigGenerator({
mode: env.production ? "production" : "development",
devPackageAliasPath: `../../../dev/inspector-v2/dist`,
devPackageName: "inspector",
overrideFilename: "babylon.inspector-v2",
devPackageName: "inspector-v2",
namespace: "INSPECTOR",
outputPath: path.resolve(__dirname),
maxMode: true,
Expand Down