Skip to content

feat: add 'Open in StackBlitz'-button #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 7, 2024
Merged

feat: add 'Open in StackBlitz'-button #219

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc8756c
feat: Add 'Open in StackBlitz'-button
AriPerkkio Aug 5, 2024
f5d402e
feat: Icon-only button
AriPerkkio Aug 6, 2024
9353bd4
fix: pick only text files
AriPerkkio Aug 6, 2024
826d5ee
fix: move file resolving to `runner.takeSnapshot`
AriPerkkio Aug 6, 2024
b010425
fix: code review
AriPerkkio Aug 7, 2024
4d80275
fix: code review
AriPerkkio Aug 7, 2024
946807e
fix: code review
AriPerkkio Aug 7, 2024
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
40 changes: 15 additions & 25 deletions packages/runtime/src/tutorial-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,26 +314,32 @@ export class TutorialRunner {
// first add template files
for (const [filePath, value] of Object.entries(this._currentTemplate || {})) {
if (typeof value === 'string') {
files[removeLeadingSlash(filePath)] = value;
files[filePath.slice(1)] = value;
}
}

// next overwrite with files from editor
for (const [filePath, value] of Object.entries(this._currentFiles || {})) {
if (typeof value === 'string') {
files[removeLeadingSlash(filePath)] = value;
files[filePath.slice(1)] = value;
}
}

const packageJson = parseJson(files['package.json']);

// add start commands
if (files['package.json']) {
const mainCommand = this._currentRunCommands?.mainCommand?.shellCommand;
const prepareCommands = (this._currentRunCommands?.prepareCommands || []).map((c) => c.shellCommand);
const startCommand = [...prepareCommands, mainCommand].filter(Boolean).join(' && ');
let packageJson;

try {
packageJson = JSON.parse(files['package.json']);
} catch {}

// add start commands when missing
if (packageJson && !packageJson.stackblitz?.startCommand) {
const mainCommand = this._currentRunCommands?.mainCommand?.shellCommand;
const prepareCommands = (this._currentRunCommands?.prepareCommands || []).map((c) => c.shellCommand);
const startCommand = [...prepareCommands, mainCommand].filter(Boolean).join(' && ');

files['package.json'] = JSON.stringify({ ...packageJson, stackblitz: { startCommand } }, null, 2);
files['package.json'] = JSON.stringify({ ...packageJson, stackblitz: { startCommand } }, null, 2);
}
}

return { files };
Expand Down Expand Up @@ -521,19 +527,3 @@ async function updateFiles(webcontainer: WebContainer, previousFiles: Files, new

await webcontainer.mount(toFileTree(addedOrModified));
}

function removeLeadingSlash(filePath: string) {
if (filePath.startsWith('/')) {
return filePath.slice(1);
}

return filePath;
}

function parseJson(deserialized: undefined | string): any {
try {
return JSON.parse(deserialized || '{}');
} catch {
return {};
}
}