Skip to content

Commit 10fc153

Browse files
authored
build(all): switch to NPM workspaces, update all dependencies, rework rollups (#1445)
1 parent 5f92b14 commit 10fc153

File tree

83 files changed

+494
-7752
lines changed

Some content is hidden

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

83 files changed

+494
-7752
lines changed

.github/workflows/node.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4
19-
- name: Install pnpm
20-
uses: pnpm/action-setup@v4
21-
with:
22-
version: 10
2319
- name: Setup Node ${{ matrix.node-version }}
2420
uses: actions/setup-node@v4
2521
with:
2622
node-version: ${{ matrix.node-version }}
27-
cache: 'pnpm'
2823
- name: Run tests
2924
run: |
30-
pnpm --no-frozen-lockfile install
31-
pnpm test
32-
pnpm run test:tsd
25+
npm install
26+
npm test
27+
npm run test:tsd

.travis.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

coverage_reports.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<h1>Links to Coverage Reports</h1>
99
<p>The following coverage reports are available after running 'npm run coverage'</p>
1010
<table class="summary">
11+
<tr><td class="link"><a href="packages/array-utils/coverage/index.html">array-utils</a></td></tr></tr>
1112
<tr><td class="link"><a href="packages/cli/coverage/index.html">cli</a></td></tr>
1213
<tr><td class="link"><a href="packages/core/coverage/index.html">core</a></td></tr>
1314
<tr><td class="link"><a href="packages/io/3mf-deserializer/coverage/index.html">io/3mf-deserializer</a></td></tr>
@@ -26,7 +27,6 @@ <h1>Links to Coverage Reports</h1>
2627
<tr><td class="link"><a href="packages/io/x3d-deserializer/coverage/index.html">io/x3d-deserialize</a></td></tr>
2728
<tr><td class="link"><a href="packages/io/x3d-serializer/coverage/index.html">io/x3d-serialize</a></td></tr>
2829
<tr><td class="link"><a href="packages/modeling/coverage/index.html">modeling</a></td></tr></tr>
29-
<tr><td class="link"><a href="packages/utils/array-utils/coverage/index.html">array-utils</a></td></tr></tr>
3030
<tr><td class="link"><a href="packages/utils/regl-renderer/coverage/index.html">regl-renderer</a></td></tr></tr>
3131
</table>
3232
</body>

lerna.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "independent",
3-
"npmClient": "pnpm",
3+
"npmClient": "npm",
44
"command": {
55
"version": {
66
"allowBranch": "v3-prerelease",
@@ -14,6 +14,7 @@
1414
"**/*.md"
1515
],
1616
"packages": [
17+
"packages/array-utils",
1718
"packages/cli",
1819
"packages/core",
1920
"packages/io/io",
@@ -33,7 +34,6 @@
3334
"packages/io/x3d-deserializer",
3435
"packages/io/x3d-serializer",
3536
"packages/modeling",
36-
"packages/utils/array-utils",
3737
"packages/utils/img",
3838
"packages/utils/regl-renderer"
3939
]

package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"changed": "lerna changed",
1515
"graph": "lerna list --graph",
1616
"list": "lerna ls",
17-
"preversion": "pnpm run test && pnpm run test:tsd && pnpm run docs",
17+
"preversion": "npm run test && npm run test:tsd && npm run docs",
1818
"publish": "lerna publish prepatch --include-merged-tags --no-private --no-push --conventional-prerelease --dist-tag alpha --pre-dist-tag alpha",
1919
"publish-dryrun": "lerna version prepatch --include-merged-tags --no-private --no-push --conventional-prerelease"
2020
},
@@ -33,19 +33,28 @@
3333
}
3434
],
3535
"license": "MIT",
36+
"workspaces": [
37+
"packages/array-utils",
38+
"packages/cli",
39+
"packages/core",
40+
"packages/examples",
41+
"packages/io/*",
42+
"packages/modeling",
43+
"packages/utils/*"
44+
],
3645
"devDependencies": {
3746
"@jscad/sample-files": "github:jscad/sample-files#master",
3847
"@lerna-lite/changed": "^4.11.0",
3948
"@lerna-lite/cli": "^4.11.0",
4049
"@lerna-lite/publish": "^4.11.0",
4150
"@lerna-lite/run": "^4.11.0",
4251
"@lerna-lite/version": "^4.11.0",
43-
"ava": "^4.3.3",
44-
"c8": "^8.0.1",
52+
"ava": "^6.3.0",
53+
"c8": "^10.1.0",
4554
"docdash": "^2.0.2",
4655
"jsdoc": "^4.0.5",
4756
"standardx": "7.0.0",
48-
"tsd": "^0.28.1"
57+
"tsd": "^0.33.0"
4958
},
5059
"collective": {
5160
"type": "opencollective",

packages/array-utils/dist/jscad-array-utils.es.js

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/array-utils/dist/jscad-array-utils.min.js

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/array-utils/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
"access": "public"
3838
},
3939
"devDependencies": {
40-
"@rollup/plugin-terser": "^0.4.3",
41-
"ava": "^4.3.3",
42-
"c8": "^8.0.0",
43-
"rollup": "^2.79.1",
44-
"rollup-plugin-banner": "^0.2.1"
40+
"@rollup/plugin-terser": "^0.4.0",
41+
"ava": "^6.3.0",
42+
"c8": "^10.1.0",
43+
"rollup": "^4.52.0"
4544
}
4645
}
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
import banner from 'rollup-plugin-banner'
1+
import * as fs from 'fs'
2+
23
import terser from '@rollup/plugin-terser'
34

5+
const {name, version, license} = JSON.parse(fs.readFileSync('package.json'))
6+
47
export default {
58
input: 'src/index.js',
69
output: [
710
{
811
file: 'dist/jscad-array-utils.min.js',
912
format: 'umd',
10-
name: 'jscadArrayUtils'
13+
name: 'jscadArrayUtils',
14+
banner: `/*! ${name} V${version} (${license}) */`
1115
},
1216
{
1317
file: 'dist/jscad-array-utils.es.js',
14-
format: 'es'
18+
format: 'es',
19+
banner: `/*! ${name} V${version} (${license}) */`
1520
}
1621
],
1722
plugins: [
18-
banner('<%= pkg.description %>\n@module <%= pkg.name %>\n@version <%= pkg.version %>\n@license <%= pkg.license %>'),
1923
terser({ compress: { module: true }, mangle: false, format: { comments: 'some' } })
2024
]
2125
}

packages/cli/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
],
3737
"license": "MIT",
3838
"dependencies": {
39-
"@jscad/array-utils": "workspace:3.0.1-alpha.0",
40-
"@jscad/core": "workspace:3.0.3-alpha.0",
41-
"@jscad/io": "workspace:3.0.3-alpha.0",
42-
"@jscad/io-utils": "workspace:3.0.3-alpha.0",
43-
"@jscad/modeling": "workspace:3.0.3-alpha.0",
39+
"@jscad/array-utils": "3.0.1-alpha.0",
40+
"@jscad/core": "3.0.3-alpha.0",
41+
"@jscad/io": "3.0.3-alpha.0",
42+
"@jscad/io-utils": "3.0.3-alpha.0",
43+
"@jscad/modeling": "3.0.3-alpha.0",
4444
"commander": "^14.0.0",
4545
"jszip": "^3.10.1"
4646
},
4747
"devDependencies": {
48-
"ava": "^4.3.3",
49-
"c8": "^8.0.0"
48+
"ava": "^6.3.0",
49+
"c8": "^10.1.0"
5050
},
5151
"collective": {
5252
"type": "opencollective",

0 commit comments

Comments
 (0)