Skip to content

Commit a990048

Browse files
authored
fix(bundle): windows npm error (#3064)
1 parent 5067651 commit a990048

File tree

1 file changed

+32
-28
lines changed

1 file changed

+32
-28
lines changed

scripts/compile/bundle.js

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved
22
// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license
33

4-
const Task = require("data.task");
5-
const I = require("immutable-ext");
6-
const webpack = require("webpack");
7-
const fs = require("fs");
8-
const path = require("path");
9-
const paths = require("../helpers/paths");
4+
const Task = require('data.task');
5+
const I = require('immutable-ext');
6+
const webpack = require('webpack');
7+
const fs = require('fs');
8+
const path = require('path');
9+
const paths = require('../helpers/paths');
10+
const _ = require('lodash');
1011

11-
const toTask = require("futurize").futurize(Task);
12+
const toTask = require('futurize').futurize(Task);
1213
const writeFile = toTask(fs.writeFile);
1314

14-
const { FOLDERNAME, entry, manifest } = require("./entry");
15-
const Minify = require("./minify");
16-
const webpackConfig = require("./webpack.config");
15+
const { FOLDERNAME, entry, manifest } = require('./entry');
16+
const Minify = require('./minify');
17+
const webpackConfig = require('./webpack.config');
1718

1819
const externals = {
19-
react: "React",
20-
"react-dom": "ReactDOM",
21-
"js-beautify": "JSBeautify"
20+
react: 'React',
21+
'react-dom': 'ReactDOM',
22+
'js-beautify': 'JSBeautify'
2223
};
2324

2425
// chunked :: Task Error I.Map
2526
const chunked = prefix =>
2627
webpackConfig
27-
.set("externals", externals)
28-
.setIn(["output", "library"], ["SLDS", "[name]"])
29-
.setIn(["output", "filename"], "[name]") // [name] will already have ".js" appended
28+
.set('externals', externals)
29+
.setIn(['output', 'library'], ['SLDS', '[name]'])
30+
.setIn(['output', 'filename'], '[name]') // [name] will already have ".js" appended
3031
.setIn(
31-
["output", "jsonpFunction"],
32-
`webpackJsonpSLDS_${prefix.replace(new RegExp(path.sep, "g"), "_")}`
32+
['output', 'jsonpFunction'],
33+
`webpackJsonpSLDS_${prefix.replace(
34+
new RegExp(_.escapeRegExp(path.sep), 'g'),
35+
'_'
36+
)}`
3337
)
3438
.set(
35-
"plugins",
39+
'plugins',
3640
I.List.of(
3741
new webpack.optimize.CommonsChunkPlugin({
3842
name: `${prefix}/common.js`,
@@ -43,23 +47,23 @@ const chunked = prefix =>
4347

4448
// chunkedConfigs :: Task Error (I.List WebpackCfg)
4549
const chunkedConfigs = entry.map(entryMap =>
46-
entryMap.map((entry, prefix) => chunked(prefix).set("entry", entry)).toList()
50+
entryMap.map((entry, prefix) => chunked(prefix).set('entry', entry)).toList()
4751
);
4852

4953
// umd :: WebpackCfg
5054
const umd = webpackConfig
51-
.set("entry", "./scripts/compile/slds.js")
52-
.setIn(["output", "library"], "SLDS")
53-
.setIn(["output", "libraryTarget"], "umd")
54-
.setIn(["output", "filename"], `${FOLDERNAME}/slds.umd.js`);
55+
.set('entry', './scripts/compile/slds.js')
56+
.setIn(['output', 'library'], 'SLDS')
57+
.setIn(['output', 'libraryTarget'], 'umd')
58+
.setIn(['output', 'filename'], `${FOLDERNAME}/slds.umd.js`);
5559

5660
// Task Error (List WebpackCfg)
5761
const configs = chunkedConfigs.map(cfgs =>
5862
cfgs
5963
.unshift(umd)
6064
.filter(
6165
c =>
62-
I.Map.isMap(c.get("entry")) ? c.get("entry").count() : c.has("entry")
66+
I.Map.isMap(c.get('entry')) ? c.get('entry').count() : c.has('entry')
6367
)
6468
);
6569

@@ -71,7 +75,7 @@ const watch = (options = {}) =>
7175
webpack(cfgs.toJS()).watch(options, (err, stats) => {
7276
if (err) return reject(err);
7377
if (stats.hasErrors()) {
74-
const errors = stats.toJson().errors.join("\n\n");
78+
const errors = stats.toJson().errors.join('\n\n');
7579
console.log(errors);
7680
}
7781
resolve(stats);
@@ -109,7 +113,7 @@ const compileLibs = () =>
109113
configs
110114
.map(cfgs =>
111115
cfgs.map(cfg =>
112-
cfg.update("plugins", plugins =>
116+
cfg.update('plugins', plugins =>
113117
(plugins || I.List()).push(new Minify())
114118
)
115119
)
@@ -120,7 +124,7 @@ const writeManifest = () =>
120124
manifest
121125
.map(m => JSON.stringify(m, null, 2))
122126
.chain(contents =>
123-
writeFile(path.join(paths.dist, "manifest.json"), contents)
127+
writeFile(path.join(paths.dist, 'manifest.json'), contents)
124128
);
125129

126130
// createLibrary :: Path -> Task Error (List Stats)

0 commit comments

Comments
 (0)