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: replaced merge-dirs dependency by fs-extra #7100

Merged
merged 2 commits into from
Jun 16, 2019
Merged

cli: replaced merge-dirs dependency by fs-extra #7100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bd6121
cli: replaced merge-dirs dependency by fs-extra
debel27 Jun 15, 2019
e0d3ea2
upgraded yarn.lock
debel27 Jun 15, 2019
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
4 changes: 2 additions & 2 deletions lib/cli/generators/ANGULAR/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
editStorybookTsConfig,
Expand Down Expand Up @@ -70,7 +70,7 @@ function editAngularAppTsConfig() {
}

export default async npmOptions => {
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

await addDependencies(npmOptions);
editAngularAppTsConfig();
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/EMBER/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/HTML/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import npmInit from '../../lib/npm_init';
import {
Expand All @@ -11,7 +11,7 @@ import {

export default async npmOptions => {
const storybookVersion = await getVersion(npmOptions, '@storybook/html');
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

let packageJson = getPackageJson();
if (!packageJson) {
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/MARKO/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -16,7 +16,7 @@ export default async npmOptions => {
'@storybook/addon-knobs'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/METEOR/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from 'path';
import fs from 'fs';
import JSON5 from 'json5';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand Down Expand Up @@ -32,7 +32,7 @@ export default async npmOptions => {
'@babel/preset-react'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();
packageJson.devDependencies = packageJson.devDependencies || {};
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/MITHRIL/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/POLYMER/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
getVersions,
Expand All @@ -14,7 +14,7 @@ export default async npmOptions => {
'@storybook/polymer',
'polymer-webpack-loader'
);
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson() || {}; // Maybe we are in a bower only project, still we need a package json

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/PREACT/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/RAX/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -24,7 +24,7 @@ export default async npmOptions => {
'rax'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/REACT/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/REACT_NATIVE/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import shell from 'shelljs';
import chalk from 'chalk';
Expand Down Expand Up @@ -26,7 +26,7 @@ export default async (npmOptions, installServer) => {
);

// copy all files from the template directory to project directory
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

// set correct project name on entry files if possible
const dirname = shell.ls('-d', 'ios/*.xcodeproj').stdout;
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/REACT_SCRIPTS/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import fs from 'fs';
import semver from 'semver';
Expand All @@ -19,7 +19,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/RIOT/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
getVersions,
Expand All @@ -24,7 +24,7 @@ export default async npmOptions => {
'riot-tag-loader'
);

mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/SFC_VUE/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
getVersions,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/SVELTE/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import {
getVersions,
getPackageJson,
Expand All @@ -26,7 +26,7 @@ export default async npmOptions => {
'svelte-loader'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/VUE/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
getVersions,
Expand Down Expand Up @@ -27,7 +27,7 @@ export default async npmOptions => {
'@babel/core'
);

mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/generators/WEBPACK_REACT/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mergeDirs from 'merge-dirs';
import fse from 'fs-extra';
import path from 'path';
import {
getVersions,
Expand All @@ -17,7 +17,7 @@ export default async npmOptions => {
'@storybook/addons'
);

mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });

const packageJson = getPackageJson();

Expand Down
2 changes: 1 addition & 1 deletion lib/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"commander": "^2.19.0",
"core-js": "^3.0.1",
"cross-spawn": "^6.0.5",
"fs-extra": "^8.0.1",
"inquirer": "^6.2.0",
"jscodeshift": "^0.6.3",
"json5": "^2.1.0",
"merge-dirs": "^0.2.1",
"semver": "^6.0.0",
"shelljs": "^0.8.3",
"update-notifier": "^3.0.0"
Expand Down
Loading