fix conflict in workspace.json

pull/1671/head
Joseph Izang 3 years ago
parent 462e134cf1
commit 6f118111e1
  1. 95
      workspace.json

@ -1,71 +1,5 @@
{
"version": 1,
"cli": {
"defaultCollection": "@nrwl/react"
},
"defaultProject": "remix-ide",
"schematics": {
"@nrwl/workspace": {
"library": {
"linter": "eslint"
}
},
"@nrwl/cypress": {
"cypress-project": {
"linter": "eslint"
}
},
"@nrwl/react": {
"application": {
"style": "css",
"linter": "eslint",
"babel": true
},
"component": {
"style": "css"
},
"library": {
"style": "css",
"linter": "eslint"
}
},
"@nrwl/next": {
"application": {
"linter": "eslint"
}
},
"@nrwl/web": {
"application": {
"linter": "eslint"
}
},
"@nrwl/node": {
"application": {
"linter": "eslint"
},
"library": {
"linter": "eslint"
}
},
"@nrwl/nx-plugin": {
"plugin": {
"linter": "eslint"
}
},
"@nrwl/nest": {
"application": {
"linter": "eslint"
}
},
"@nrwl/express": {
"application": {
"linter": "eslint"
},
"library": {
"linter": "eslint"
}
}
},
"projects": {
"remix-ide": {
"root": "apps/remix-ide",
@ -1245,20 +1179,19 @@
"linter": "eslint"
}
},
"remix-ui-vertical-icons-panel": {
"root": "libs/remix-ui/vertical-icons-panel",
"sourceRoot": "libs/remix-ui/vertical-icons-panel/src",
"projectType": "library",
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/remix-ui/vertical-icons-panel/**/*.{ts,tsx,js,jsx}"
]
}
}
"@nrwl/nest": {
"application": {
"linter": "eslint"
}
},
"@nrwl/express": {
"application": {
"linter": "eslint"
},
"library": {
"linter": "eslint"
}
}
}
}
},
"defaultProject": "remix-ide"
}
Loading…
Cancel
Save