Hello
Working on my branch of BJS, I’m now ready to commit, and before that, I run a
npm run format:fix
As I always use to (following advice from @sebavan on my first PR )
But now, a git status
gives such :
On branch tricotou-feature
Your branch is up to date with 'origin/tricotou-feature'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: packages/dev/core/src/Compute/computeEffect.ts
modified: packages/dev/core/src/Engines/nativeEngine.ts
modified: packages/dev/core/src/Engines/thinEngine.ts
modified: packages/dev/core/src/Engines/webgpuEngine.ts
modified: packages/dev/core/src/Materials/Node/Blocks/Dual/clipPlanesBlock.ts
modified: packages/dev/core/src/Materials/effect.ts
modified: packages/dev/core/src/Meshes/Builders/decalBuilder.ts
modified: packages/dev/core/src/Meshes/subMesh.ts
modified: packages/dev/core/src/Misc/khronosTextureContainer2.ts
modified: packages/dev/core/src/Rendering/GlobalIllumination/giRSMManager.ts
modified: packages/dev/core/src/Rendering/edgesRenderer.ts
modified: packages/dev/core/src/Rendering/fluidRenderer/fluidRenderingTargetRenderer.ts
modified: packages/tools/playground/public/templates.json
modified: packages/tools/playground/src/tools/monacoManager.ts
Only the two last files (/tools/
) are my fix (for @roland )
For the other files, a git diff
shows that there were not formatted correctly, according to my npm formatting. For example, the first one :
packages/dev/core/src/Compute/computeEffect.ts
The diff
after my format:fix
is :
- return this._computeSourceCodeOverride ? this._computeSourceCodeOverride : (this._pipelineContext?._getComputeShaderCode() ?? this._computeSourceCode);
+ return this._computeSourceCodeOverride ? this._computeSourceCodeOverride : this._pipelineContext?._getComputeShaderCode() ?? this._computeSourceCode;
(Removed some parenthesis, as far as I can see).
To make it clear : I don’t want to blame anyone here of course Most likely the problem comes from my side… (in the example, the line is from @RaananW in this commit)
My question is : what should I do now ? I don’t want to push a commit modifying 12 files I have no clue about… Maybe my npm
or node
is not up to date, resulting in a formating conflict ?
For you info, I’m running under Linux :
npm --version
10.2.4
node --version
v18.18.0
But I never had this issue (formatting conflict) in the past months…
++
Tricotou