Skip to content

Commit 6ba18ee

Browse files
author
Joe Seifi
committed
use fs for copy
1 parent 216aecf commit 6ba18ee

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"express": "^4.14.1",
2929
"extract-text-webpack-plugin": "^2.0.0-rc.3",
3030
"file-loader": "^0.10.0",
31+
"fs-extra": "^2.0.0",
3132
"html-webpack-plugin": "^2.28.0",
3233
"image-webpack-loader": "^3.2.0",
3334
"json-loader": "^0.5.4",
34-
"ncp": "^2.0.0",
3535
"node-sass": "^4.5.0",
3636
"numeral": "^2.0.4",
3737
"postcss-cssnext": "^2.9.0",

scripts/server-all.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
var path = require('path')
2-
var express = require('express')
3-
var webpack = require('webpack')
4-
var serveStatic = require('serve-static')
5-
var ncp = require('ncp').ncp
6-
var config = require(path.join(process.cwd(), 'webpack.config'))
7-
var server = express()
8-
var compiler = webpack(config)
1+
const path = require('path')
2+
const fs = require('fs-extra')
3+
const express = require('express')
4+
const webpack = require('webpack')
5+
const serveStatic = require('serve-static')
6+
const config = require(path.join(process.cwd(), 'webpack.config'))
7+
const server = express()
8+
const compiler = webpack(config)
99

1010
const publicStylesPath = path.resolve(__dirname, '../public/workshop/css')
1111
const cssModulesPath = path.resolve(__dirname, '../05-react-css-modules/css')
1212

13-
ncp(publicStylesPath, cssModulesPath, function (err) {
14-
if(err) {
15-
return console.error(err)
16-
}
17-
console.log('Copdied css files')
18-
})
13+
try {
14+
fs.copySync(publicStylesPath, cssModulesPath)
15+
console.log('CSS files copied from ' + publicStylesPath + ' to ' + cssModulesPath)
16+
} catch (err) {
17+
console.error(err)
18+
}
1919

2020
server.use(require('webpack-dev-middleware')(compiler, {
2121
publicPath: config.output.publicPath,

yarn.lock

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,6 +2516,13 @@ fresh@0.5.0:
25162516
version "0.5.0"
25172517
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
25182518

2519+
fs-extra@^2.0.0:
2520+
version "2.0.0"
2521+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
2522+
dependencies:
2523+
graceful-fs "^4.1.2"
2524+
jsonfile "^2.1.0"
2525+
25192526
fs.realpath@^1.0.0:
25202527
version "1.0.0"
25212528
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -2730,7 +2737,7 @@ got@^5.0.0:
27302737
unzip-response "^1.0.2"
27312738
url-parse-lax "^1.0.0"
27322739

2733-
graceful-fs@^4.0.0, graceful-fs@^4.1.2:
2740+
graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
27342741
version "4.1.11"
27352742
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
27362743

@@ -3457,6 +3464,12 @@ json5@^0.5.0:
34573464
version "0.5.1"
34583465
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
34593466

3467+
jsonfile@^2.1.0:
3468+
version "2.4.0"
3469+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
3470+
optionalDependencies:
3471+
graceful-fs "^4.1.6"
3472+
34603473
jsonify@~0.0.0:
34613474
version "0.0.0"
34623475
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -3917,10 +3930,6 @@ ncname@1.0.x:
39173930
dependencies:
39183931
xml-char-classes "^1.0.0"
39193932

3920-
ncp@^2.0.0:
3921-
version "2.0.0"
3922-
resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
3923-
39243933
nearley@^2.7.7:
39253934
version "2.7.14"
39263935
resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.14.tgz#085f7b5d071de73926167bde8627c5b0190cde11"

0 commit comments

Comments
 (0)