Skip to content

Commit 2528de9

Browse files
authored
1.0.6 streamline release (#14)
* 1.0.6 Streamline release * 1.0.5 fixing the i18n merge issues
1 parent f0a94b6 commit 2528de9

File tree

7 files changed

+50
-46
lines changed

7 files changed

+50
-46
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ install:
88
- "cd packages/react-scripts && npm i"
99
- "cd ../../"
1010
before_deploy:
11+
# I don't think we need to put node_modules in the tarball
12+
- "rm -r packages/react-scripts/node_modules"
1113
- "cd packages && tar -zcf react-scripts-$TRAVIS_TAG.tgz react-scripts"
1214
- "echo \"we should have tarred the script\""
1315
- "ls"

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

+40-38
Original file line numberDiff line numberDiff line change
@@ -402,45 +402,47 @@ module.exports = function(webpackEnv) {
402402
{
403403
loader: require.resolve('webpack-wci18n'),
404404
},
405+
{
406+
loader: require.resolve('babel-loader'),
407+
options: {
408+
babelrc: false,
409+
configFile: false,
410+
compact: false,
411+
presets: [
412+
[
413+
require.resolve('babel-preset-react-app/dependencies'),
414+
{ helpers: true },
415+
],
416+
],
417+
plugins: [
418+
[
419+
require.resolve('babel-plugin-bundled-import-meta'),
420+
{ importStyle: 'iife' },
421+
],
422+
],
423+
cacheDirectory: true,
424+
cacheCompression: isEnvProduction,
425+
// @remove-on-eject-begin
426+
cacheIdentifier: getCacheIdentifier(
427+
isEnvProduction
428+
? 'production'
429+
: isEnvDevelopment && 'development',
430+
[
431+
'babel-plugin-named-asset-import',
432+
'babel-preset-react-app',
433+
'react-dev-utils',
434+
'react-scripts',
435+
]
436+
),
437+
// @remove-on-eject-end
438+
// If an error happens in a package, it's possible to be
439+
// because it was compiled. Thus, we don't want the browser
440+
// debugger to show the original code. Instead, the code
441+
// being evaluated would be much more helpful.
442+
sourceMaps: false,
443+
},
444+
},
405445
],
406-
loader: require.resolve('babel-loader'),
407-
options: {
408-
babelrc: false,
409-
configFile: false,
410-
compact: false,
411-
presets: [
412-
[
413-
require.resolve('babel-preset-react-app/dependencies'),
414-
{ helpers: true },
415-
],
416-
],
417-
plugins: [
418-
[
419-
require.resolve('babel-plugin-bundled-import-meta'),
420-
{ importStyle: 'iife' },
421-
],
422-
],
423-
cacheDirectory: true,
424-
cacheCompression: isEnvProduction,
425-
// @remove-on-eject-begin
426-
cacheIdentifier: getCacheIdentifier(
427-
isEnvProduction
428-
? 'production'
429-
: isEnvDevelopment && 'development',
430-
[
431-
'babel-plugin-named-asset-import',
432-
'babel-preset-react-app',
433-
'react-dev-utils',
434-
'react-scripts',
435-
]
436-
),
437-
// @remove-on-eject-end
438-
// If an error happens in a package, it's possible to be
439-
// because it was compiled. Thus, we don't want the browser
440-
// debugger to show the original code. Instead, the code
441-
// being evaluated would be much more helpful.
442-
sourceMaps: false,
443-
},
444446
},
445447
// "postcss" loader applies autoprefixer to our CSS.
446448
// "css" loader resolves paths in CSS and adds assets as dependencies.

packages/react-scripts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-scripts",
33
"version": "2.1.2",
4-
"frontierVersion": "1.0.4",
4+
"frontierVersion": "1.0.6",
55
"description": "Configuration and scripts for Create React App.",
66
"repository": "fs-webdev/create-react-app",
77
"license": "MIT",

packages/react-scripts/scripts/utils/frontierInit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function installFrontierDependencies(appPath, answers, useYarn, ownPath) {
5353
const defaultModules = [
5454
5555
56-
'fs-webdev/exo'
56+
'fs-webdev/exo',
5757
];
5858
installModulesSync(defaultModules, useYarn);
5959
}

packages/react-scripts/template-redux/src/setupProxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// docs here: https://github.com/fs-webdev/exo#proxy
33
const setProxies = require('exo/proxy');
44

5-
module.exports = (app) => {
5+
module.exports = app => {
66
setProxies(app);
7-
}
7+
};

packages/react-scripts/template-typescript/src/setupProxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// docs here: https://github.com/fs-webdev/exo#proxy
33
const setProxies = require('exo/proxy');
44

5-
module.exports = (app) => {
5+
module.exports = app => {
66
setProxies(app);
7-
}
7+
};

packages/react-scripts/template/src/setupProxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// docs here: https://github.com/fs-webdev/exo#proxy
33
const setProxies = require('exo/proxy');
44

5-
module.exports = (app) => {
5+
module.exports = app => {
66
setProxies(app);
7-
}
7+
};

0 commit comments

Comments
 (0)