Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
traunts committed Jun 2, 2024
2 parents 3384c42 + 97672ba commit b57ec7a
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

/dist
/coverage

/.nx/cache
27 changes: 22 additions & 5 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e", "watch"]
"cacheableOperations": [
"build",
"lint",
"test",
"e2e",
"watch"
]
}
},
"defaultBase": "main",
"targetDefaults": {
"test": {
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"]
"inputs": [
"default",
"^default",
"{workspaceRoot}/jest.preset.js"
]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json"
]
},
"build": {
"dependsOn": ["^build"]
"dependsOn": [
"^build"
]
},
"watch": {
"dependsOn": ["^watch"]
"dependsOn": [
"^watch"
]
}
},
"workspaceLayout": {
Expand Down
5 changes: 4 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
"@nrwl/js": "19.1.1",
"@nrwl/linter": "19.1.1",
"@nrwl/node": "19.1.1",
"@nrwl/nx-cloud": "19.0.0",
"@nrwl/web": "19.1.1",
"@nrwl/webpack": "19.1.1",
"@nrwl/workspace": "19.1.1",
Expand Down Expand Up @@ -126,7 +125,8 @@
"ts-loader": "^9.4.2",
"ts-node": "10.9.1",
"tsconfig-paths-webpack-plugin": "^4.0.0",
"typescript": "^4.9.4"
"typescript": "^4.9.4",
"nx-cloud": "19.0.0"
},
"scripts": {
"prepare": "husky install"
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/shared/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nrwl/js:tsc",
Expand Down Expand Up @@ -43,6 +44,5 @@
}
}
}
},
"tags": []
}
}
9 changes: 5 additions & 4 deletions packages/syntaxes/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/syntaxes/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "nx:run-commands",
"inputs": ["{projectRoot}/**/*"],
"outputs": ["{workspaceRoot}/dist/packages/syntaxes"],
"options": {
"commands": [
"npx mkdirp \"dist/packages/syntaxes\"",
"npx js-yaml packages/syntaxes/src/ccini.tmLanguage.yaml > dist/packages/syntaxes/ccini.tmLanguage.json",
"cp packages/syntaxes/src/snippets.jsonc dist/packages/syntaxes/snippets.json",
"cp packages/syntaxes/src/language-configuration.json dist/packages/syntaxes/language-configuration.json"
],
"outputPath": "dist/packages/syntaxes"
"parallel": false
},
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"configurations": {
"production": {}
}
}
},
"tags": []
}
}

0 comments on commit b57ec7a

Please sign in to comment.