From 009e1c1cc93c76bc860970a62249e8f55d8334b3 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Wed, 26 Jul 2023 19:51:51 +0200 Subject: [PATCH] fix(shared): Get rid of build:sitedeps Recently I refactored the prebuild code. One thing I did not touch (yet) was the various site dependencies. They were then ported to NX over the previous system with build priorities we had in place. And while that was a welcome improvement, it did not really address the bigger picture: we don't actually need to build any of these dependencies to build the site. All we need to do is help NodeJS so it can resolve everything from the source. So this commit does that by adding a top-level run script `yarn buildsiteconfigure` which calls `yarn reconfigure` but with the BUILDSITE variable set. When that variable is set, the reconfigure script will skip all optional steps and generate a slightly different package.json file that tells NodeJS to looks the package from source, rather than to look for the build files. After running this script, the prebuild step for the various sites will run without problems, even on a fresh repo where nothing has ever been build. So I've updated the prebuild script in the sites to run this. For local development, please use `uyarn predev` so that you don't muck with all the package.json files. If you do so (by accident or not) a `yarn reconfigure` run will put everything back in its place. --- config/scripts.yaml | 16 +-- designs/aaron/package.json | 2 - designs/albert/package.json | 2 - designs/bee/package.json | 2 - designs/bella/package.json | 2 - designs/benjamin/package.json | 2 - designs/bent/package.json | 2 - designs/bob/package.json | 2 - designs/breanna/package.json | 2 - designs/brian/package.json | 2 - designs/bruce/package.json | 2 - designs/carlita/package.json | 2 - designs/carlton/package.json | 2 - designs/cathrin/package.json | 2 - designs/charlie/package.json | 2 - designs/cornelius/package.json | 2 - designs/diana/package.json | 2 - designs/examples/package.json | 2 - designs/florence/package.json | 2 - designs/florent/package.json | 2 - designs/hi/package.json | 2 - designs/holmes/package.json | 2 - designs/hortensia/package.json | 2 - designs/huey/package.json | 2 - designs/hugo/package.json | 2 - designs/jaeger/package.json | 2 - designs/legend/package.json | 2 - designs/lucy/package.json | 2 - designs/lunetius/package.json | 2 - designs/magde/package.json | 2 - designs/noble/package.json | 2 - designs/octoplushy/package.json | 2 - designs/paco/package.json | 2 - designs/penelope/package.json | 2 - designs/plugintest/package.json | 2 - designs/rendertest/package.json | 2 - designs/sandy/package.json | 2 - designs/shin/package.json | 2 - designs/simon/package.json | 2 - designs/simone/package.json | 2 - designs/sven/package.json | 2 - designs/tamiko/package.json | 2 - designs/teagan/package.json | 2 - designs/tiberius/package.json | 2 - designs/titan/package.json | 2 - designs/trayvon/package.json | 2 - designs/tutorial/package.json | 2 - designs/unice/package.json | 2 - designs/ursula/package.json | 2 - designs/wahid/package.json | 2 - designs/walburga/package.json | 2 - designs/waralee/package.json | 2 - designs/yuri/package.json | 2 - nx.json | 2 +- package.json | 1 + packages/core/package.json | 2 - packages/models/package.json | 2 - packages/react-components/package.json | 2 - packages/rehype-jargon/package.json | 2 - packages/snapseries/package.json | 2 - plugins/plugin-annotations/package.json | 2 - plugins/plugin-bundle/package.json | 2 - plugins/plugin-bust/package.json | 2 - plugins/plugin-flip/package.json | 2 - plugins/plugin-gore/package.json | 2 - plugins/plugin-i18n/package.json | 2 - plugins/plugin-measurements/package.json | 2 - plugins/plugin-mirror/package.json | 2 - plugins/plugin-round/package.json | 2 - plugins/plugin-sprinkle/package.json | 2 - plugins/plugin-svgattr/package.json | 2 - plugins/plugin-theme/package.json | 2 - plugins/plugin-timing/package.json | 2 - plugins/plugin-versionfree-svg/package.json | 2 - scripts/reconfigure.mjs | 122 +++++++++++--------- sites/dev/package.json | 6 +- sites/lab/package.json | 7 +- sites/org/package.json | 6 +- 78 files changed, 80 insertions(+), 222 deletions(-) diff --git a/config/scripts.yaml b/config/scripts.yaml index f013a34d693..5edd4d7e603 100644 --- a/config/scripts.yaml +++ b/config/scripts.yaml @@ -1,6 +1,5 @@ _: build: &build 'node build.mjs' - 'build:sitedeps': 'yarn build' 'build:all': 'yarn build' clean: 'rimraf dist' mbuild: &mbuild 'NO_MINIFY=1 node build.mjs' @@ -37,13 +36,11 @@ new-design: test: '!' testci: '!' vbuild: '!' - 'build:sitedeps': '!' rehype-highlight-lines: build: '!' mbuild: '!' vbuild: '!' 'build:all': '!' - 'build:sitedeps': '!' lint: "npx eslint 'src/*.mjs'" rehype-jargon: lint: "npx eslint 'src/*.mjs'" @@ -74,9 +71,7 @@ dev: develop: *nextDev i18n: "SITE=dev node ../shared/prebuild/i18n-only.mjs" lint: &nextLint 'next lint' - buildsitedeps: &buildsitedeps 'npx lerna run build:sitedeps' - prebuild: 'yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs' - prebuildonly: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' predev: 'node --experimental-json-modules ./prebuild.mjs' serve: "pm2 start npm --name 'dev' -- run start" start: &nextStart 'yarn prebuild && yarn dev' @@ -88,15 +83,12 @@ email: lab: build: *nextBuild cibuild: 'yarn build' - clean: 'rimraf pages/*.mjs && rimraf pages/*/*.mjs && rimraf pages/v/*/*.mjs' dev: *nextDev develop: *nextDev i18n: 'SITE=lab node ../shared/prebuild/i18n-only.mjs' e2e: &e2e 'yarn playwright test' lint: *nextLint - buildsitedeps: *buildsitedeps - prebuild: 'yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs' - prebuildonly: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' predev: 'node --experimental-json-modules ./prebuild.mjs' start: *nextStart @@ -108,9 +100,7 @@ org: develop: *nextDev i18n: 'SITE=org node ../shared/prebuild/i18n-only.mjs' lint: *nextLint - buildsitedeps: *buildsitedeps - prebuild: 'yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs' - prebuildonly: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' predev: 'node --experimental-json-modules ./prebuild.mjs' start: *nextStart diff --git a/designs/aaron/package.json b/designs/aaron/package.json index 9220d7cbbc0..81ea34d3b5f 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/albert/package.json b/designs/albert/package.json index e74dcac4bf0..e07f89b4767 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/bee/package.json b/designs/bee/package.json index 252e764a6de..f270168ddfe 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/bella/package.json b/designs/bella/package.json index bdca80d712f..353204a4e5d 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 709b605b598..681030a755a 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/bent/package.json b/designs/bent/package.json index 6ac8faa1b93..ea5899f17fd 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/bob/package.json b/designs/bob/package.json index 0b5d31f6de5..d848eb40dca 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 6cb4797ba39..4096f8934d6 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/brian/package.json b/designs/brian/package.json index 2b751393e84..de02cff8144 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/bruce/package.json b/designs/bruce/package.json index aa62ed0e03d..67eddd8936b 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/carlita/package.json b/designs/carlita/package.json index 62a7d6a7027..14697136405 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/carlton/package.json b/designs/carlton/package.json index baa2a089ff4..c58d9fe789d 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index a45908b40f6..222a02310ec 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/charlie/package.json b/designs/charlie/package.json index c9c7c46d97b..251c995d5e4 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 18566478f37..392ef9675ac 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/diana/package.json b/designs/diana/package.json index 279c038c424..f328b16aca0 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/examples/package.json b/designs/examples/package.json index 7f8c2e961bb..766d809e5e4 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -26,7 +26,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -39,7 +38,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/florence/package.json b/designs/florence/package.json index aece0f9c756..62e4b4471a0 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/florent/package.json b/designs/florent/package.json index 0471400f230..be1820a972a 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/hi/package.json b/designs/hi/package.json index d2eea7d67d6..f5bfa64980e 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/holmes/package.json b/designs/holmes/package.json index ae46647889f..068fbcf5a21 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index e5dc041ab3d..08ece812f38 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/huey/package.json b/designs/huey/package.json index caf9b266dc3..7cf8efc2538 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 33d8968b1fa..518757872fa 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 5cb90bc8e5c..71ce674c944 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/legend/package.json b/designs/legend/package.json index 61f2f75fb7d..caea0603827 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/lucy/package.json b/designs/lucy/package.json index e3cb589e4cf..430a3af6af8 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index 4d5d2e3c05e..09421fdedf2 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/magde/package.json b/designs/magde/package.json index de849804b16..12e16016c04 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/noble/package.json b/designs/noble/package.json index 0350548c695..bd53702dc77 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index c9e0dcb3415..8cd74e444b6 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/paco/package.json b/designs/paco/package.json index 84381b7b0bb..aa638486573 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/penelope/package.json b/designs/penelope/package.json index a8161b779ee..9ea6a41c0c1 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 7bb515422c7..c9dbac60e8a 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index b41aa3bbc89..487b51f4ead 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/sandy/package.json b/designs/sandy/package.json index 10dfed357b4..c441dcf892b 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/shin/package.json b/designs/shin/package.json index d3a41492548..396c4b3db1a 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/simon/package.json b/designs/simon/package.json index 9b2e019e4b1..a9004c157d5 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/simone/package.json b/designs/simone/package.json index 56b56cec5ac..afea33933a9 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/sven/package.json b/designs/sven/package.json index 2dfa5d1e16f..657dbee93f9 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index 90de790913c..bf425bb9ede 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 3524cb4981c..e5486fb29f3 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index e227a6313b4..0c6221b6567 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/titan/package.json b/designs/titan/package.json index 8fbb94f6bc9..5ca56d07f76 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index a0364e372f8..9d511f6b20e 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/tutorial/package.json b/designs/tutorial/package.json index fb524af241b..f053016bd7a 100644 --- a/designs/tutorial/package.json +++ b/designs/tutorial/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/unice/package.json b/designs/unice/package.json index f28231680dc..cd68329b8fb 100644 --- a/designs/unice/package.json +++ b/designs/unice/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/ursula/package.json b/designs/ursula/package.json index 0b3ff6b5fde..cfd7a743554 100644 --- a/designs/ursula/package.json +++ b/designs/ursula/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/wahid/package.json b/designs/wahid/package.json index e44ceae08a8..e09b7691031 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/walburga/package.json b/designs/walburga/package.json index 328ae54c94c..af28bce8db5 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/waralee/package.json b/designs/waralee/package.json index 318b03baad9..d17e97c11f8 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 841d0949b49..491dca12b8c 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/nx.json b/nx.json index 70037ccdebc..cbddad0d3c6 100644 --- a/nx.json +++ b/nx.json @@ -3,7 +3,7 @@ "default": { "runner": "nx/tasks-runners/default", "options": { - "cacheableOperations": ["build", "wbuild", "build:all", "build:sitedeps"], + "cacheableOperations": ["build", "wbuild", "build:all"], "parallel": 5 } } diff --git a/package.json b/package.json index 927e2f0b116..dd6c1c8d0d6 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "e2e": "lerna run e2e", "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", + "sitebuildconfigure": "SITEBUILD=1 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 build:all", "build": "yarn build:all", diff --git a/packages/core/package.json b/packages/core/package.json index bc8872152dc..aea10d07888 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -32,7 +32,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -47,7 +46,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "jsdoc": "jsdoc -c jsdoc.json -r src", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": {}, diff --git a/packages/models/package.json b/packages/models/package.json index 065d73bd37b..242a79b8de3 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -28,7 +28,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -39,7 +38,6 @@ "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/**' 'tests/*.mjs'", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": {}, diff --git a/packages/react-components/package.json b/packages/react-components/package.json index d8d7ac5f2c4..ea8f18c12ea 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -24,7 +24,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -35,7 +34,6 @@ "tips": "node ../../scripts/help.mjs", "lint": "eslint 'src/**/*.mjs'", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/packages/rehype-jargon/package.json b/packages/rehype-jargon/package.json index c3b0e49e370..64544612fe5 100644 --- a/packages/rehype-jargon/package.json +++ b/packages/rehype-jargon/package.json @@ -24,7 +24,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -35,7 +34,6 @@ "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/*.mjs'", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": {}, diff --git a/packages/snapseries/package.json b/packages/snapseries/package.json index c6af79dd7d4..c4fcff3b1d7 100644 --- a/packages/snapseries/package.json +++ b/packages/snapseries/package.json @@ -24,7 +24,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -35,7 +34,6 @@ "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'src/*.mjs'", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": {}, diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index a2311949177..23823952a54 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-bundle/package.json b/plugins/plugin-bundle/package.json index b1559276bbe..a3554f6b0a8 100644 --- a/plugins/plugin-bundle/package.json +++ b/plugins/plugin-bundle/package.json @@ -32,7 +32,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -45,7 +44,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 1582798d044..107311a4df6 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index 4c3d209f80a..909c0733d38 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index 36f827730ea..b67764c51c2 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index 105e8efe0cf..04095bdb187 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 10f142f32e7..87eb450ce8e 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 3b596451948..84e59644d8f 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index 4720b647294..8ab8b58c55e 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index e00b349b3c8..b0e14ec9341 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 20208cd7f08..98cdf79ce60 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index adac064619a..cab6f3b1bc9 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index 77056b9ed21..5d907f89817 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index ca978e5b4dd..0df7061d73a 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -31,7 +31,6 @@ }, "scripts": { "build": "node build.mjs", - "build:sitedeps": "yarn build", "build:all": "yarn build", "clean": "rimraf dist", "mbuild": "NO_MINIFY=1 node build.mjs", @@ -44,7 +43,6 @@ "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'", "testci": "npx mocha tests/*.test.mjs --reporter ../../tests/reporters/terse.js", "wbuild": "node build.mjs", - "wbuild:sitedeps": "yarn wbuild", "wbuild:all": "yarn wbuild" }, "peerDependencies": { diff --git a/scripts/reconfigure.mjs b/scripts/reconfigure.mjs index e68050b2d8c..26e45bfba6c 100644 --- a/scripts/reconfigure.mjs +++ b/scripts/reconfigure.mjs @@ -12,6 +12,15 @@ import { capitalize } from '../packages/core/src/index.mjs' // Working directory const cwd = process.cwd() +/* + * When we're building a site (on Vercel for example) SITEBUILD + * will be set and we'll do things differently to speed up the build. + * To make that check easy, we setup this SITEBUILD variable + */ +const SITEBUILD = process.env.SITEBUILD || false + +if (SITEBUILD) console.log('Site build | Configure monorepo accordingly') + /* * This object holds info about the repository */ @@ -19,24 +28,26 @@ const repo = { path: cwd, defaults: readConfigFile('defaults.yaml'), keywords: readConfigFile('keywords.yaml'), - badges: readConfigFile('badges.yaml'), + badges: SITEBUILD ? null : readConfigFile('badges.yaml'), scripts: readConfigFile('scripts.yaml'), - changelog: readConfigFile('changelog.yaml'), + changelog: SITEBUILD ? null : readConfigFile('changelog.yaml'), changetypes: ['Breaking', 'Added', 'Changed', 'Deprecated', 'Removed', 'Fixed', 'Security'], dependencies: readConfigFile('dependencies.yaml', { version }), exceptions: readConfigFile('exceptions.yaml'), templates: { pkg: readTemplateFile('package.dflt.json'), - changelog: readTemplateFile('changelog.dflt.md'), - readme: readTemplateFile('readme.dflt.md'), - build: readTemplateFile('build.dflt.mjs'), - pluginTests: readTemplateFile('plugin.test.mjs'), - designTests: readTemplateFile('design.test.mjs.mustache'), - data: readTemplateFile('data.dflt.mjs.mustache'), + changelog: SITEBUILD ? null : readTemplateFile('changelog.dflt.md'), + readme: SITEBUILD ? null : readTemplateFile('readme.dflt.md'), + build: SITEBUILD ? null : readTemplateFile('build.dflt.mjs'), + pluginTests: SITEBUILD ? null : readTemplateFile('plugin.test.mjs'), + designTests: SITEBUILD ? null : readTemplateFile('design.test.mjs.mustache'), + data: SITEBUILD ? null : readTemplateFile('data.dflt.mjs.mustache'), }, dirs: foldersByType(), - contributors: fs.readFileSync(path.join(cwd, 'CONTRIBUTORS.md'), 'utf-8'), - ac: JSON.parse(fs.readFileSync(path.join(cwd, '.all-contributorsrc'), 'utf-8')), + contributors: SITEBUILD ? null : fs.readFileSync(path.join(cwd, 'CONTRIBUTORS.md'), 'utf-8'), + ac: SITEBUILD + ? null + : JSON.parse(fs.readFileSync(path.join(cwd, '.all-contributorsrc'), 'utf-8')), } /* @@ -56,19 +67,23 @@ for (const cp of copyThese) { } // Step 1: Generate main README file from template -log.write(chalk.blueBright('Generating out main README file...')) -fs.writeFileSync( - path.join(repo.path, 'README.md'), - mustache.render( - fs.readFileSync(path.join(repo.path, 'config', 'templates', 'readme.main.md'), 'utf-8'), - { allcontributors: repo.ac.contributors.length } - ) + repo.contributors -) -log.write(chalk.green(' Done\n')) +if (!SITEBUILD) { + log.write(chalk.blueBright('Generating out main README file...')) + fs.writeFileSync( + path.join(repo.path, 'README.md'), + mustache.render( + fs.readFileSync(path.join(repo.path, 'config', 'templates', 'readme.main.md'), 'utf-8'), + { allcontributors: repo.ac.contributors.length } + ) + repo.contributors + ) + log.write(chalk.green(' Done\n')) +} // Step 2: Validate package configuration -log.write(chalk.blueBright('Validating configuration...')) -if (validate()) log.write(chalk.green(' Done\n')) +if (!SITEBUILD) { + log.write(chalk.blueBright('Validating configuration...')) + if (validate()) log.write(chalk.green(' Done\n')) +} // Step 3: Generate package.json, pkg.mjs, README, and CHANGELOG log.write(chalk.blueBright('Generating package-specific files...')) @@ -77,37 +92,40 @@ for (const pkg of Object.values(software)) { path.join(cwd, pkg.folder, pkg.name, 'package.json'), JSON.stringify(packageJson(pkg), null, 2) + '\n' ) - if (pkg.type !== 'site') { - fs.writeFileSync( - path.join(cwd, pkg.folder, pkg.name, 'data.mjs'), - mustache.render(repo.templates.data, { name: fullName(pkg.name), version }) - ) - fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'README.md'), readme(pkg)) - if (repo.exceptions.customBuild.indexOf(pkg.name) === -1) { - fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'build.mjs'), repo.templates.build) + if (!SITEBUILD) { + if (pkg.type !== 'site') { + fs.writeFileSync( + path.join(cwd, pkg.folder, pkg.name, 'data.mjs'), + mustache.render(repo.templates.data, { name: fullName(pkg.name), version }) + ) + fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'README.md'), readme(pkg)) + if (repo.exceptions.customBuild.indexOf(pkg.name) === -1) { + fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'build.mjs'), repo.templates.build) + } + fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'CHANGELOG.md'), changelog(pkg)) } - fs.writeFileSync(path.join(cwd, pkg.folder, pkg.name, 'CHANGELOG.md'), changelog(pkg)) } } log.write(chalk.green(' Done\n')) // Step 4: Generate overall CHANGELOG.md -fs.writeFileSync(path.join(repo.path, 'CHANGELOG.md'), changelog('global')) +if (!SITEBUILD) fs.writeFileSync(path.join(repo.path, 'CHANGELOG.md'), changelog('global')) // 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'), - mustache.render(repo.templates.designTests, { name: design, Name: capitalize(design) }) - ) +if (!SITEBUILD) { + for (const design in designs) { + fs.writeFileSync( + path.join(repo.path, 'designs', design, 'tests', 'shared.test.mjs'), + mustache.render(repo.templates.designTests, { name: design, Name: capitalize(design) }) + ) + } + for (const plugin in plugins) { + fs.writeFileSync( + path.join(repo.path, 'plugins', plugin, 'tests', 'shared.test.mjs'), + repo.templates.pluginTests + ) + } } -for (const plugin in plugins) { - fs.writeFileSync( - path.join(repo.path, 'plugins', plugin, 'tests', 'shared.test.mjs'), - repo.templates.pluginTests - ) -} - // All done log.write(chalk.green(' All done\n')) process.exit() @@ -206,16 +224,6 @@ function scripts(pkg) { runScripts.wbuild = runScripts.wbuild || runScripts.build runScripts.prewbuild = runScripts.prewbuild || runScripts.prebuild - // make prebuild:sitedeps and windows versions of build:sitedeps and prebuild:sitedeps - if (runScripts['build:sitedeps'] !== undefined) { - runScripts['wbuild:sitedeps'] = - runScripts['wbuild:sitedeps'] || (runScripts.wbuild && 'yarn wbuild') - runScripts['prebuild:sitedeps'] = - runScripts['prebuild:sitedeps'] || (runScripts.prebuild && 'yarn prebuild') - runScripts['prewbuild:sitedeps'] = - runScripts['prewbuild:sitedeps'] || (runScripts.prewbuild && 'yarn prewbuild') - } - // make prebuild:all and windows versions of build:all and prebuild:all if (runScripts['build:all'] !== undefined) { runScripts['wbuild:all'] = runScripts['wbuild:all'] || (runScripts.wbuild && 'yarn wbuild') @@ -266,6 +274,14 @@ function packageJson(pkg) { } pkgConf.keywords = pkgConf.keywords.concat(keywords(pkg)) pkgConf.scripts = scripts(pkg) + /* + * If we building a site simply override the module entry so that we don't have + * to build any dependencies, but instead can just load them from source + */ + if (SITEBUILD) { + pkgConf.module = 'src/index.mjs' + pkgConf.exports = { '.': './src/index.mjs' } + } if (repo.exceptions.skipTests.indexOf(pkg.name) !== -1) { pkgConf.scripts.test = `echo "skipping tests for ${pkg.name}"` pkgConf.scripts.testci = `echo "skipping tests for ${pkg.name}"` diff --git a/sites/dev/package.json b/sites/dev/package.json index 0ca894b1bda..d3953ad7379 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -21,14 +21,12 @@ "develop": "next dev -p 8000", "i18n": "SITE=dev node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "buildsitedeps": "npx lerna run build:sitedeps", - "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", - "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && 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", "wbuild": "next build", - "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/lab/package.json b/sites/lab/package.json index 967f62eadeb..a85014b9054 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -16,19 +16,16 @@ "scripts": { "build": "next build", "cibuild": "yarn build", - "clean": "rimraf pages/*.mjs && rimraf pages/*/*.mjs && rimraf pages/v/*/*.mjs", "dev": "next dev -p 8000", "develop": "next dev -p 8000", "i18n": "SITE=lab node ../shared/prebuild/i18n-only.mjs", "e2e": "yarn playwright test", "lint": "next lint", - "buildsitedeps": "npx lerna run build:sitedeps", - "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", - "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs", "predev": "node --experimental-json-modules ./prebuild.mjs", "start": "yarn prebuild && yarn dev", "wbuild": "next build", - "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/org/package.json b/sites/org/package.json index 0789676eef3..7e0d868d652 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -21,13 +21,11 @@ "develop": "next dev -p 8000", "i18n": "SITE=org node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "buildsitedeps": "npx lerna run build:sitedeps", - "prebuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs", - "prebuildonly": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs", "predev": "node --experimental-json-modules ./prebuild.mjs", "start": "yarn prebuild && yarn dev", "wbuild": "next build", - "prewbuild": "yarn buildsitedeps && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": {