Skip to content

Commit 283087e

Browse files
authored
fix(modeling): various fixes, improvements, and style changes
* build(all): used NPM only * fix(modeling): corrected align to always coalesce geometries * fix(modeling): added back geom2.fromPoints() * fix(modeling): added slice.fromOutlines() * fix(modeling): dropped slice.fromGeom2() * fix(x3d-deserializer): updated to use slice.fromOutlines() * style(modeling): removed default exports from TS definitions * fix(modeling): added path3.clone() * perf(modeling): small performance changes to plane.from functions * fix(modeling): reworked defaults in all primitives * style(modeling): changes from lint * fix(modeling): corrected extrudeLinear to proprogate options correctly * perf(modeling): more perf changes to plane * fix(modeling): added measurements for path3 and slice * fix(modeling): added transforms for path3 and slice * fix(modeling): added path3 to operations
1 parent 43737cc commit 283087e

97 files changed

Lines changed: 551 additions & 345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ cd OpenJSCAD.org
4141
The next steps require [NPM](https://www.npmjs.com/) and [Node.js](https://nodejs.org).
4242
The JSCAD project always develops with the latest LTS releases, so install these versions.
4343

44-
In addition, the packages included are maintained as a mono-repository using [PNPM](https://pnpm.io).
45-
If not already, install PNPM following the [installation directions](https://pnpm.io/installation).
44+
In addition, the packages included are maintained as a mono-repository using [NPM](https://www.npmjs.com/).
45+
If not already, install NPM following the [documentation](https://docs.npmjs.com/).
4646

4747
Next, try to run the test suites to verify the installation.
4848
```
49-
pnpm install
50-
pnpm test
49+
npm install
50+
npm test
5151
```
5252

5353
This may take some time... relax... have some coffee.
5454

5555
If the tests ran successfully then changes can be made to any package. See the 'packages' directory.
5656

57-
NOTE: All packages and dependencies have been linked together by PNPM. No other magic is required.
57+
NOTE: All packages and dependencies have been linked together by NPM. No other magic is required.
5858

5959
If you intend to contribute changes back to JSCAD then please follow these guides.
6060
- follow the [JavaScript Standard Style](https://standardjs.com/index.html) when making changes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ There are many ways to use JSCAD:
66

77
An [online version](https://openjscad.xyz/), [self hostable web based ui](./packages/web), as [CLI](./packages/cli) (command-line interface) for server-side computations with Node.js, as well as an experimental [desktop app](./packages/desktop) or [individual Node.js packages](./packages/README.md)!!
88

9-
This repository is a [monorepo](https://medium.com/@maoberlehner/monorepos-in-the-wild-33c6eb246cb9) (container of multiple packages and tools) maintained with [PNPM](https://pnpm.io/) and [Lerna-Lite](https://github.com/ghiscoding/lerna-lite)
9+
This repository is a [monorepo](https://medium.com/@maoberlehner/monorepos-in-the-wild-33c6eb246cb9) (container of multiple packages and tools) maintained with [NPM](https://www.npmjs.com/) and [Lerna-Lite](https://github.com/ghiscoding/lerna-lite)
1010

1111
[![Build Status](https://travis-ci.org/jscad/OpenJSCAD.org.svg?branch=master)](https://travis-ci.org/jscad/OpenJSCAD.org)
1212
[![Stability](https://img.shields.io/badge/stability-stable-success)](https://github.com/emersion/stability-badges#stable)

V3-CHANGES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
## General Packaging
44

5-
JSCAD V3 uses PNPM for managing the JSCAD packages.
5+
JSCAD V3 uses NPM for managing the JSCAD packages.
66
This is a totally new package manager so existing V2 packages are not compatible.
77
Be sure to start with a fresh clone of JSCAD.
88

9-
**IMPORTANT: USE PNPM AT ALL TIMES. DO NOT USE NPM.**
9+
**IMPORTANT: USE NPM AT ALL TIMES.**
1010

1111
```
1212
git clone git@github.com:jscad/OpenJSCAD.org.git
1313
cd OpenJSCAD.org
1414
git checkout V3
15-
pnpm install
16-
pnpm test
15+
npm install
16+
npm test
1717
```
1818

1919

packages/array-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"module": "dist/jscad-array-utils.es.js",
1212
"scripts": {
1313
"build": "rollup --config",
14-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
14+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1515
"test": "ava 'src/*.test.js' --verbose --timeout 2m",
1616
"test:tsd": "tsd",
17-
"version": "pnpm run build && git add dist"
17+
"version": "npm run build && git add dist"
1818
},
1919
"contributors": [
2020
{

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"module": "dist/jscad-core.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1414
"test": "ava './src/**/*.test.js' --verbose --timeout 2m"
1515
},
1616
"contributors": [

packages/io/3mf-deserializer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"module": "dist/jscad-3mf-deserializer.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1414
"test": "ava --verbose --timeout 2m 'tests/**/*.test.js'",
15-
"version": "pnpm run build && git add dist"
15+
"version": "npm run build && git add dist"
1616
},
1717
"contributors": [
1818
{

packages/io/3mf-serializer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"module": "dist/jscad-3mf-serializer.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --reporter=html --reporter=text npm test",
1414
"test": "ava --concurrency 3 --verbose --timeout 40000 './tests/*.test.js'",
15-
"version": "pnpm run build && git add dist"
15+
"version": "npm run build && git add dist"
1616
},
1717
"contributors": [
1818
{

packages/io/dxf-deserializer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"module": "dist/jscad-dxf-deserializer.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1414
"test": "ava --verbose --timeout 2m './tests/test*.js'",
15-
"version": "pnpm run build && git add dist"
15+
"version": "npm run build && git add dist"
1616
},
1717
"contributors": [
1818
{

packages/io/dxf-serializer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"module": "dist/jscad-dxf-serializer.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1414
"test": "ava --verbose --timeout 2m './tests/*.test.js'",
15-
"version": "pnpm run build && git add dist"
15+
"version": "npm run build && git add dist"
1616
},
1717
"contributors": [
1818
{

packages/io/json-deserializer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"module": "dist/jscad-json-deserializer.es.js",
1111
"scripts": {
1212
"build": "rollup --config",
13-
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
13+
"coverage": "c8 --all --reporter=html --reporter=text npm test",
1414
"test": "ava 'tests/*.test.js' --verbose --timeout 2m",
15-
"version": "pnpm run build && git add dist"
15+
"version": "npm run build && git add dist"
1616
},
1717
"contributors": [
1818
{

0 commit comments

Comments
 (0)