Skip to content

Commit

Permalink
fix: Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
samalexander committed Jul 14, 2020
1 parent af48b3f commit 03d07a6
Show file tree
Hide file tree
Showing 15 changed files with 3,405 additions and 3,011 deletions.
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# don't ever lint node_modules
node_modules
# don't lint build output (make sure it's set to your correct build folder name)
lib
# don't lint nyc coverage output
coverage
18 changes: 18 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "jest"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:jest/recommended",
"prettier",
"prettier/@typescript-eslint"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off"
}
}
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,21 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.x
- name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 10.x
- name: npm install and test
node-version: 12.x
- name: npm install
run: npm install
env:
CI: true
- name: lint & format
run: |
npm install
npm run test
npm run lint
npx prettier --check .
env:
CI: true
- name: test
run: npm run test
env:
CI: true
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Ignore artifacts:
build
coverage

# changelog is generated automatically
CHANGELOG.md
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"bracketSpacing": true
}
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# three-csg-ts

CSG (Constructive Solid Geometry) library for [three.js](https://github.com/mrdoob/three.js/) with Typescript support.

*This is a typescript rewrite of [THREE-CSGMesh](https://github.com/manthrax/THREE-CSGMesh).*
_This is a typescript rewrite of [THREE-CSGMesh](https://github.com/manthrax/THREE-CSGMesh)._

## Concept

Expand All @@ -17,8 +18,8 @@ By using different combinations of these 3 operations, and changing the order of

## Installation

* Install with npm `npm i -save three-csg-ts`
* Install with yarn `yarn add three-csg-ts`
- Install with npm `npm i -save three-csg-ts`
- Install with yarn `yarn add three-csg-ts`

## Example usage

Expand All @@ -38,7 +39,7 @@ meshA.updateMatrix();
meshB.updateMatrix();
// Create a bsp tree from each of the meshes
const bspA = CSG.fromMesh(meshA);
const bspA = CSG.fromMesh(meshA);
const bspB = CSG.fromMesh(meshB);
// Subtract one bsp from the other via .subtract... other supported modes are .union and .intersect
Expand All @@ -49,4 +50,4 @@ const meshResult = CSG.toMesh(bspResult, meshA.matrix);
// Set the results material to the material of the first cube.
meshResult.material = meshA.material;
```
```
19 changes: 6 additions & 13 deletions jestconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
{
"transform": {
"^.+\\.(t|j)sx?$": "ts-jest"
},
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json",
"node"
]
}
"transform": {
"^.+\\.(t|j)sx?$": "ts-jest"
},
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"]
}
Loading

0 comments on commit 03d07a6

Please sign in to comment.