Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Upstream #16

Merged
merged 2 commits into from
Mar 22, 2018
Merged

Update Upstream #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2fd8db
Minor fixes to CI (#4193)
ro-savage Mar 21, 2018
058d03f
Fix typos in example monorepo documentation. (#4164)
bradfordlemley Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-error-overlay/src/effects/proxyConsole.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const registerReactStack = () => {
// $FlowFixMe
console.reactStack = frames => reactFrameStack.push(frames);
// $FlowFixMe
console.reactStackEnd = frames => reactFrameStack.pop();
console.reactStackEnd = () => reactFrameStack.pop();
}
};

Expand Down
2 changes: 1 addition & 1 deletion packages/react-error-overlay/src/utils/getStackFrames.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { unmap } from './unmapper';

function getStackFrames(
error: Error,
unhandledRejection: boolean = false,
unhandledRejection: boolean = false, // eslint-disable-line
contextSize: number = 3
): Promise<StackFrame[] | null> {
const parsedFrames = parse(error);
Expand Down
26 changes: 20 additions & 6 deletions packages/react-scripts/template/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,14 +1874,24 @@ monorepo/
"private": true
app1/
package.json:
"dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
"devDependencies": ["react-scripts": "2.0.0"]
"dependencies": {
"@myorg/comp1": ">=0.0.0",
"react": "^16.2.0"
},
"devDependencies": {
"react-scripts": "2.0.0"
}
src/
app.js: import comp1 from '@myorg/comp1';
app2/
package.json:
"dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
"devDependencies": ["react-scripts": "2.0.0"]
"dependencies": {
"@myorg/comp1": ">=0.0.0",
"react": "^16.2.0"
},
"devDependencies": {
"react-scripts": "2.0.0"
}
src/
app.js: import comp1 from '@myorg/comp1';
comp1/
Expand All @@ -1893,8 +1903,12 @@ monorepo/
package.json:
"name": "@myorg/comp2",
"version": "0.1.0",
"dependencies": ["@myorg/comp1": ">=0.0.0"],
"devDependencies": ["react": "^16.2.0"]
"dependencies": {
"@myorg/comp1": ">=0.0.0"
},
"devDependencies": {
"react": "^16.2.0"
}
index.js: import comp1 from '@myorg/comp1'
```
* Monorepo tools work on a package level, the same level as an npm package.
Expand Down
1 change: 0 additions & 1 deletion tasks/e2e-installs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ root_path=$PWD
if hash npm 2>/dev/null
then
npm i -g npm@latest
npm cache clean || npm cache verify
fi

# Bootstrap monorepo
Expand Down
1 change: 0 additions & 1 deletion tasks/e2e-kitchensink.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ root_path=$PWD
if hash npm 2>/dev/null
then
npm i -g npm@latest
npm cache clean || npm cache verify
fi

# Bootstrap monorepo
Expand Down
1 change: 0 additions & 1 deletion tasks/e2e-monorepos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ root_path=$PWD
if hash npm 2>/dev/null
then
npm i -g npm@latest
npm cache clean || npm cache verify
fi

# Bootstrap create-react-app monorepo
Expand Down
1 change: 0 additions & 1 deletion tasks/e2e-simple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ fi
if hash npm 2>/dev/null
then
npm i -g npm@latest
npm cache clean || npm cache verify
fi

# Bootstrap monorepo
Expand Down