Skip to content

Commit 1dbcd13

Browse files
F1LT3RZemnmez
F1LT3R
authored andcommitted
Remove duplicates from babel-load dependency array.
1 parent d370f24 commit 1dbcd13

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

packages/react-scripts/config/yarn-workspaces.js

-17
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,7 @@ const getWorkspacesRootConfig = dir => {
183183

184184
const packageObj = loadPackageJson(packageJsonUp);
185185

186-
<<<<<<< HEAD
187-
if (
188-
packageObj.workspaces &&
189-
(
190-
Array.isArray(packageObj.workspaces) ||
191-
Reflect.has(packageObj.workspaces, 'packages')
192-
)
193-
) {
194-
=======
195186
if (Reflect.has(packageObj, 'workspaces')) {
196-
>>>>>>> CRA 3
197187
const workspacesRootConfig = {
198188
root: path.dirname(packageJsonUp),
199189
workspaces: packageObj.workspaces
@@ -265,13 +255,7 @@ const loadAppSettings = appPackageJson => {
265255
const dependencies = getDeep(appPackageObj, ['dependencies']);
266256
const devDependencies = getDeep(appPackageObj, ['devDependencies']);
267257

268-
<<<<<<< HEAD
269-
if (!dependencies && !devDependencies) {
270-
return result;
271-
}
272-
=======
273258
if (!dependencies && !devDependencies) return result;
274-
>>>>>>> CRA 3
275259

276260
if (dependencies) {
277261
result.dependencies = Object.assign(result.dependencies, dependencies);
@@ -541,7 +525,6 @@ const init = paths => {
541525
appSettings.dependencies
542526
))];
543527

544-
545528
console.log(
546529
`Found ${babelSrcPaths.length} path(s) with "${
547530
config.packageEntry

packages/react-scripts/package.json

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@react-workspaces/react-scripts",
3+
<<<<<<< HEAD
34
"version": "3.3.0-alpha-08",
5+
=======
6+
"version": "3.0.0-alpha-04",
7+
>>>>>>> Remove duplicates from babel-load dependency array.
48
"description": "Configuration and scripts for Create React App.",
59
"repository": {
610
"type": "git",

0 commit comments

Comments
 (0)