Skip to content

Commit 6fd988a

Browse files
kellyrmilligankellyrmilligan
committed
Merge branch 'next' into feature/serve-app-under-homepage
* next: Fix typos in example monorepo documentation. (facebook#4164) Minor fixes to CI (facebook#4193) Change no-unused-vars 'args' from none to all to show warning on destructured objects Bump babel-related deps (facebook#4159) Remove ref to non free resource (facebook#4160)
2 parents 23ed094 + e8b0d89 commit 6fd988a

File tree

15 files changed

+49
-44
lines changed

15 files changed

+49
-44
lines changed

‎packages/babel-plugin-named-asset-import/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"index.js"
1313
],
1414
"peerDependencies": {
15-
"@babel/core": "7.0.0-beta.41"
15+
"@babel/core": "7.0.0-beta.42"
1616
}
1717
}

‎packages/babel-preset-react-app/index.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ module.exports = function(api, opts) {
7676
// Adds component stack to warning messages
7777
// Adds __self attribute to JSX which React will use for some warnings
7878
development: isEnvDevelopment || isEnvTest,
79+
// Will use the native built-in instead of trying to polyfill
80+
// behavior for any plugins that require one.
81+
useBuiltIns: true,
7982
},
8083
],
8184
isFlowEnabled && [require('@babel/preset-flow').default],
@@ -99,13 +102,6 @@ module.exports = function(api, opts) {
99102
useBuiltIns: true,
100103
},
101104
],
102-
// Transforms JSX
103-
[
104-
require('@babel/plugin-transform-react-jsx').default,
105-
{
106-
useBuiltIns: true,
107-
},
108-
],
109105
// Polyfills the runtime needed for async/await and generators
110106
[
111107
require('@babel/plugin-transform-runtime').default,

‎packages/babel-preset-react-app/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
"dependencies.js"
1313
],
1414
"dependencies": {
15-
"@babel/core": "7.0.0-beta.41",
16-
"@babel/plugin-proposal-class-properties": "7.0.0-beta.41",
17-
"@babel/plugin-syntax-dynamic-import": "7.0.0-beta.41",
18-
"@babel/plugin-transform-classes": "7.0.0-beta.41",
19-
"@babel/plugin-transform-destructuring": "7.0.0-beta.41",
20-
"@babel/plugin-transform-react-constant-elements": "7.0.0-beta.41",
21-
"@babel/plugin-transform-react-display-name": "7.0.0-beta.41",
22-
"@babel/plugin-transform-react-jsx": "7.0.0-beta.41",
23-
"@babel/plugin-transform-regenerator": "7.0.0-beta.41",
24-
"@babel/plugin-transform-runtime": "7.0.0-beta.41",
25-
"@babel/preset-env": "7.0.0-beta.41",
26-
"@babel/preset-flow": "7.0.0-beta.41",
27-
"@babel/preset-react": "7.0.0-beta.41",
15+
"@babel/core": "7.0.0-beta.42",
16+
"@babel/plugin-proposal-class-properties": "7.0.0-beta.42",
17+
"@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.42",
18+
"@babel/plugin-syntax-dynamic-import": "7.0.0-beta.42",
19+
"@babel/plugin-transform-classes": "7.0.0-beta.42",
20+
"@babel/plugin-transform-destructuring": "7.0.0-beta.42",
21+
"@babel/plugin-transform-react-constant-elements": "7.0.0-beta.42",
22+
"@babel/plugin-transform-react-display-name": "7.0.0-beta.42",
23+
"@babel/plugin-transform-regenerator": "7.0.0-beta.42",
24+
"@babel/plugin-transform-runtime": "7.0.0-beta.42",
25+
"@babel/preset-env": "7.0.0-beta.42",
26+
"@babel/preset-flow": "7.0.0-beta.42",
27+
"@babel/preset-react": "7.0.0-beta.42",
2828
"babel-plugin-macros": "2.0.0",
2929
"babel-plugin-transform-dynamic-import": "2.0.0",
3030
"babel-plugin-transform-react-remove-prop-types": "0.4.12"

‎packages/eslint-config-react-app/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ module.exports = {
131131
'no-unused-vars': [
132132
'warn',
133133
{
134-
args: 'none',
134+
args: 'all',
135135
ignoreRestSiblings: true,
136136
},
137137
],

‎packages/eslint-config-react-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"index.js"
1212
],
1313
"peerDependencies": {
14-
"babel-eslint": "^8.0.2",
14+
"babel-eslint": "^8.2.2",
1515
"eslint": "^4.1.1",
1616
"eslint-plugin-flowtype": "^2.34.1",
1717
"eslint-plugin-import": "^2.6.0",

‎packages/react-dev-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"workspaceUtils.js"
3939
],
4040
"dependencies": {
41-
"@babel/code-frame": "7.0.0-beta.41",
41+
"@babel/code-frame": "7.0.0-beta.42",
4242
"address": "1.0.3",
4343
"browserslist": "2.11.3",
4444
"chalk": "2.3.0",

‎packages/react-error-overlay/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"lib/index.js"
3131
],
3232
"devDependencies": {
33-
"@babel/code-frame": "7.0.0-beta.41",
34-
"@babel/core": "7.0.0-beta.41",
35-
"@babel/runtime": "7.0.0-beta.41",
33+
"@babel/code-frame": "7.0.0-beta.42",
34+
"@babel/core": "7.0.0-beta.42",
35+
"@babel/runtime": "7.0.0-beta.42",
3636
"anser": "1.4.6",
3737
"babel-core": "^7.0.0-bridge.0",
38-
"babel-eslint": "^8.0.2",
38+
"babel-eslint": "^8.2.2",
3939
"babel-jest": "^22.1.0",
4040
"babel-loader": "^8.0.0-beta.0",
4141
"babel-preset-react-app": "^3.1.1",

‎packages/react-error-overlay/src/effects/proxyConsole.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const registerReactStack = () => {
2828
// $FlowFixMe
2929
console.reactStack = frames => reactFrameStack.push(frames);
3030
// $FlowFixMe
31-
console.reactStackEnd = frames => reactFrameStack.pop();
31+
console.reactStackEnd = () => reactFrameStack.pop();
3232
}
3333
};
3434

‎packages/react-error-overlay/src/utils/getStackFrames.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { unmap } from './unmapper';
1313

1414
function getStackFrames(
1515
error: Error,
16-
unhandledRejection: boolean = false,
16+
unhandledRejection: boolean = false, // eslint-disable-line
1717
contextSize: number = 3
1818
): Promise<StackFrame[] | null> {
1919
const parsedFrames = parse(error);

‎packages/react-scripts/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"react-scripts": "./bin/react-scripts.js"
2222
},
2323
"dependencies": {
24-
"@babel/core": "7.0.0-beta.41",
25-
"@babel/runtime": "7.0.0-beta.41",
24+
"@babel/core": "7.0.0-beta.42",
25+
"@babel/runtime": "7.0.0-beta.42",
2626
"autoprefixer": "7.2.5",
2727
"babel-core": "7.0.0-bridge.0",
28-
"babel-eslint": "8.2.1",
28+
"babel-eslint": "8.2.2",
2929
"babel-jest": "22.1.0",
3030
"babel-loader": "8.0.0-beta.0",
3131
"babel-plugin-named-asset-import": "^0.1.0",

‎packages/react-scripts/template/README.md

+20-7
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,6 @@ After that, follow the instructions on the screen.
18061806
18071807
Learn more about React Storybook:
18081808
1809-
* Screencast: [Getting Started with React Storybook](https://egghead.io/lessons/react-getting-started-with-react-storybook)
18101809
* [GitHub Repo](https://github.com/storybooks/storybook)
18111810
* [Documentation](https://storybook.js.org/basics/introduction/)
18121811
* [Snapshot Testing UI](https://github.com/storybooks/storybook/tree/master/addons/storyshots) with Storybook + addon/storyshot
@@ -1875,14 +1874,24 @@ monorepo/
18751874
"private": true
18761875
app1/
18771876
package.json:
1878-
"dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
1879-
"devDependencies": ["react-scripts": "2.0.0"]
1877+
"dependencies": {
1878+
"@myorg/comp1": ">=0.0.0",
1879+
"react": "^16.2.0"
1880+
},
1881+
"devDependencies": {
1882+
"react-scripts": "2.0.0"
1883+
}
18801884
src/
18811885
app.js: import comp1 from '@myorg/comp1';
18821886
app2/
18831887
package.json:
1884-
"dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
1885-
"devDependencies": ["react-scripts": "2.0.0"]
1888+
"dependencies": {
1889+
"@myorg/comp1": ">=0.0.0",
1890+
"react": "^16.2.0"
1891+
},
1892+
"devDependencies": {
1893+
"react-scripts": "2.0.0"
1894+
}
18861895
src/
18871896
app.js: import comp1 from '@myorg/comp1';
18881897
comp1/
@@ -1894,8 +1903,12 @@ monorepo/
18941903
package.json:
18951904
"name": "@myorg/comp2",
18961905
"version": "0.1.0",
1897-
"dependencies": ["@myorg/comp1": ">=0.0.0"],
1898-
"devDependencies": ["react": "^16.2.0"]
1906+
"dependencies": {
1907+
"@myorg/comp1": ">=0.0.0"
1908+
},
1909+
"devDependencies": {
1910+
"react": "^16.2.0"
1911+
}
18991912
index.js: import comp1 from '@myorg/comp1'
19001913
```
19011914
* Monorepo tools work on a package level, the same level as an npm package.

‎tasks/e2e-installs.sh

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ root_path=$PWD
7575
if hash npm 2>/dev/null
7676
then
7777
npm i -g npm@latest
78-
npm cache clean || npm cache verify
7978
fi
8079

8180
# Bootstrap monorepo

‎tasks/e2e-kitchensink.sh

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ root_path=$PWD
6868
if hash npm 2>/dev/null
6969
then
7070
npm i -g npm@latest
71-
npm cache clean || npm cache verify
7271
fi
7372

7473
# Bootstrap monorepo

‎tasks/e2e-monorepos.sh

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ root_path=$PWD
6666
if hash npm 2>/dev/null
6767
then
6868
npm i -g npm@latest
69-
npm cache clean || npm cache verify
7069
fi
7170

7271
# Bootstrap create-react-app monorepo

‎tasks/e2e-simple.sh

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ fi
7979
if hash npm 2>/dev/null
8080
then
8181
npm i -g npm@latest
82-
npm cache clean || npm cache verify
8382
fi
8483

8584
# Bootstrap monorepo

0 commit comments

Comments
 (0)