diff --git a/config/scripts.yaml b/config/scripts.yaml index 5edd4d7e603..d4e444c9b20 100644 --- a/config/scripts.yaml +++ b/config/scripts.yaml @@ -28,11 +28,11 @@ core: models: test: 'npx mocha tests/*.test.mjs' new-design: - i18n-only: 'SITE="new-design/shared" node ../../sites/shared/prebuild/i18n-only.mjs' + i18n-only: 'SITE="new-design/shared" node --conditions=internal ../../sites/shared/prebuild/i18n-only.mjs' wbuild: '!' lint: "npx eslint 'lib/*.mjs'" mbuild: '!' - prebuild: 'node ./prebuild.mjs' + prebuild: 'node --conditions=internal ./prebuild.mjs' test: '!' testci: '!' vbuild: '!' @@ -69,10 +69,9 @@ dev: clean: &nextClean 'rimraf prebuild/* && rimraf public/locales/*/* && rimraf public/feeds/* && rimraf ../shared/prebuild/data/*' dev: &nextDev 'next dev -p 8000' develop: *nextDev - i18n: "SITE=dev node ../shared/prebuild/i18n-only.mjs" + i18n: "SITE=dev node --conditions=internal ../shared/prebuild/i18n-only.mjs" lint: &nextLint 'next lint' - prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' - predev: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: &nextPrebuild 'node --conditions=internal --experimental-json-modules ./prebuild.mjs' serve: "pm2 start npm --name 'dev' -- run start" start: &nextStart 'yarn prebuild && yarn dev' @@ -85,11 +84,10 @@ lab: cibuild: 'yarn build' dev: *nextDev develop: *nextDev - i18n: 'SITE=lab node ../shared/prebuild/i18n-only.mjs' + i18n: 'SITE=lab node --conditions=internal ../shared/prebuild/i18n-only.mjs' e2e: &e2e 'yarn playwright test' lint: *nextLint - prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' - predev: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: *nextPrebuild start: *nextStart org: @@ -98,10 +96,9 @@ org: clean: *nextClean dev: *nextDev develop: *nextDev - i18n: 'SITE=org node ../shared/prebuild/i18n-only.mjs' + i18n: 'SITE=org node --conditions=internal ../shared/prebuild/i18n-only.mjs' lint: *nextLint - prebuild: 'cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs' - predev: 'node --experimental-json-modules ./prebuild.mjs' + prebuild: *nextPrebuild start: *nextStart sanity: diff --git a/config/templates/package.dflt.json b/config/templates/package.dflt.json index 1d535c8d852..80d0581c3f9 100644 --- a/config/templates/package.dflt.json +++ b/config/templates/package.dflt.json @@ -14,7 +14,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "cibuild_step1": "node build.mjs", diff --git a/designs/aaron/package.json b/designs/aaron/package.json index 81ea34d3b5f..635b64c5233 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/albert/package.json b/designs/albert/package.json index e07f89b4767..7bfdccce0ae 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/bee/package.json b/designs/bee/package.json index f270168ddfe..0f98d304da0 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/bella/package.json b/designs/bella/package.json index 353204a4e5d..05fa036a379 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 681030a755a..386b93575cd 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/bent/package.json b/designs/bent/package.json index ea5899f17fd..4d64f368cc9 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/bob/package.json b/designs/bob/package.json index d848eb40dca..e0478c86744 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 4096f8934d6..8cc51361517 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/brian/package.json b/designs/brian/package.json index de02cff8144..c9011f7847e 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 67eddd8936b..a5e0444f402 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/carlita/package.json b/designs/carlita/package.json index 14697136405..4c3eb61b863 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/carlton/package.json b/designs/carlton/package.json index c58d9fe789d..9f5ac8e2fd0 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index 222a02310ec..4ec6eb97b6c 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/charlie/package.json b/designs/charlie/package.json index 251c995d5e4..12fdafb7849 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 392ef9675ac..fd8bf5ad932 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/diana/package.json b/designs/diana/package.json index f328b16aca0..22187cd2897 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/examples/package.json b/designs/examples/package.json index 766d809e5e4..9715cac3797 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -22,7 +22,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/florence/package.json b/designs/florence/package.json index 62e4b4471a0..f6d1dc033af 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/florent/package.json b/designs/florent/package.json index be1820a972a..84380c82e90 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/hi/package.json b/designs/hi/package.json index f5bfa64980e..16ac7476ae0 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/holmes/package.json b/designs/holmes/package.json index 068fbcf5a21..79811bfa130 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index 08ece812f38..fbb42cb5e82 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/huey/package.json b/designs/huey/package.json index 7cf8efc2538..bbed7c5eea3 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 518757872fa..bdfc8d3c1f1 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 71ce674c944..7a14f1ebc29 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/legend/package.json b/designs/legend/package.json index caea0603827..05cf20a3199 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/lucy/package.json b/designs/lucy/package.json index 430a3af6af8..93918e71eb4 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index 09421fdedf2..e3f10f5b9ab 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/magde/package.json b/designs/magde/package.json index 12e16016c04..aa15bf50050 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/noble/package.json b/designs/noble/package.json index bd53702dc77..34bf9ad6613 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index 8cd74e444b6..bcbc19c4108 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/paco/package.json b/designs/paco/package.json index aa638486573..4d4381bc5cb 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/penelope/package.json b/designs/penelope/package.json index 9ea6a41c0c1..14cf5be2e95 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index c9dbac60e8a..c312d17c771 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index 487b51f4ead..1b01f94091a 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/sandy/package.json b/designs/sandy/package.json index c441dcf892b..f1bf4fda58a 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/shin/package.json b/designs/shin/package.json index 396c4b3db1a..a70dd2be95d 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/simon/package.json b/designs/simon/package.json index a9004c157d5..96cadcf3ba4 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/simone/package.json b/designs/simone/package.json index afea33933a9..5cbdad5dd91 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/sven/package.json b/designs/sven/package.json index 657dbee93f9..93a38ac37f2 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index bf425bb9ede..4143ab3edfb 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/teagan/package.json b/designs/teagan/package.json index e5486fb29f3..9bf7cba2c20 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index 0c6221b6567..c0c796dfb90 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/titan/package.json b/designs/titan/package.json index 5ca56d07f76..e861746b8df 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index 9d511f6b20e..50a11c2a31c 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/tutorial/package.json b/designs/tutorial/package.json index f053016bd7a..475ef0bfc45 100644 --- a/designs/tutorial/package.json +++ b/designs/tutorial/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/unice/package.json b/designs/unice/package.json index cd68329b8fb..c96fb1f3190 100644 --- a/designs/unice/package.json +++ b/designs/unice/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/ursula/package.json b/designs/ursula/package.json index cfd7a743554..1516130cc09 100644 --- a/designs/ursula/package.json +++ b/designs/ursula/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/wahid/package.json b/designs/wahid/package.json index e09b7691031..cf2bdc0663e 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/walburga/package.json b/designs/walburga/package.json index af28bce8db5..a6d48119171 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/waralee/package.json b/designs/waralee/package.json index d17e97c11f8..57330d1220a 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 491dca12b8c..c7fa92141d5 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/packages/core/package.json b/packages/core/package.json index aea10d07888..04d43a827d5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -28,7 +28,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/packages/models/package.json b/packages/models/package.json index 242a79b8de3..66debb6e9fd 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -24,7 +24,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/packages/new-design/package.json b/packages/new-design/package.json index 11f5f1870b9..2a9a5eb32c1 100644 --- a/packages/new-design/package.json +++ b/packages/new-design/package.json @@ -26,10 +26,10 @@ "lab": "cd ../../sites/lab && yarn start", "tips": "node ../../scripts/help.mjs", "lint": "npx eslint 'lib/*.mjs'", - "i18n-only": "SITE=\"new-design/shared\" node ../../sites/shared/prebuild/i18n-only.mjs", - "prebuild": "node ./prebuild.mjs", + "i18n-only": "SITE=\"new-design/shared\" node --conditions=internal ../../sites/shared/prebuild/i18n-only.mjs", + "prebuild": "node --conditions=internal ./prebuild.mjs", "wbuild": "node build.mjs", - "prewbuild": "node ./prebuild.mjs", + "prewbuild": "node --conditions=internal ./prebuild.mjs", "wbuild:all": "yarn wbuild", "prebuild:all": "yarn prebuild", "prewbuild:all": "yarn prewbuild" diff --git a/packages/react-components/package.json b/packages/react-components/package.json index ea8f18c12ea..6bd4bab2916 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -20,7 +20,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/packages/rehype-highlight-lines/package.json b/packages/rehype-highlight-lines/package.json index 7aa041a84d9..a8c3558a48a 100644 --- a/packages/rehype-highlight-lines/package.json +++ b/packages/rehype-highlight-lines/package.json @@ -20,7 +20,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "clean": "rimraf dist", diff --git a/packages/rehype-jargon/package.json b/packages/rehype-jargon/package.json index 64544612fe5..7510b6b3f20 100644 --- a/packages/rehype-jargon/package.json +++ b/packages/rehype-jargon/package.json @@ -20,7 +20,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/packages/snapseries/package.json b/packages/snapseries/package.json index c4fcff3b1d7..dd01b061166 100644 --- a/packages/snapseries/package.json +++ b/packages/snapseries/package.json @@ -20,7 +20,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index 23823952a54..b3c080c8e3a 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-bundle/package.json b/plugins/plugin-bundle/package.json index a3554f6b0a8..04b81a2f50b 100644 --- a/plugins/plugin-bundle/package.json +++ b/plugins/plugin-bundle/package.json @@ -28,7 +28,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 107311a4df6..d051f548114 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index 909c0733d38..06527ec0617 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index b67764c51c2..8f98c49fbd8 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index 04095bdb187..3646700deeb 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 87eb450ce8e..a6f65c879fd 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 84e59644d8f..0a1ab5ce95d 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index 8ab8b58c55e..156fa347dda 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index b0e14ec9341..fee8c98a0b2 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 98cdf79ce60..61b6f13c6a7 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index cab6f3b1bc9..dfa2296cc94 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index 5d907f89817..2736235cb55 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index 0df7061d73a..590d5bcbc4b 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -27,7 +27,10 @@ "type": "module", "module": "dist/index.mjs", "exports": { - ".": "./dist/index.mjs" + ".": { + "internal": "./src/index.mjs", + "default": "./dist/index.mjs" + } }, "scripts": { "build": "node build.mjs", diff --git a/scripts/reconfigure.mjs b/scripts/reconfigure.mjs index 26e45bfba6c..b7be290b747 100644 --- a/scripts/reconfigure.mjs +++ b/scripts/reconfigure.mjs @@ -274,14 +274,7 @@ 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 d3953ad7379..121da6fa5dd 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -19,14 +19,13 @@ "clean": "rimraf prebuild/* && rimraf public/locales/*/* && rimraf public/feeds/* && rimraf ../shared/prebuild/data/*", "dev": "next dev -p 8000", "develop": "next dev -p 8000", - "i18n": "SITE=dev node ../shared/prebuild/i18n-only.mjs", + "i18n": "SITE=dev node --conditions=internal ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs", - "predev": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs", "serve": "pm2 start npm --name 'dev' -- run start", "start": "yarn prebuild && yarn dev", "wbuild": "next build", - "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/lab/package.json b/sites/lab/package.json index a85014b9054..6a4f5d61512 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -18,14 +18,13 @@ "cibuild": "yarn build", "dev": "next dev -p 8000", "develop": "next dev -p 8000", - "i18n": "SITE=lab node ../shared/prebuild/i18n-only.mjs", + "i18n": "SITE=lab node --conditions=internal ../shared/prebuild/i18n-only.mjs", "e2e": "yarn playwright test", "lint": "next lint", - "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs", - "predev": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs", "start": "yarn prebuild && yarn dev", "wbuild": "next build", - "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": { diff --git a/sites/org/package.json b/sites/org/package.json index 7e0d868d652..0c747275ffc 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -19,13 +19,12 @@ "clean": "rimraf prebuild/* && rimraf public/locales/*/* && rimraf public/feeds/* && rimraf ../shared/prebuild/data/*", "dev": "next dev -p 8000", "develop": "next dev -p 8000", - "i18n": "SITE=org node ../shared/prebuild/i18n-only.mjs", + "i18n": "SITE=org node --conditions=internal ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "prebuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs", - "predev": "node --experimental-json-modules ./prebuild.mjs", + "prebuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs", "start": "yarn prebuild && yarn dev", "wbuild": "next build", - "prewbuild": "cd ../../ && yarn sitebuildconfigure && cd - && node --experimental-json-modules ./prebuild.mjs" + "prewbuild": "node --conditions=internal --experimental-json-modules ./prebuild.mjs" }, "peerDependencies": {}, "dependencies": {