Skip to content

Commit

Permalink
Merge pull request #3628 from owid/lerna-8
Browse files Browse the repository at this point in the history
chore(deps): update to lerna 8
  • Loading branch information
marcelgerber authored May 21, 2024
2 parents af8bc84 + e266f9f commit 9734274
Show file tree
Hide file tree
Showing 5 changed files with 578 additions and 422 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ packages/@ourworldindata/*/dist/
dist/
grapherData/
.vscode/
/.nx/cache
2 changes: 2 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ module.exports = {
testPathIgnorePatterns: [
".jsdom.test.",
"<rootDir>/itsJustJavascript/db/tests",
"<rootDir>/.nx/cache/",
],
testMatch: ["**/*.test.(jsx|js)"],
},
{
displayName: { name: "jsdom", color: "cyan" },
testEnvironment: "jsdom",
testMatch: ["**/*.jsdom.test.(jsx|js)"],
testPathIgnorePatterns: ["<rootDir>/.nx/cache/"],
},
],
}
Expand Down
14 changes: 6 additions & 8 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build"]
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [],
"production": ["default"]
},
"targetDefaults": {
"build": {
"cache": true,
"dependsOn": ["^build"]
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lerna": "^7.4.2",
"lerna": "^8.1.3",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"sass": "^1.69.5",
Expand Down
Loading

0 comments on commit 9734274

Please sign in to comment.