Skip to content

Commit da55e73

Browse files
committed
we basically need the entire sandbox at this point
1 parent 0c74e0e commit da55e73

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

packages/app/src/embed/components/App/index.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,7 @@ export default class App extends React.PureComponent<
229229
sandbox.modules,
230230
sandbox.directories,
231231
currentModulePath,
232-
findMainModule(
233-
sandbox.modules,
234-
sandbox.directories,
235-
sandbox.entry,
236-
sandbox.template
237-
)
232+
findMainModule(sandbox)
238233
);
239234
};
240235

packages/app/src/embed/components/Content/index.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,7 @@ export default class Content extends React.PureComponent<Props, State> {
387387
} = this.props;
388388

389389
const mainModule = isInProjectView
390-
? findMainModule(
391-
sandbox.modules,
392-
sandbox.directories,
393-
sandbox.entry,
394-
sandbox.template
395-
)
390+
? findMainModule(sandbox)
396391
: currentModule;
397392

398393
if (!mainModule) throw new Error('Cannot find main module');

packages/common/src/sandbox/modules.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import memoize from 'lodash/memoize';
2-
import { Module, Directory } from '../types';
3-
import getTemplateDefinition, { TemplateType } from '../templates';
2+
import { Module, Directory, Sandbox } from '../types';
3+
import getTemplateDefinition from '../templates';
44

55
const compareTitle = (
66
original: string,
@@ -249,22 +249,17 @@ export const isMainModule = (
249249
return path.replace('/', '') === entry;
250250
};
251251

252-
export const findMainModule = (
253-
modules: Module[],
254-
directories: Directory[],
255-
entry: string = 'index.js',
256-
template?: TemplateType
257-
) => {
258-
const resolve = resolveModuleWrapped({ modules, directories });
252+
export const findMainModule = (sandbox?: Sandbox) => {
253+
const resolve = resolveModuleWrapped(sandbox);
259254

260255
// first attempt: try loading the entry file if it exists
261256

262-
const entryModule = resolve(entry);
257+
const entryModule = resolve(sandbox.entry);
263258
if (entryModule) return entryModule;
264259

265260
// second attempt: try loading the first file that exists from
266261
// the list of possible defaults in the template defination
267-
const templateDefinition = getTemplateDefinition(template);
262+
const templateDefinition = getTemplateDefinition(sandbox.template);
268263

269264
const defaultOpenedFiles = templateDefinition.getDefaultOpenedFiles({});
270265

@@ -275,7 +270,7 @@ export const findMainModule = (
275270
if (defaultOpenModule) return defaultOpenModule;
276271

277272
// third attempt: give up and load the first file in the list
278-
return modules[0];
273+
return sandbox.modules[0];
279274
};
280275

281276
export const findCurrentModule = (

0 commit comments

Comments
 (0)