From d613c842d6a0dc9c6403f4819b167f1dac81feba Mon Sep 17 00:00:00 2001 From: Enoch Riese Date: Sat, 22 Jul 2023 18:32:19 -0600 Subject: [PATCH] use lerna to handle build order and speed up buildsitedeps --- config/build-order.mjs | 34 ----------------- config/scripts.yaml | 15 +++++--- designs/aaron/package.json | 4 +- designs/albert/package.json | 4 +- designs/bee/package.json | 4 +- designs/bella/package.json | 4 +- designs/benjamin/package.json | 4 +- designs/bent/package.json | 4 +- designs/bob/package.json | 4 +- designs/breanna/package.json | 4 +- designs/brian/package.json | 4 +- designs/bruce/package.json | 4 +- designs/carlita/package.json | 4 +- designs/carlton/package.json | 4 +- designs/cathrin/package.json | 4 +- designs/charlie/package.json | 4 +- designs/cornelius/package.json | 4 +- designs/diana/package.json | 4 +- designs/examples/package.json | 4 +- designs/florence/package.json | 4 +- designs/florent/package.json | 4 +- designs/hi/package.json | 4 +- designs/holmes/package.json | 4 +- designs/hortensia/package.json | 4 +- designs/huey/package.json | 4 +- designs/hugo/package.json | 4 +- designs/jaeger/package.json | 4 +- designs/legend/package.json | 4 +- designs/lucy/package.json | 4 +- designs/lunetius/package.json | 4 +- designs/magde/package.json | 4 +- designs/noble/package.json | 4 +- designs/octoplushy/package.json | 4 +- designs/paco/package.json | 4 +- designs/penelope/package.json | 4 +- designs/plugintest/package.json | 4 +- designs/rendertest/package.json | 4 +- designs/sandy/package.json | 4 +- designs/shin/package.json | 4 +- designs/simon/package.json | 4 +- designs/simone/package.json | 4 +- designs/sven/package.json | 4 +- designs/tamiko/package.json | 4 +- designs/teagan/package.json | 4 +- designs/tiberius/package.json | 4 +- designs/titan/package.json | 4 +- designs/trayvon/package.json | 4 +- designs/tutorial/package.json | 4 +- designs/unice/package.json | 4 +- designs/ursula/package.json | 4 +- designs/wahid/package.json | 4 +- designs/walburga/package.json | 4 +- designs/waralee/package.json | 4 +- designs/yuri/package.json | 4 +- nx.json | 5 ++- package.json | 4 +- packages/core/package.json | 4 +- packages/models/package.json | 4 +- packages/new-design/package.json | 5 +-- packages/react-components/package.json | 4 +- packages/rehype-jargon/package.json | 4 +- packages/snapseries/package.json | 4 +- plugins/plugin-annotations/package.json | 4 +- plugins/plugin-bundle/package.json | 4 +- plugins/plugin-bust/package.json | 4 +- plugins/plugin-flip/package.json | 4 +- plugins/plugin-gore/package.json | 4 +- plugins/plugin-i18n/package.json | 4 +- plugins/plugin-measurements/package.json | 4 +- plugins/plugin-mirror/package.json | 4 +- plugins/plugin-round/package.json | 4 +- plugins/plugin-sprinkle/package.json | 4 +- plugins/plugin-svgattr/package.json | 4 +- plugins/plugin-theme/package.json | 4 +- plugins/plugin-timing/package.json | 4 +- plugins/plugin-versionfree-svg/package.json | 4 +- scripts/reconfigure.mjs | 42 +++++---------------- sites/backend/package.json | 4 +- sites/dev/package.json | 6 ++- sites/lab/package.json | 6 ++- sites/org/package.json | 6 ++- sites/sanity/package.json | 3 +- sites/shared/prebuild/markdown.mjs | 2 +- 83 files changed, 186 insertions(+), 230 deletions(-) delete mode 100644 config/build-order.mjs diff --git a/config/build-order.mjs b/config/build-order.mjs deleted file mode 100644 index 8ff860555e5..00000000000 --- a/config/build-order.mjs +++ /dev/null @@ -1,34 +0,0 @@ -import { designs, plugins, packages } from './software/index.mjs' - -/* - * As this monorepo has interlocking dependencies - * we need to ensure things get built in the correct - * order. This file takes care of that - */ - -const first = ['core', 'remark-jargon', 'snapseries'] -const blocks = ['brian', 'titan', 'bella', 'breanna'] -const extended = ['bent', 'simon', 'carlton'] - -export const buildOrder = [ - // First build FreeSewing core library and config-helpers - first, - - // Then build all FreeSewing plugins, but not the bundle - Object.keys(plugins).filter((id) => id !== 'plugin-bundle'), - - // Then build the plugin bundle - ['plugin-bundle'], - - // Then build all FreeSewing designs that are blocks - blocks, - - // Then build all FreeSewing designs that are further extended - extended, - - // Then build all remaining designs - Object.keys(designs).filter((id) => [...blocks, ...extended].indexOf(id) === -1), - - // Finally build the rest of the packages - Object.keys(packages).filter((id) => first.indexOf(id) === -1), -] diff --git a/config/scripts.yaml b/config/scripts.yaml index 4d0abcdf6f2..f75e3baf15e 100644 --- a/config/scripts.yaml +++ b/config/scripts.yaml @@ -1,10 +1,11 @@ _: - build: 'node build.mjs' + build: &build 'node build.mjs' + buildall: *build clean: 'rimraf dist' - mbuild: 'NO_MINIFY=1 node build.mjs' + mbuild: &mbuild 'NO_MINIFY=1 node build.mjs' symlink: 'mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -' test: 'echo "{{name}}: No tests configured. Perhaps you could write some?" && exit 0' - vbuild: 'VERBOSE=1 node build.mjs' + vbuild: &vbuild 'VERBOSE=1 node build.mjs' lab: 'cd ../../sites/lab && yarn start' tips: 'node ../../scripts/help.mjs' lint: "npx eslint 'src/**' 'tests/*.mjs'" @@ -35,10 +36,12 @@ new-design: test: '!' testci: '!' vbuild: '!' + buildall: '!' rehype-highlight-lines: build: '!' mbuild: '!' vbuild: '!' + buildall: '!' lint: "npx eslint 'src/*.mjs'" rehype-jargon: lint: "npx eslint 'src/*.mjs'" @@ -53,12 +56,12 @@ backend: clean: 'rimraf dist' dev: 'nodemon src/index.mjs' initdb: 'npx prisma db push' - mbuild: 'NO_MINIFY=1 node build.mjs' + mbuild: *mbuild newdb: 'node ./scripts/newdb.mjs' prettier: "npx prettier --write 'src/*.mjs' 'tests/*.mjs'" rmdb: 'node ./scripts/rmdb.mjs' test: 'npx mocha --require mocha-steps tests/index.mjs' - vbuild: 'VERBOSE=1 node build.mjs' + vbuild: *vbuild prebuild: 'node scripts/prebuild.mjs' dev: @@ -69,7 +72,7 @@ dev: develop: *nextDev i18n: "SITE=dev node ../shared/prebuild/i18n-only.mjs" lint: &nextLint 'next lint' - buildsitedeps: &buildsitedeps 'cd ../../ && yarn buildall && cd -' + buildsitedeps: &buildsitedeps 'npx lerna run buildall' prebuild: 'yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs' prebuildonly: 'node --experimental-json-modules ./prebuild.mjs' predev: 'node --experimental-json-modules ./prebuild.mjs' diff --git a/designs/aaron/package.json b/designs/aaron/package.json index 3f51babe1a8..f5b5cf899e4 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/albert/package.json b/designs/albert/package.json index 14a011660e2..d14b50df203 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/bee/package.json b/designs/bee/package.json index 7405df326d0..2d5ab3ddf76 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/bella/package.json b/designs/bella/package.json index 55b52859a0d..f6e4a5ee9ed 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step3": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step3": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 5739f7e702e..5395a1d5066 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/bent/package.json b/designs/bent/package.json index b7b038bcc79..b5d3d215a3a 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step4": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step4": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/bob/package.json b/designs/bob/package.json index fee3d97b1f1..3a083441081 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 4e9da652568..6165429e22f 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step3": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step3": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/brian/package.json b/designs/brian/package.json index c6f8b967e7e..ebcb53f6aba 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step3": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step3": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 60ae5714ee1..3952401fc02 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/carlita/package.json b/designs/carlita/package.json index fdc6ec1b5bb..712b1e16ec6 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/carlton/package.json b/designs/carlton/package.json index 37707c17839..57ac191d2a7 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step4": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step4": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index 601b448eb61..7c4e9fc3984 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/charlie/package.json b/designs/charlie/package.json index d34a07aa73a..f8b00bac4bc 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index ccf32134984..8895183ebfe 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/diana/package.json b/designs/diana/package.json index 2e39fafa095..3bf38e92e96 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/examples/package.json b/designs/examples/package.json index dc7e9b922bd..80ef221c723 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -26,6 +26,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -36,9 +37,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/florence/package.json b/designs/florence/package.json index e3e54238ce8..d2a570cfa19 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/florent/package.json b/designs/florent/package.json index ac53859e67b..098f5843973 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/hi/package.json b/designs/hi/package.json index 2638f45db47..6ce76f471cf 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/holmes/package.json b/designs/holmes/package.json index cfbabf16183..2addb0b83fd 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index ec6d1bd1e70..c25627e2513 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/huey/package.json b/designs/huey/package.json index 7f2c0fd420b..efc0e09ff64 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 45fe8f84f94..16289a2e4e1 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 09c7b65a67b..f941b0014b5 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/legend/package.json b/designs/legend/package.json index de09df2270d..55ad125a468 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/lucy/package.json b/designs/lucy/package.json index f89dc370930..e491ccea03e 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index 58a6d62c099..4d4d231aae6 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/magde/package.json b/designs/magde/package.json index 3dc4f6f6ae4..21aaa4779a8 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/noble/package.json b/designs/noble/package.json index 56186432df1..2710fc6c10a 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index f3ccdf466fb..034d5946ae7 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/paco/package.json b/designs/paco/package.json index 14973796deb..7f329688bc9 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/penelope/package.json b/designs/penelope/package.json index c4b0a40feb0..b8bdae8c8f6 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 1df8e7319ab..ac7e1cb25f4 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index 1351038fe75..079a3ceafea 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/sandy/package.json b/designs/sandy/package.json index bc2a0f5210d..47eb6dc887d 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/shin/package.json b/designs/shin/package.json index 99f4dd4e0a4..6451d2dbb9e 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/simon/package.json b/designs/simon/package.json index 7d75635fc11..03d62af0ced 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step4": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step4": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/simone/package.json b/designs/simone/package.json index 0118a69e9b9..ce1199b560c 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/sven/package.json b/designs/sven/package.json index ece3042804b..ae2939bd5a6 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index 2bf91560268..ebc5aff5288 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 6d02e5660b8..232a9c8ac7a 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index 700e059774a..8b45c5c1d16 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/titan/package.json b/designs/titan/package.json index 3aacd7c96c3..e50f766d088 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step3": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step3": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index b7954146ce5..6ca2d12f7ea 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/tutorial/package.json b/designs/tutorial/package.json index 99a88ad3ae6..697991873bb 100644 --- a/designs/tutorial/package.json +++ b/designs/tutorial/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/unice/package.json b/designs/unice/package.json index ab1d53a6752..d7943574ef9 100644 --- a/designs/unice/package.json +++ b/designs/unice/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/ursula/package.json b/designs/ursula/package.json index 23096ace21f..6447c368aed 100644 --- a/designs/ursula/package.json +++ b/designs/ursula/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/wahid/package.json b/designs/wahid/package.json index 8397df5ffd5..b60e6754506 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/walburga/package.json b/designs/walburga/package.json index 636c1feb463..97474444d01 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/waralee/package.json b/designs/waralee/package.json index c8bbbf49298..8a7c70f978b 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/designs/yuri/package.json b/designs/yuri/package.json index bc07c99b553..7e27919fd75 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step5": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step5": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10", diff --git a/nx.json b/nx.json index b2d33661c67..e58b548a85a 100644 --- a/nx.json +++ b/nx.json @@ -3,7 +3,7 @@ "default": { "runner": "nx/tasks-runners/default", "options": { - "cacheableOperations": [], + "cacheableOperations": ["buildall"], "parallel": 5 } } @@ -12,6 +12,9 @@ "build": { "dependsOn": ["^build", "prebuild"] }, + "buildall": { + "dependsOn": ["^buildall", "prebuildall"] + }, "testci": { "dependsOn": ["^build"] }, diff --git a/package.json b/package.json index 9be8de9b5e3..25286c1191e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "prettier": "npx prettier --write 'config/*' 'config/**/*' 'packages/**/src/*.mjs' 'packages/i18n/src/locales/**/*.*' 'packages/**/tests/*.mjs'", "reconfigure": "all-contributors generate && node --experimental-json-modules --no-warnings scripts/reconfigure.mjs", "prerelease": "lerna version --no-git-tag-version --no-push && yarn reconfigure && yarn buildall", - "buildall": "lerna run cibuild_step0 && lerna run cibuild_step1 && lerna run cibuild_step2 && lerna run cibuild_step3 && lerna run cibuild_step4 && lerna run cibuild_step5 && lerna run cibuild_step6", + "buildall": "lerna run buildall", "build": "yarn buildall", "wbuild": "yarn wbuildall", "testall": "node scripts/testall.js", @@ -43,7 +43,7 @@ "checkdocs": "remark markdown --quiet --frail", "strapi:translate": "node scripts/strapi-en-to-other.mjs", "fixdocs": "remark markdown --quiet --frail --output", - "wbuildall": "lerna run wcibuild_step0 && lerna run wcibuild_step1 && lerna run wcibuild_step2 && lerna run wcibuild_step3 && lerna run wcibuild_step4 && lerna run wcibuild_step5 && lerna run wcibuild_step6", + "wbuildall": "lerna run wbuildall", "prepare": "husky install" }, "repository": { diff --git a/packages/core/package.json b/packages/core/package.json index d01adb7ea86..7e3ede2e355 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -32,6 +32,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -44,9 +45,8 @@ "testci": "c8 mocha tests/*.test.mjs", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "jsdoc": "jsdoc -c jsdoc.json -r src", - "cibuild_step0": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step0": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/packages/models/package.json b/packages/models/package.json index 487bbd531b5..8f1512a8826 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -28,6 +28,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -36,9 +37,8 @@ "lab": "cd ../../sites/lab && yarn start", "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/**' 'tests/*.mjs'", - "cibuild_step6": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step6": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": {}, "dependencies": {}, diff --git a/packages/new-design/package.json b/packages/new-design/package.json index 84e101c400f..2b5f2dde114 100644 --- a/packages/new-design/package.json +++ b/packages/new-design/package.json @@ -27,11 +27,8 @@ "lint": "npx eslint 'lib/*.mjs'", "i18n-only": "SITE=\"new-design/shared\" node ../../sites/shared/prebuild/i18n-only.mjs", "prebuild": "node ./prebuild.mjs", - "precibuild_step6": "node ./prebuild.mjs", - "prewbuild": "node ./prebuild.mjs", - "cibuild_step6": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step6": "node build.mjs" + "prewbuild": "node ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/packages/react-components/package.json b/packages/react-components/package.json index c3a0ecf9cf5..ae6abc562d8 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -24,6 +24,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -32,9 +33,8 @@ "lab": "cd ../../sites/lab && yarn start", "tips": "node ../../scripts/help.mjs", "lint": "eslint 'src/**/*.mjs'", - "cibuild_step6": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step6": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "react": ">=14" diff --git a/packages/rehype-jargon/package.json b/packages/rehype-jargon/package.json index 4391fbe243b..aa22b2d7d70 100644 --- a/packages/rehype-jargon/package.json +++ b/packages/rehype-jargon/package.json @@ -24,6 +24,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -32,9 +33,8 @@ "lab": "cd ../../sites/lab && yarn start", "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/*.mjs'", - "cibuild_step6": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step6": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/packages/snapseries/package.json b/packages/snapseries/package.json index 42d880604ef..1c771b370a1 100644 --- a/packages/snapseries/package.json +++ b/packages/snapseries/package.json @@ -24,6 +24,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -32,9 +33,8 @@ "lab": "cd ../../sites/lab && yarn start", "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/*.mjs'", - "cibuild_step0": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step0": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": {}, "dependencies": {}, diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index f61d96c8018..67e2545d86c 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-bundle/package.json b/plugins/plugin-bundle/package.json index ec6e0e0e420..d635e962cfb 100644 --- a/plugins/plugin-bundle/package.json +++ b/plugins/plugin-bundle/package.json @@ -32,6 +32,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -42,9 +43,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step2": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step2": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 6040eab8a88..77513a44252 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index 1cdd50a4829..9429d3cd9be 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index fe8d7edde40..eff6a4b6dbe 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index 89b7750f757..cd5c725f27a 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index a3b3ea2329f..4b5232f19d9 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 691c9f98698..960f16a8359 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index 2f141b19b52..bfd95d5181e 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index ddf09611db2..c4ea75f9231 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 5f7df13d387..8f346edfb1b 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index 3961c0ff0fb..26b7fce6b04 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index 2a334a5ac67..6f737ea411b 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index aaff4e0dd04..feb136daf0d 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -31,6 +31,7 @@ }, "scripts": { "build": "node build.mjs", + "buildall": "node build.mjs", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", @@ -41,9 +42,8 @@ "lint": "npx eslint 'src/**' 'tests/*.mjs'", "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", - "cibuild_step1": "node build.mjs", "wbuild": "node build.mjs", - "wcibuild_step1": "node build.mjs" + "wbuildall": "node build.mjs" }, "peerDependencies": { "@freesewing/core": "3.0.0-alpha.10" diff --git a/scripts/reconfigure.mjs b/scripts/reconfigure.mjs index 99f6e24de76..628e819cea8 100644 --- a/scripts/reconfigure.mjs +++ b/scripts/reconfigure.mjs @@ -7,7 +7,7 @@ import mustache from 'mustache' import conf from '../lerna.json' assert { type: 'json' } const { version } = conf import { software, publishedTypes as types, designs, plugins } from '../config/software/index.mjs' -import { buildOrder } from '../config/build-order.mjs' +// import { buildOrder } from '../config/build-order.mjs' import rootPackageJson from '../package.json' assert { type: 'json' } import { capitalize } from '../packages/core/src/index.mjs' @@ -96,22 +96,7 @@ log.write(chalk.green(' Done\n')) // Step 4: Generate overall CHANGELOG.md fs.writeFileSync(path.join(repo.path, 'CHANGELOG.md'), changelog('global')) -// Step 5: Generate build script for published software -log.write(chalk.blueBright('Generating buildall node script...')) -const buildSteps = buildOrder.map((step, i) => `lerna run cibuild_step${i}`) -// Can we skip reconfigure? -//const buildAllCommand = 'npm run reconfigure && ' + buildSteps.join(' && ') -const buildAllCommand = buildSteps.join(' && ') -const newRootPkgJson = { ...rootPackageJson } -newRootPkgJson.scripts.buildall = buildAllCommand -newRootPkgJson.scripts.wbuildall = buildAllCommand.replace(/cibuild/g, 'wcibuild') -fs.writeFileSync( - path.join(repo.path, 'package.json'), - JSON.stringify(newRootPkgJson, null, 2) + '\n' -) -log.write(chalk.green(' Done\n')) - -// Step 6: Generate tests for designs and plugins +// Step 5: Generate tests for designs and plugins for (const design in designs) { fs.writeFileSync( path.join(repo.path, 'designs', design, 'tests', 'shared.test.mjs'), @@ -219,22 +204,15 @@ function scripts(pkg) { } } - // Enforce build order by generating the cibuild_stepX scrips - for (let step = 0; step < buildOrder.length; step++) { - if (buildOrder[step].indexOf(pkg.name) !== -1) { - if (runScripts.prebuild) { - runScripts[`precibuild_step${step}`] = runScripts.prebuild - if (!runScripts.prewbuild) runScripts.prewbuild = runScripts.prebuild - } - if (runScripts.build) { - runScripts[`cibuild_step${step}`] = runScripts.build + // make windows versions of build prebuild scripts + runScripts.wbuild = runScripts.wbuild || runScripts.build + runScripts.prewbuild = runScripts.prewbuild || runScripts.prebuild - // add windows scripts - if (!runScripts.wbuild) runScripts.wbuild = runScripts.build - - runScripts[`wcibuild_step${step}`] = runScripts.wbuild - } - } + // make prebuildall and windows versions of buildall and prebuildall + if (runScripts.buildall !== undefined) { + runScripts.wbuildall = runScripts.wbuildall || runScripts.wbuild + runScripts.prebuildall = runScripts.prebuildall || runScripts.prebuild + runScripts.prewbuildall = runScripts.prewbuildall || runScripts.prewbuild } return runScripts diff --git a/sites/backend/package.json b/sites/backend/package.json index 28e30dad813..7c6d190fcd5 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -24,7 +24,9 @@ "rmdb": "node ./scripts/rmdb.mjs", "test": "npx mocha --require mocha-steps tests/index.mjs", "vbuild": "VERBOSE=1 node build.mjs", - "prebuild": "node scripts/prebuild.mjs" + "prebuild": "node scripts/prebuild.mjs", + "wbuild": "node build.mjs", + "prewbuild": "node scripts/prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/dev/package.json b/sites/dev/package.json index 7020cf28230..fcd1265616a 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -21,12 +21,14 @@ "develop": "next dev -p 8000", "i18n": "SITE=dev node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "buildsitedeps": "npx lerna run buildall", "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", "predev": "node --experimental-json-modules ./prebuild.mjs", "serve": "pm2 start npm --name 'dev' -- run start", - "start": "yarn prebuild && yarn dev" + "start": "yarn prebuild && yarn dev", + "wbuild": "next build", + "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/lab/package.json b/sites/lab/package.json index ec4dd2ae62e..f28a972c34b 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -22,11 +22,13 @@ "i18n": "SITE=lab node ../shared/prebuild/i18n-only.mjs", "e2e": "yarn playwright test", "lint": "next lint", - "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "buildsitedeps": "npx lerna run buildall", "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", "predev": "node --experimental-json-modules ./prebuild.mjs", - "start": "yarn prebuild && yarn dev" + "start": "yarn prebuild && yarn dev", + "wbuild": "next build", + "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/org/package.json b/sites/org/package.json index c66b2f930c6..15e4bc97cf1 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -21,11 +21,13 @@ "develop": "next dev -p 8000", "i18n": "SITE=org node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "buildsitedeps": "npx lerna run buildall", "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", "predev": "node --experimental-json-modules ./prebuild.mjs", - "start": "yarn prebuild && yarn dev" + "start": "yarn prebuild && yarn dev", + "wbuild": "next build", + "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/sanity/package.json b/sites/sanity/package.json index 1fb4db4d04c..8a24b02fb12 100644 --- a/sites/sanity/package.json +++ b/sites/sanity/package.json @@ -16,7 +16,8 @@ "scripts": { "dev": "sanity dev", "start": "sanity start", - "build": "sanity build -y" + "build": "sanity build -y", + "wbuild": "sanity build -y" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/shared/prebuild/markdown.mjs b/sites/shared/prebuild/markdown.mjs index 52d41b78cf8..55701589300 100644 --- a/sites/shared/prebuild/markdown.mjs +++ b/sites/shared/prebuild/markdown.mjs @@ -41,7 +41,7 @@ const loadFolderFrontmatter = async (key, site, folder, transform = false, lang const cmd = `find ${cwd} -type f -name "${ lang ? lang : '*' }.md" -exec grep "^${key}:" -ism 1 {} +` - const grep = exec(cmd, { cwd }, (error, stdout, stderr) => { + const grep = exec(cmd, { cwd, maxBuffer: 2048 * 1024 }, (error, stdout, stderr) => { if (error) { console.error(`exec error: ${error} - ${stderr}`) return