Skip to content

Commit

Permalink
build(all): changes to packages and rollup in preparation for prerelese
Browse files Browse the repository at this point in the history
  • Loading branch information
z3dev committed Aug 20, 2023
1 parent 5748a1f commit 6a39e5b
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 55 deletions.
18 changes: 9 additions & 9 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,26 @@
"main": "src/index.js",
"type": "module",
"unpkg": "dist/jscad-core.min.js",
"module": "dist/jscad-core.es.js",
"private": true,
"scripts": {
"build": "browserify src/index.js -o dist/jscad-core.min.js -g uglifyify --standalone jscadCore",
"version": "npm run build && git add dist",
"coverage": "c8 --all --reporter=html --reporter=text npm test",
"build": "rollup --config",
"version": "pnpm run build && git add dist",
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
"test": "ava './src/**/*.test.js' --verbose --timeout 2m"
},
"contributors": [
{
"name": "Rene K. Mueller",
"url": "http://renekmueller.com"
"url": "https://github.com/Spiritdude"
},
{
"name": "z3dev",
"url": "http://www.z3d.jp"
"url": "https://github.com/z3dev"
},
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "http://kaosat.net"
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
Expand All @@ -45,9 +47,7 @@
},
"devDependencies": {
"ava": "4.3.3",
"browserify": "16.5.1",
"c8": "8.0.0",
"uglifyify": "5.0.2"
"c8": "8.0.0"
},
"collective": {
"type": "opencollective",
Expand Down
7 changes: 4 additions & 3 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
"homepage": "https://openjscad.xyz/",
"repository": "https://github.com/jscad/OpenJSCAD.org",
"scripts": {},
"private": true,
"contributors": [
{
"name": "Rene K. Mueller",
"url": "http://renekmueller.com"
"url": "https://github.com/Spiritdude"
},
{
"name": "z3dev",
"url": "http://www.z3d.jp"
"url": "https://github.com/z3dev"
},
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "http://kaosat.net"
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
Expand Down
11 changes: 4 additions & 7 deletions packages/io/x3d-deserializer/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import banner from 'rollup-plugin-banner'
import commonjs from '@rollup/plugin-commonjs'
import { nodeResolve } from '@rollup/plugin-node-resolve'
import terser from '@rollup/plugin-terser'
import versionInjector from 'rollup-plugin-version-injector'

export default {
external: ['@jscad/modeling'],

input: 'src/index.js',

output: [
{
file: 'dist/jscad-x3d-deserializer.min.js',
format: 'umd',
name: 'jscadX3dDeserializer',
globals: {
'@jscad/modeling': 'jscadModeling'
}
name: 'jscadX3dDeserializer'
},
{
file: 'dist/jscad-x3d-deserializer.es.js',
Expand All @@ -27,6 +23,7 @@ export default {
commonjs(),
banner('<%= pkg.description %>\n<%= pkg.name %>\nVersion <%= pkg.version %>\n<%= pkg.license %> License'),
versionInjector({ injectInComments: { fileRegexp: /\.(html)$/ }, logLevel: 'warn' }),
nodeResolve()
nodeResolve(),
terser({ compress: { module: true }, mangle: false, format: { comments: false} })
]
}
7 changes: 1 addition & 6 deletions packages/io/x3d-serializer/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,13 @@ import banner from 'rollup-plugin-banner'
import { nodeResolve } from '@rollup/plugin-node-resolve'

export default {
external: ['@jscad/modeling'],

input: 'src/index.js',

output: [
{
file: 'dist/jscad-x3d-serializer.min.js',
format: 'umd',
name: 'jscadX3dSerializer',
globals: {
'@jscad/modeling': 'jscadModeling'
}
name: 'jscadX3dSerializer'
},
{
file: 'dist/jscad-x3d-serializer.es.js',
Expand Down
17 changes: 7 additions & 10 deletions packages/modeling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"module": "dist/jscad-modeling.es.js",
"scripts": {
"build": "rollup --config",
"coverage": "c8 --all --reporter=html --reporter=text npm test",
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
"test": "ava 'src/**/*.test.js' --verbose --timeout 2m",
"test:tsd": "tsd",
"version": "pnpm run build && git add dist"
Expand All @@ -23,27 +23,23 @@
},
{
"name": "Evan Wallace",
"url": "http://evanw.github.com/csg.js/"
"url": "https://github.com/evanw"
},
{
"name": "Joost Nieuwenhuijse",
"email": "joost@newhouse.nl"
},
{
"name": "Eduard Bespalov",
"url": "http://evanw.github.com/csg.js/"
"url": "https://github.com/joostn"
},
{
"name": "bebbi",
"email": "elghatta@gmail.com"
"url": "https://github.com/bebbi"
},
{
"name": "Spiritdude Rene K Mueller",
"url": "http://renekmueller.com"
"url": "https://github.com/Spiritdude"
},
{
"name": "Jeff Gay",
"url": "http://www.z3d.jp"
"url": "https://github.com/z3dev"
}
],
"keywords": [
Expand All @@ -58,6 +54,7 @@
"access": "public"
},
"devDependencies": {
"@rollup/plugin-terser": "^0.4.3",
"ava": "4.3.3",
"c8": "8.0.0",
"rollup": "2.79.1",
Expand Down
4 changes: 3 additions & 1 deletion packages/modeling/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import banner from 'rollup-plugin-banner'
import terser from '@rollup/plugin-terser'

export default {
input: 'src/index.js',
Expand All @@ -14,6 +15,7 @@ export default {
}
],
plugins: [
banner('<%= pkg.description %>\n<%= pkg.name %>\nVersion <%= pkg.version %>\n<%= pkg.license %> License')
banner('<%= pkg.description %>\n<%= pkg.name %>\nVersion <%= pkg.version %>\n<%= pkg.license %> License'),
terser({ compress: { module: true }, mangle: false, format: { comments: false} })
]
}
20 changes: 16 additions & 4 deletions packages/utils/array-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,28 @@
"description": "Array Utilities for JSCAD",
"homepage": "https://openjscad.xyz/",
"repository": "https://github.com/jscad/OpenJSCAD.org",
"main": "src/index.js",
"type": "module",
"types": "src/index.d.ts",
"main": "src/index.js",
"unpkg": "dist/jscad-array-utils.min.js",
"module": "dist/jscad-array-utils.es.js",
"scripts": {
"build": "rollup --config",
"coverage": "c8 --all --reporter=html --reporter=text npm test",
"test": "ava 'src/*.test.js' --verbose --timeout 2m"
"coverage": "c8 --all --reporter=html --reporter=text pnpm test",
"test": "ava 'src/*.test.js' --verbose --timeout 2m",
"test:tsd": "tsd",
"version": "pnpm run build && git add dist"
},
"author": "Mark 'kaosat-dev' Moissette",
"contributors": [
{
"name": "z3dev",
"url": "https://github.com/z3dev"
},
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "https://github.com/kaosat-dev"
}
],
"license": "MIT",
"keywords": [
"openjscad",
Expand Down
11 changes: 7 additions & 4 deletions packages/utils/img/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@
"type": "module",
"main": "src/index.js",
"scripts": {},
"author": "Mark 'kaosat-dev' Moissette",
"private": true,
"contributors": [
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
"openjscad",
"jscad",
"utility",
"image"
],
"license": "MIT",
"publishConfig": {
"access": "public"
},
"dependencies": {
"pngjs": "6.0.0"
},
Expand Down
12 changes: 7 additions & 5 deletions packages/utils/regl-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@
"repository": "https://github.com/jscad/OpenJSCAD.org",
"type": "module",
"main": "src/index.js",
"types": "types",
"unpkg": "dist/jscad-regl-renderer.min.js",
"module": "dist/jscad-regl-renderer.es.js",
"types": "types",
"scripts": {
"build": "rollup --config",
"version": "pnpm run build && git add dist",
"dev": "http-server",
"demo-cli": "node ./demo-cli.js",
"test": "ava 'src/**/*.test.js' --verbose --timeout 2m",
"coverage": "c8 --all --reporter=html --reporter=text npm test"
"coverage": "c8 --all --reporter=html --reporter=text pnpm test"
},
"contributors": [
{
"name": "Z3 Development"
"name": "Z3 Development",
"url": "https://github.com/z3dev"
},
{
"name": "Davor Hrg"
Expand All @@ -31,7 +32,8 @@
"name": "Timothy Johnson"
},
{
"name": "Mark 'kaosat-dev' Moissette"
"name": "Mark 'kaosat-dev' Moissette",
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
Expand All @@ -44,7 +46,6 @@
"publishConfig": {
"access": "public"
},
"types": "types",
"dependencies": {
"@jscad/array-utils": "workspace:2.1.4",
"camera-unproject": "1.0.1",
Expand All @@ -57,6 +58,7 @@
"@jscad/modeling": "workspace:2.12.0",
"@rollup/plugin-commonjs": "^23.0.4",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-terser": "^0.4.3",
"ava": "4.3.3",
"http-server": "14.1.1",
"c8": "8.0.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/utils/regl-renderer/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import banner from 'rollup-plugin-banner'
import commonjs from '@rollup/plugin-commonjs'
import { nodeResolve } from '@rollup/plugin-node-resolve'
import terser from '@rollup/plugin-terser'
import versionInjector from 'rollup-plugin-version-injector'

export default {
Expand All @@ -22,6 +23,7 @@ export default {
nodeResolve(),
commonjs(),
banner('<%= pkg.description %>\n<%= pkg.name %>\nVersion <%= pkg.version %>\n<%= pkg.license %> License'),
versionInjector({ injectInComments: { fileRegexp: /\.(html)$/ }, logLevel: 'warn' })
versionInjector({ injectInComments: { fileRegexp: /\.(html)$/ }, logLevel: 'warn' }),
terser({ compress: { module: true }, mangle: false, format: { comments: false} })
]
}
8 changes: 7 additions & 1 deletion packages/vtree/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
"version": "2.0.26",
"description": "Experimental Object Caching for JSCAD",
"main": "index.js",
"private": true,
"scripts": {
"output": "node user/index.js"
},
"author": "Mark 'kaosat-dev' Moissette",
"contributors": [
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
"openjscad",
"jscad",
Expand Down
9 changes: 5 additions & 4 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,25 @@
"repository": "https://github.com/jscad/OpenJSCAD.org",
"main": "src/index.js",
"unpkg": "dist/jscad-web.min.js",
"private": true,
"scripts": {
"build": "browserify src/index.js -o dist/jscad-web.min.js -g uglifyify --standalone jscadWeb",
"dev": "budo demo.js --port=8081 --css ./css/demo.css --live -- -b",
"postinstall": "node postInstall.js && node -e \"console.log('\\u001b[35m\\u001b[1mLove JSCAD? You can now donate to our open collective:\\u001b[22m\\u001b[39m\\n > \\u001b[34mhttps://opencollective.com/openjscad/donate\\u001b[0m')\"",
"version": "npm run build && git add dist"
"version": "pnpm run build && git add dist"
},
"contributors": [
{
"name": "Rene K. Mueller",
"url": "http://renekmueller.com"
"url": "https://github.com/Spiritdude"
},
{
"name": "z3dev",
"url": "http://www.z3d.jp"
"url": "https://github.com/z3dev"
},
{
"name": "Mark 'kaosat-dev' Moissette",
"url": "http://kaosat.net"
"url": "https://github.com/kaosat-dev"
}
],
"keywords": [
Expand Down

0 comments on commit 6a39e5b

Please sign in to comment.