Skip to content

Commit 62ede02

Browse files
JamieDixonJamieDixon
committed
Change version to use pre-commit style rather than appending .1 onto the end
Bump favicon plugin ref to 2.0.0 Change favicon config to use ios rather than iphone key Bump versions
1 parent 32fa420 commit 62ede02

File tree

3 files changed

+93
-85
lines changed

3 files changed

+93
-85
lines changed

‎packages/react-scripts/config/webpack.config.dev.js

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,22 @@ module.exports = {
212212
// https://github.com/facebookincubator/create-react-app/issues/2677
213213
ident: 'postcss',
214214
plugins: () => [
215-
cssimport({
216-
path: [paths.appSrc + '/assets/stylesheets/common'],
217-
onImport: function (files) {
218-
files.forEach(this.addDependency);
219-
}.bind(this)
220-
}),
221-
cssnext({
222-
browsers: [
223-
'>1%',
224-
'last 4 versions',
225-
'Firefox ESR',
226-
'not ie < 9' // React doesn't support IE8 anyway
227-
]
228-
}),
229-
cssFluidGrid(),
230-
require('postcss-flexbugs-fixes'),
215+
cssimport({
216+
path: [paths.appSrc + '/assets/stylesheets/common'],
217+
onImport: function(files) {
218+
files.forEach(this.addDependency);
219+
}.bind(this),
220+
}),
221+
cssnext({
222+
browsers: [
223+
'>1%',
224+
'last 4 versions',
225+
'Firefox ESR',
226+
'not ie < 9', // React doesn't support IE8 anyway
227+
],
228+
}),
229+
cssFluidGrid(),
230+
require('postcss-flexbugs-fixes'),
231231
],
232232
},
233233
},
@@ -270,36 +270,38 @@ module.exports = {
270270
new webpack.NamedModulesPlugin(),
271271
// Makes some environment variables available to the JS code, for example:
272272
// if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
273-
new webpack.DefinePlugin(Object.assign({}, env.stringified, {
274-
'process.locales': JSON.stringify(locales)
275-
})),
273+
new webpack.DefinePlugin(
274+
Object.assign({}, env.stringified, {
275+
'process.locales': JSON.stringify(locales),
276+
})
277+
),
276278
// Favicons and tile icons etc
277279
new HivehomeWebappFaviconsWebpackPlugin({
278-
title: 'Hive Home',
279-
prefix: 'static/media/[hash]-',
280-
platforms: {
281-
generic: {
282-
source: path.join(paths.appSrc, 'assets/icons', 'favicon.png')
283-
},
284-
iphone: {
285-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
286-
statusBar: 'black-translucent'
287-
},
288-
android: {
289-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
290-
themeColor: '#ff8600',
291-
backgroundColor: '#ffffff'
292-
},
293-
windows: {
294-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
295-
tileColor: '#ff8600'
296-
}
297-
}
280+
title: 'Hive Home',
281+
prefix: 'static/media/[hash]-',
282+
platforms: {
283+
generic: {
284+
source: path.join(paths.appSrc, 'assets/icons', 'favicon.png'),
285+
},
286+
ios: {
287+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
288+
statusBar: 'black-translucent',
289+
},
290+
android: {
291+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
292+
themeColor: '#ff8600',
293+
backgroundColor: '#ffffff',
294+
},
295+
windows: {
296+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
297+
tileColor: '#ff8600',
298+
},
299+
},
298300
}),
299301
// Whitelist `react-intl` language files we know we'll need
300302
new webpack.ContextReplacementPlugin(
301-
/react-intl[/\\]locale-data$/,
302-
new RegExp(`^\\.[/\\\\](${languages.join('|')})$`)
303+
/react-intl[/\\]locale-data$/,
304+
new RegExp(`^\\.[/\\\\](${languages.join('|')})$`)
303305
),
304306
// This is necessary to emit hot updates (currently CSS only):
305307
new webpack.HotModuleReplacementPlugin(),

‎packages/react-scripts/config/webpack.config.prod.js

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ module.exports = {
7373
// You can exclude the *.map files from the build during deployment.
7474
devtool: shouldUseSourceMap ? 'source-map' : false,
7575
// In production, we only want to load the polyfills and the app code.
76-
entry: [require.resolve('./polyfills'), paths.appIndexJs, paths.appBrowserUpdateJs],
76+
entry: [
77+
require.resolve('./polyfills'),
78+
paths.appIndexJs,
79+
paths.appBrowserUpdateJs,
80+
],
7781
output: {
7882
// The build folder.
7983
path: paths.appBuild,
@@ -223,22 +227,22 @@ module.exports = {
223227
// https://github.com/facebookincubator/create-react-app/issues/2677
224228
ident: 'postcss',
225229
plugins: () => [
226-
cssimport({
227-
path: [paths.appSrc + '/assets/stylesheets/common'],
228-
onImport: function (files) {
229-
files.forEach(this.addDependency);
230-
}.bind(this)
231-
}),
232-
cssnext({
233-
browsers: [
234-
'>1%',
235-
'last 4 versions',
236-
'Firefox ESR',
237-
'not ie < 9' // React doesn't support IE8 anyway
238-
]
239-
}),
240-
cssFluidGrid(),
241-
require('postcss-flexbugs-fixes'),
230+
cssimport({
231+
path: [paths.appSrc + '/assets/stylesheets/common'],
232+
onImport: function(files) {
233+
files.forEach(this.addDependency);
234+
}.bind(this),
235+
}),
236+
cssnext({
237+
browsers: [
238+
'>1%',
239+
'last 4 versions',
240+
'Firefox ESR',
241+
'not ie < 9', // React doesn't support IE8 anyway
242+
],
243+
}),
244+
cssFluidGrid(),
245+
require('postcss-flexbugs-fixes'),
242246
],
243247
},
244248
},
@@ -298,36 +302,38 @@ module.exports = {
298302
// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
299303
// It is absolutely essential that NODE_ENV was set to production here.
300304
// Otherwise React will be compiled in the very slow development mode.
301-
new webpack.DefinePlugin(Object.assign({}, env.stringified, {
302-
'process.locales': JSON.stringify(locales)
303-
})),
305+
new webpack.DefinePlugin(
306+
Object.assign({}, env.stringified, {
307+
'process.locales': JSON.stringify(locales),
308+
})
309+
),
304310
// Favicons and tile icons etc
305311
new HivehomeWebappFaviconsWebpackPlugin({
306-
title: 'Hive Home',
307-
prefix: 'static/media/[hash]-',
308-
platforms: {
309-
generic: {
310-
source: path.join(paths.appSrc, 'assets/icons', 'favicon.png')
311-
},
312-
iphone: {
313-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
314-
statusBar: 'black-translucent'
315-
},
316-
android: {
317-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
318-
themeColor: '#ff8600',
319-
backgroundColor: '#ffffff'
320-
},
321-
windows: {
322-
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
323-
tileColor: '#ff8600'
324-
}
325-
}
312+
title: 'Hive Home',
313+
prefix: 'static/media/[hash]-',
314+
platforms: {
315+
generic: {
316+
source: path.join(paths.appSrc, 'assets/icons', 'favicon.png'),
317+
},
318+
ios: {
319+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
320+
statusBar: 'black-translucent',
321+
},
322+
android: {
323+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
324+
themeColor: '#ff8600',
325+
backgroundColor: '#ffffff',
326+
},
327+
windows: {
328+
source: path.join(paths.appSrc, 'assets/icons', 'app-icon.png'),
329+
tileColor: '#ff8600',
330+
},
331+
},
326332
}),
327333
// Whitelist `react-intl` language files we know we'll need
328334
new webpack.ContextReplacementPlugin(
329-
/react-intl[/\\]locale-data$/,
330-
new RegExp(`^\\.[/\\\\](${languages.join('|')})$`)
335+
/react-intl[/\\]locale-data$/,
336+
new RegExp(`^\\.[/\\\\](${languages.join('|')})$`)
331337
),
332338
// Minify the code.
333339
new webpack.optimize.UglifyJsPlugin({

‎packages/react-scripts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connected-home/react-scripts",
3-
"version": "1.0.11.1",
3+
"version": "1.0.11-4",
44
"description": "Configuration and scripts for Create React App.",
55
"repository": "facebookincubator/create-react-app",
66
"license": "BSD-3-Clause",
@@ -21,7 +21,7 @@
2121
"react-scripts": "./bin/react-scripts.js"
2222
},
2323
"dependencies": {
24-
"@connected-home/hivehome-webapp-favicons-webpack-plugin": "^1.1.8",
24+
"@connected-home/hivehome-webapp-favicons-webpack-plugin": "^3.0.0",
2525
"autoprefixer": "7.1.2",
2626
"babel-core": "6.25.0",
2727
"babel-eslint": "7.2.3",

0 commit comments

Comments
 (0)