File tree 2 files changed +4
-17
lines changed
2 files changed +4
-17
lines changed Original file line number Diff line number Diff line change @@ -183,17 +183,7 @@ const getWorkspacesRootConfig = dir => {
183
183
184
184
const packageObj = loadPackageJson ( packageJsonUp ) ;
185
185
186
- < << << << HEAD
187
- if (
188
- packageObj . workspaces &&
189
- (
190
- Array . isArray ( packageObj . workspaces ) ||
191
- Reflect . has ( packageObj . workspaces , 'packages' )
192
- )
193
- ) {
194
- === = ===
195
186
if ( Reflect . has ( packageObj , 'workspaces' ) ) {
196
- >>> > >>> CRA 3
197
187
const workspacesRootConfig = {
198
188
root : path . dirname ( packageJsonUp ) ,
199
189
workspaces : packageObj . workspaces
@@ -265,13 +255,7 @@ const loadAppSettings = appPackageJson => {
265
255
const dependencies = getDeep ( appPackageObj , [ 'dependencies' ] ) ;
266
256
const devDependencies = getDeep ( appPackageObj , [ 'devDependencies' ] ) ;
267
257
268
- < << << << HEAD
269
- if ( ! dependencies && ! devDependencies ) {
270
- return result ;
271
- }
272
- = === ===
273
258
if ( ! dependencies && ! devDependencies ) return result ;
274
- > >>> >>> CRA 3
275
259
276
260
if ( dependencies ) {
277
261
result . dependencies = Object . assign ( result . dependencies , dependencies ) ;
@@ -541,7 +525,6 @@ const init = paths => {
541
525
appSettings . dependencies
542
526
) ) ] ;
543
527
544
-
545
528
console . log (
546
529
`Found ${ babelSrcPaths . length } path(s) with "${
547
530
config . packageEntry
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " @react-workspaces/react-scripts" ,
3
+ <<<<<<< HEAD
3
4
"version" : " 3.3.0-alpha-08" ,
5
+ =======
6
+ "version" : " 3.0.0-alpha-04" ,
7
+ >>>>>>> Remove duplicates from babel-load dependency array.
4
8
"description" : " Configuration and scripts for Create React App." ,
5
9
"repository" : {
6
10
"type" : " git" ,
You can’t perform that action at this time.
0 commit comments