Skip to content

Commit 620f26a

Browse files
authored
build(client): clean up fluid-build config (#26005)
Removes a lot of outdated settings in the fluid-build config.
1 parent db4d93b commit 620f26a

File tree

3 files changed

+16
-213
lines changed

3 files changed

+16
-213
lines changed

fluidBuild.config.cjs

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,6 @@ module.exports = {
314314
// Entries here are COMPLETELY ignored by the policy checker. Instead of adding entries here, consider adding
315315
// entries to the handlerExclusions list below to ignore a particular.
316316
exclusions: [
317-
// The paths below are for fluidframework.com layouts and code and are not subject to policy.
318-
"docs/layouts/",
319-
"docs/themes/thxvscode/assets/",
320-
"docs/themes/thxvscode/layouts/",
321-
"docs/themes/thxvscode/static/assets/",
322-
323317
// This file is a test file.
324318
"tools/markdown-magic/test/package.json",
325319

@@ -364,51 +358,46 @@ module.exports = {
364358

365359
// minified DOMPurify is not a source file, so it doesn't need a header.
366360
"docs/static/dompurify/purify.min.js",
367-
368-
// Type test files can be excluded since they're generated and known to have the correct header.
369-
// This can be removed once the whole repo uses build-tools v0.35.0+.
370-
/.*\/validate.*\.generated\.ts/,
371361
],
372362
"no-js-file-extensions": [
373363
// PropertyDDS uses .js files which should be renamed eventually.
374364
"experimental/PropertyDDS/.*",
375365
"azure/packages/azure-local-service/index.js",
366+
367+
// These oclif packages are still CJS vs. build-infrastructure which is ESM so is not excluded here.
376368
"build-tools/packages/build-cli/bin/dev.js",
377369
"build-tools/packages/build-cli/bin/run.js",
378-
"build-tools/packages/build-cli/test/helpers/init.js",
379370
"build-tools/packages/version-tools/bin/dev.js",
380371
"build-tools/packages/version-tools/bin/run.js",
372+
373+
// Could be renamed, but there is tooling that uses this name and it's not worth it.
381374
"common/build/build-common/gen_version.js",
375+
376+
// ESLint shared config and plugin
382377
"common/build/eslint-config-fluid/.*",
378+
"common/build/eslint-plugin-fluid/.*",
379+
383380
"common/lib/common-utils/jest-puppeteer.config.js",
384381
"common/lib/common-utils/jest.config.js",
385-
"common/build/eslint-plugin-fluid/.*",
386-
"docs/api-markdown-documenter/.*",
387-
"docs/api/fallback/index.js",
388-
"docs/build-redirects.js",
389-
"docs/download-apis.js",
390-
"docs/local-api-rollup.js",
382+
391383
// Avoids MIME-type issues in the browser.
392384
"docs/static/trusted-types-policy.js",
393385
"docs/static/dompurify/purify.min.js",
394386
"docs/static/js/add-code-copy-button.js",
395387
"examples/data-objects/monaco/loaders/blobUrl.js",
396388
"examples/data-objects/monaco/loaders/compile.js",
397389
"examples/service-clients/odsp-client/shared-tree-demo/tailwind.config.js",
398-
"packages/test/mocha-test-setup/mocharc-common.js",
399390
"packages/test/test-service-load/scripts/usePrereleaseDeps.js",
400-
"packages/tools/devtools/devtools-browser-extension/test-setup.js",
391+
392+
// Changelog generator wrapper is in js
401393
"tools/changelog-generator-wrapper/src/getDependencyReleaseLine.js",
402394
"tools/changelog-generator-wrapper/src/getReleaseLine.js",
403395
"tools/changelog-generator-wrapper/src/index.js",
396+
404397
"tools/getkeys/index.js",
405398
],
406-
"npm-package-metadata-and-sorting": [
407-
// The root package.json is not checked temporarily due to AB#8640
408-
"^package.json",
409-
],
410399
"npm-package-json-prettier": [
411-
// This rule is temporarily disabled for all projects while we update the repo to use different formatting
400+
// This rule is disabled for the whole repo because we no longer use prettier in the majority of packages.
412401
".*",
413402
],
414403
"npm-package-json-scripts-args": [
@@ -453,19 +442,9 @@ module.exports = {
453442
"^experimental/PropertyDDS/",
454443
"^tools/api-markdown-documenter/",
455444
],
456-
// This handler will be rolled out slowly, so excluding most packages here while we roll it out.
457445
"npm-package-exports-field": [
458-
// We deliberately improperly import from deep in the package tree while we migrate everything into other
459-
// packages. This is temporary and can be fixed once the build-tools/build-cli pigration is complete.
460-
"^azure/",
461-
"^build-tools/packages/build-tools/package.json",
462-
"^build-tools/packages/build-infrastructure/package.json",
463-
"^common/",
464-
"^examples/",
465-
"^experimental/",
466-
"^packages/",
467-
"^server/",
468-
"^tools/",
446+
// This policy is no longer correct or applicable to our packages, so all files are excluded.
447+
".*",
469448
],
470449
"npm-package-json-clean-script": [
471450
"server/gitrest/package.json",

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@
188188
"run-script-os": "^1.1.6",
189189
"syncpack": "^13.0.2",
190190
"ts2esm": "^1.4.0",
191-
"typescript": "~5.4.5",
192-
"@monorepo-utils/workspaces-to-typescript-project-references": "^2.11.0"
191+
"typescript": "~5.4.5"
193192
},
194193
"packageManager": "pnpm@10.18.3+sha512.bbd16e6d7286fd7e01f6b3c0b3c932cda2965c06a908328f74663f10a9aea51f1129eea615134bf992831b009eabe167ecb7008b597f40ff9bc75946aadfb08d",
195194
"engines": {

0 commit comments

Comments
 (0)