Skip to content

Commit 82b5cf7

Browse files
authored
Merge branch '4ian:master' into master-Official-minor-improvements
2 parents 5318b93 + 02d44e4 commit 82b5cf7

27 files changed

Lines changed: 479 additions & 336 deletions

File tree

GDevelop.js/Bindings/postjs.js

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -369,18 +369,29 @@ const callContextLabels = ['<no context set>'];
369369
*/
370370
function assertAlive(obj, label, gd, className) {
371371
if (!obj.ptr) {
372-
let message = `${label}: object was already destroyed from JavaScript (ptr is 0).`;
373-
374372
const destructionContext = obj._jsDestructionContext;
375-
throw new UseAfterFreeError({
376-
message,
377-
useAfterFreeContext: {
378-
timeSinceDestroyedInMs: destructionContext
379-
? Math.round(performance.now() - destructionContext.time)
380-
: undefined,
381-
destroyedBy: destructionContext ? destructionContext.stack : 'unknown',
382-
},
383-
});
373+
if (destructionContext) {
374+
let message = `${label}: object (${className}) was already destroyed from JavaScript (ptr is 0, _jsDestructionContext is set).`;
375+
376+
throw new UseAfterFreeError({
377+
message,
378+
useAfterFreeContext: {
379+
timeSinceDestroyedInMs: Math.round(
380+
performance.now() - destructionContext.time
381+
),
382+
destroyedBy: destructionContext.stack,
383+
},
384+
});
385+
} else {
386+
let message = `${label}: object (${className}) is a null pointer and might never have been alive (ptr is 0, _jsDestructionContext is not set).`;
387+
388+
throw new UseAfterFreeError({
389+
message,
390+
useAfterFreeContext: {
391+
possiblyNeverAlive: true,
392+
},
393+
});
394+
}
384395
}
385396
if (
386397
className !== null &&

newIDE/app/flow-typed/npm/react-dnd-html5-backend_v2.x.x.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

newIDE/app/flow-typed/npm/react-dnd_v2.x.x.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: 0df5fbd2d164ee9c137293cbb8debfeb
2-
// flow-typed version: 4618dcebd8/react-dnd_v2.x.x/flow_>=v0.98.x
1+
// flow-typed signature: react-dnd_v14
2+
// Manually updated for react-dnd v14 (decorators + DndProvider)
33

44
declare module "react-dnd" {
55
declare type Identifier = string;
@@ -195,23 +195,15 @@ declare module "react-dnd" {
195195
options?: DndOptions<OP>
196196
): Connector<$Shape<OP & CP>, CP>;
197197

198-
// Drag Drop Context
198+
// DndProvider (v14+)
199199
// ----------------------------------------------------------------------
200200

201-
declare type ProviderProps = {
202-
backend: mixed,
203-
children: React$Element<any>,
204-
window?: Object,
201+
declare type DndProviderProps = {
202+
backend: any,
203+
options?: Object,
204+
children: React$Node,
205205
...
206206
};
207207

208-
declare class DragDropContextProvider<ProviderProps> extends React$Component<
209-
ProviderProps
210-
> {
211-
props: ProviderProps;
212-
}
213-
214-
declare function DragDropContext<OP: {...}, CP: {...}>(
215-
backend: mixed
216-
): Connector<$Shape<OP & CP>, CP>;
208+
declare var DndProvider: React$ComponentType<DndProviderProps>;
217209
}

newIDE/app/package-lock.json

Lines changed: 108 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)