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

riot tag loader missing in cli #4122

Merged
merged 1 commit into from Sep 7, 2018
Merged

riot tag loader missing in cli #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions lib/cli/generators/RIOT/index.js
View file
Open in desktop
Expand Up @@ -3,12 +3,19 @@ import path from 'path';
import { getVersions, getPackageJson, writePackageJson, installBabel } from '../../lib/helpers';

export default async npmOptions => {
const [storybookVersion, actionsVersion, linksVersion, addonsVersion] = await getVersions(
const [
storybookVersion,
actionsVersion,
linksVersion,
addonsVersion,
tagLoaderVersion,
] = await getVersions(
npmOptions,
'@storybook/riot',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addons'
'@storybook/addons',
'riot-tag-loader'
);

mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
Expand All @@ -21,6 +28,11 @@ export default async npmOptions => {
packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
packageJson.devDependencies['@storybook/addons'] = addonsVersion;
if (
!packageJson.devDependencies['riot-tag-loader'] &&
!packageJson.dependencies['riot-tag-loader']
)
packageJson.devDependencies['riot-tag-loader'] = tagLoaderVersion;

await installBabel(npmOptions, packageJson);

Expand Down
18 changes: 9 additions & 9 deletions lib/cli/generators/RIOT/template/stories/MyButton.tag
View file
Open in desktop
@@ -1,17 +1,17 @@
<MyButton>
<my-button>
<button class="buttonStyles" onClick="{ onClick }">
<yield/>
</button>

<style>
.buttonStyles {
border: '1px solid #eee';
border-radius: 3;
background-color: '#FFFFFF';
cursor: 'pointer';
font-size: 15;
padding: '3px 10px';
margin: 10;
border: solid 1px #eee;
border-radius: 3px;
background-color: #FFFFFF;
cursor: pointer;
font-size: 15px;
padding: 3px 10px;
margin: 10px;
}
</style>

Expand All @@ -21,4 +21,4 @@
(() => { console.log('clicked') })).bind(this, e)
}
</script>
</MyButton>
</my-button>
1 change: 0 additions & 1 deletion lib/cli/test/fixtures/riot/package.json
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@
"riot": "latest",
"webpack": "latest",
"webpack-cli": "latest",
"riot-tag-loader": "latest",
"uglifyjs-webpack-plugin": "latest",
"webpack-bundle-analyzer": "latest",
"packer-webpack-plugin": "latest",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/snapshots/riot/package.json
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@
"riot": "latest",
"webpack": "latest",
"webpack-cli": "latest",
"riot-tag-loader": "latest",
"uglifyjs-webpack-plugin": "latest",
"webpack-bundle-analyzer": "latest",
"packer-webpack-plugin": "latest",
Expand All @@ -38,6 +37,7 @@
"@storybook/addon-actions": "^4.0.0-alpha.20",
"@storybook/addon-links": "^4.0.0-alpha.20",
"@storybook/addons": "^4.0.0-alpha.20",
"riot-tag-loader": "^2.1.0",
"@babel/core": "^7.0.0"
},
"peerDependencies": {
Expand Down
18 changes: 9 additions & 9 deletions lib/cli/test/snapshots/riot/stories/MyButton.tag
View file
Open in desktop
@@ -1,17 +1,17 @@
<MyButton>
<my-button>
<button class="buttonStyles" onClick="{ onClick }">
<yield/>
</button>

<style>
.buttonStyles {
border: '1px solid #eee';
border-radius: 3;
background-color: '#FFFFFF';
cursor: 'pointer';
font-size: 15;
padding: '3px 10px';
margin: 10;
border: solid 1px #eee;
border-radius: 3px;
background-color: #FFFFFF;
cursor: pointer;
font-size: 15px;
padding: 3px 10px;
margin: 10px;
}
</style>

Expand All @@ -21,4 +21,4 @@
(() => { console.log('clicked') })).bind(this, e)
}
</script>
</MyButton>
</my-button>