Skip to content
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

Jump to bottom

CLI: Fix copyTemplate failures on init #22375

Merged
merged 14 commits into from
May 9, 2023
Merged

CLI: Fix copyTemplate failures on init #22375

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0121d35
make copyTemplate fault-tolerant and less error prone
ndelangen May 3, 2023
ca8ee63
Merge branch 'next' into norbert/fix-22348
ndelangen May 4, 2023
959f537
CLI: Fix server init
shilman May 8, 2023
0c12ac2
CLI: Set URL in server demo stories
shilman May 8, 2023
1d2b175
Server: Add json indexer to preset
shilman May 8, 2023
f99db50
Build: Add server-webpack5 sandbox
shilman May 8, 2023
f8cb089
Server: Add json indexer to preset
shilman May 8, 2023
40f9244
Build: Add server-webpack5 sandbox
shilman May 8, 2023
237105c
Merge branch 'shilman/20627-fix-server-indexer' of github.com:storybo…
shilman May 9, 2023
c236f77
Stricter type
shilman May 9, 2023
b068457
Merge pull request #22460 from storybookjs/shilman/20627-fix-server-i…
shilman May 9, 2023
51f1877
Merge pull request #22443 from storybookjs/shilman/fix-cli-server-init
shilman May 9, 2023
c28cbf9
Merge branch 'next' into norbert/fix-22348
shilman May 9, 2023
3e27457
Merge branch 'norbert/fix-22348' of github.com:storybookjs/storybook …
shilman May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions code/lib/cli/src/generators/ANGULAR/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,15 @@ const generator: Generator<{ projectName: string }> = async (
});
}

const templateDir = join(getCliDir(), 'templates', 'angular', projectType || 'application');
copyTemplate(templateDir, root || undefined);
let projectTypeValue = projectType || 'application';
if (projectTypeValue !== 'application' && projectTypeValue !== 'library') {
projectTypeValue = 'application';
}

const templateDir = join(getCliDir(), 'templates', 'angular', projectTypeValue);
if (templateDir) {
copyTemplate(templateDir, root || undefined);
}

return {
projectName: angularProjectName,
Expand Down
5 changes: 4 additions & 1 deletion code/lib/cli/src/generators/AURELIA/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ const generator: Generator = async (packageManager, npmOptions, options) => {
await baseGenerator(packageManager, npmOptions, options, 'aurelia', {
extraPackages: ['aurelia'],
});

const templateDir = join(getCliDir(), 'templates', 'aurelia');
copyTemplate(templateDir);
if (templateDir) {
copyTemplate(templateDir);
}
};

export default generator;
4 changes: 3 additions & 1 deletion code/lib/cli/src/generators/SERVER/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ const generator: Generator = async (packageManager, npmOptions, options) => {
});

const templateDir = join(getCliDir(), 'templates', 'server');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just get rid of this block of code entirely. I just tested it out on a sample project and will be adding a telescoping PR to do it.

copyTemplate(templateDir);
if (templateDir) {
copyTemplate(templateDir);
}
};

export default generator;