From edbdb1b56b2a8c6f2487d6223459c66b25edcf03 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Fri, 24 May 2024 17:53:26 +0200 Subject: [PATCH 1/8] chore: use new performant 'type-check' for tools tagged libaries --- scripts/api-extractor/just.config.ts | 3 + scripts/api-extractor/package.json | 5 +- scripts/babel/just.config.ts | 3 + scripts/babel/package.json | 5 +- scripts/beachball/just.config.ts | 3 + scripts/beachball/package.json | 5 +- scripts/cypress/just.config.ts | 3 + scripts/cypress/package.json | 5 +- scripts/dangerjs/just.config.ts | 3 + scripts/dangerjs/package.json | 5 +- scripts/executors/just.config.ts | 3 + scripts/executors/package.json | 5 +- scripts/fluentui-publish/just.config.ts | 3 + scripts/fluentui-publish/package.json | 5 +- scripts/generators/just.config.ts | 3 + scripts/generators/package.json | 5 +- scripts/github/just.config.ts | 3 + scripts/github/package.json | 5 +- scripts/gulp/just.config.ts | 3 + scripts/gulp/package.json | 5 +- scripts/jest/just.config.ts | 3 + scripts/jest/package.json | 5 +- scripts/lint-staged/just.config.ts | 3 + scripts/lint-staged/package.json | 5 +- scripts/monorepo/just.config.ts | 3 + scripts/monorepo/package.json | 5 +- scripts/package-manager/just.config.ts | 3 + scripts/package-manager/package.json | 5 +- scripts/perf-test-flamegrill/just.config.ts | 3 + scripts/perf-test-flamegrill/package.json | 5 +- scripts/prettier/just.config.ts | 3 + scripts/prettier/package.json | 5 +- scripts/projects-test/just.config.ts | 3 + scripts/projects-test/package.json | 5 +- scripts/puppeteer/just.config.ts | 3 + scripts/puppeteer/package.json | 5 +- scripts/storybook/just.config.ts | 3 + scripts/storybook/package.json | 5 +- scripts/tasks/just.config.ts | 3 + scripts/tasks/package.json | 5 +- scripts/test-ssr/just.config.ts | 3 + scripts/test-ssr/package.json | 5 +- scripts/triage-bot/just.config.ts | 3 + scripts/triage-bot/package.json | 5 +- scripts/ts-node/just.config.ts | 3 + scripts/ts-node/package.json | 5 +- scripts/update-release-notes/just.config.ts | 3 + scripts/update-release-notes/package.json | 5 +- scripts/utils/just.config.ts | 3 + scripts/utils/package.json | 5 +- scripts/webpack/just.config.ts | 3 + scripts/webpack/package.json | 5 +- tools/workspace-plugin/package.json | 8 ++- tools/workspace-plugin/scripts/type-check.js | 61 ++++++++++++++++++++ yarn.lock | 2 +- 55 files changed, 224 insertions(+), 55 deletions(-) create mode 100644 scripts/api-extractor/just.config.ts create mode 100644 scripts/babel/just.config.ts create mode 100644 scripts/beachball/just.config.ts create mode 100644 scripts/cypress/just.config.ts create mode 100644 scripts/dangerjs/just.config.ts create mode 100644 scripts/executors/just.config.ts create mode 100644 scripts/fluentui-publish/just.config.ts create mode 100644 scripts/generators/just.config.ts create mode 100644 scripts/github/just.config.ts create mode 100644 scripts/gulp/just.config.ts create mode 100644 scripts/jest/just.config.ts create mode 100644 scripts/lint-staged/just.config.ts create mode 100644 scripts/monorepo/just.config.ts create mode 100644 scripts/package-manager/just.config.ts create mode 100644 scripts/perf-test-flamegrill/just.config.ts create mode 100644 scripts/prettier/just.config.ts create mode 100644 scripts/projects-test/just.config.ts create mode 100644 scripts/puppeteer/just.config.ts create mode 100644 scripts/storybook/just.config.ts create mode 100644 scripts/tasks/just.config.ts create mode 100644 scripts/test-ssr/just.config.ts create mode 100644 scripts/triage-bot/just.config.ts create mode 100644 scripts/ts-node/just.config.ts create mode 100644 scripts/update-release-notes/just.config.ts create mode 100644 scripts/utils/just.config.ts create mode 100644 scripts/webpack/just.config.ts create mode 100644 tools/workspace-plugin/scripts/type-check.js diff --git a/scripts/api-extractor/just.config.ts b/scripts/api-extractor/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/api-extractor/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/api-extractor/package.json b/scripts/api-extractor/package.json index 9fb9a1cc4c813..5cfa6cec91098 100644 --- a/scripts/api-extractor/package.json +++ b/scripts/api-extractor/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/babel/just.config.ts b/scripts/babel/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/babel/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/babel/package.json b/scripts/babel/package.json index ea74f8fb70bf0..a9cab78e9901d 100644 --- a/scripts/babel/package.json +++ b/scripts/babel/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/beachball/just.config.ts b/scripts/beachball/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/beachball/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/beachball/package.json b/scripts/beachball/package.json index a1bc631431ae8..62ec8ad72a470 100644 --- a/scripts/beachball/package.json +++ b/scripts/beachball/package.json @@ -8,11 +8,12 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-github": "*", "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-ts-node": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/cypress/just.config.ts b/scripts/cypress/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/cypress/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/cypress/package.json b/scripts/cypress/package.json index 0586fda1189c5..c05df11cf8fee 100644 --- a/scripts/cypress/package.json +++ b/scripts/cypress/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/dangerjs/just.config.ts b/scripts/dangerjs/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/dangerjs/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/dangerjs/package.json b/scripts/dangerjs/package.json index 30d815601f9b3..076a74594fe51 100644 --- a/scripts/dangerjs/package.json +++ b/scripts/dangerjs/package.json @@ -8,10 +8,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-utils": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/executors/just.config.ts b/scripts/executors/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/executors/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/executors/package.json b/scripts/executors/package.json index 28f29ec7cc312..f6c7a4e6adb6a 100644 --- a/scripts/executors/package.json +++ b/scripts/executors/package.json @@ -8,11 +8,12 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-utils": "*", "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-prettier": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/fluentui-publish/just.config.ts b/scripts/fluentui-publish/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/fluentui-publish/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/fluentui-publish/package.json b/scripts/fluentui-publish/package.json index 97ae2abb08ae4..3f040e8c6758a 100644 --- a/scripts/fluentui-publish/package.json +++ b/scripts/fluentui-publish/package.json @@ -10,9 +10,10 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/generators/just.config.ts b/scripts/generators/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/generators/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/generators/package.json b/scripts/generators/package.json index d49423bff685b..aa30ffa0caa31 100644 --- a/scripts/generators/package.json +++ b/scripts/generators/package.json @@ -8,10 +8,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js --ignore-pattern plop-templates-* .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-projects-test": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/github/just.config.ts b/scripts/github/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/github/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/github/package.json b/scripts/github/package.json index 299723d60f219..39038f2294477 100644 --- a/scripts/github/package.json +++ b/scripts/github/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/gulp/just.config.ts b/scripts/gulp/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/gulp/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/gulp/package.json b/scripts/gulp/package.json index 036d7e9e1587d..cabec223254fe 100644 --- a/scripts/gulp/package.json +++ b/scripts/gulp/package.json @@ -8,7 +8,7 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", @@ -17,5 +17,6 @@ "@fluentui/scripts-puppeteer": "*", "@fluentui/scripts-babel": "*", "@fluentui/scripts-projects-test": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/jest/just.config.ts b/scripts/jest/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/jest/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/jest/package.json b/scripts/jest/package.json index da1ecf67f3094..b34d3853cef34 100644 --- a/scripts/jest/package.json +++ b/scripts/jest/package.json @@ -8,10 +8,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-utils": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/lint-staged/just.config.ts b/scripts/lint-staged/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/lint-staged/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/lint-staged/package.json b/scripts/lint-staged/package.json index 6201ad5a1d558..2028a93568e29 100644 --- a/scripts/lint-staged/package.json +++ b/scripts/lint-staged/package.json @@ -8,9 +8,10 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/monorepo/just.config.ts b/scripts/monorepo/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/monorepo/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/monorepo/package.json b/scripts/monorepo/package.json index 14f6173dce95e..d8c53a86d3006 100644 --- a/scripts/monorepo/package.json +++ b/scripts/monorepo/package.json @@ -8,9 +8,10 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-utils": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/package-manager/just.config.ts b/scripts/package-manager/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/package-manager/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/package-manager/package.json b/scripts/package-manager/package.json index 2e7928990bc88..728118a0af6b9 100644 --- a/scripts/package-manager/package.json +++ b/scripts/package-manager/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/perf-test-flamegrill/just.config.ts b/scripts/perf-test-flamegrill/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/perf-test-flamegrill/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/perf-test-flamegrill/package.json b/scripts/perf-test-flamegrill/package.json index 1edc441192a4f..ad63be717a6da 100644 --- a/scripts/perf-test-flamegrill/package.json +++ b/scripts/perf-test-flamegrill/package.json @@ -8,7 +8,7 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "peerDependencies": { "@types/react": ">=16.8.0 <19.0.0", @@ -16,5 +16,6 @@ "react": ">=16.8.0 <19.0.0", "react-dom": ">=16.8.0 <19.0.0", "webpack": "^5.75.0" - } + }, + "devDependencies": {} } diff --git a/scripts/prettier/just.config.ts b/scripts/prettier/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/prettier/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/prettier/package.json b/scripts/prettier/package.json index 75e0bd645066d..8681867ea180c 100644 --- a/scripts/prettier/package.json +++ b/scripts/prettier/package.json @@ -8,9 +8,10 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/projects-test/just.config.ts b/scripts/projects-test/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/projects-test/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/projects-test/package.json b/scripts/projects-test/package.json index a1a0f399dded6..adcd323734eee 100644 --- a/scripts/projects-test/package.json +++ b/scripts/projects-test/package.json @@ -8,11 +8,12 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-utils": "*", "@fluentui/scripts-puppeteer": "*", "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/puppeteer/just.config.ts b/scripts/puppeteer/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/puppeteer/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/puppeteer/package.json b/scripts/puppeteer/package.json index f291bcace4db2..3f64620943ac8 100644 --- a/scripts/puppeteer/package.json +++ b/scripts/puppeteer/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/storybook/just.config.ts b/scripts/storybook/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/storybook/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/storybook/package.json b/scripts/storybook/package.json index 708b97b2b442d..2650f5b9d1118 100644 --- a/scripts/storybook/package.json +++ b/scripts/storybook/package.json @@ -8,9 +8,10 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/tasks/just.config.ts b/scripts/tasks/just.config.ts new file mode 100644 index 0000000000000..a4bf107346901 --- /dev/null +++ b/scripts/tasks/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from './src/presets'; + +preset(); diff --git a/scripts/tasks/package.json b/scripts/tasks/package.json index a994fd70eb550..5e8ec8dd4c127 100644 --- a/scripts/tasks/package.json +++ b/scripts/tasks/package.json @@ -8,12 +8,13 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-utils": "*", "@fluentui/scripts-prettier": "*", "flamegrill": "0.2.0" - } + }, + "devDependencies": {} } diff --git a/scripts/test-ssr/just.config.ts b/scripts/test-ssr/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/test-ssr/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/test-ssr/package.json b/scripts/test-ssr/package.json index 060f8751eda3a..9161896f2f283 100644 --- a/scripts/test-ssr/package.json +++ b/scripts/test-ssr/package.json @@ -10,10 +10,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-puppeteer": "*", "@fluentui/scripts-ts-node": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/triage-bot/just.config.ts b/scripts/triage-bot/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/triage-bot/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/triage-bot/package.json b/scripts/triage-bot/package.json index 1829964422bd1..7c78ed3db7c01 100644 --- a/scripts/triage-bot/package.json +++ b/scripts/triage-bot/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/ts-node/just.config.ts b/scripts/ts-node/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/ts-node/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/ts-node/package.json b/scripts/ts-node/package.json index 6f7f9b18c49c6..3cd88fba456ad 100644 --- a/scripts/ts-node/package.json +++ b/scripts/ts-node/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/update-release-notes/just.config.ts b/scripts/update-release-notes/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/update-release-notes/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/update-release-notes/package.json b/scripts/update-release-notes/package.json index be0ecfd781467..6ead51d90ecc9 100644 --- a/scripts/update-release-notes/package.json +++ b/scripts/update-release-notes/package.json @@ -8,10 +8,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-github": "*", "@fluentui/scripts-monorepo": "*" - } + }, + "devDependencies": {} } diff --git a/scripts/utils/just.config.ts b/scripts/utils/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/utils/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/utils/package.json b/scripts/utils/package.json index 462171a6d6b6b..1c700a2a2cfb2 100644 --- a/scripts/utils/package.json +++ b/scripts/utils/package.json @@ -8,7 +8,8 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, - "dependencies": {} + "dependencies": {}, + "devDependencies": {} } diff --git a/scripts/webpack/just.config.ts b/scripts/webpack/just.config.ts new file mode 100644 index 0000000000000..b10db31a6aca5 --- /dev/null +++ b/scripts/webpack/just.config.ts @@ -0,0 +1,3 @@ +import { preset } from '@fluentui/scripts-tasks'; + +preset(); diff --git a/scripts/webpack/package.json b/scripts/webpack/package.json index a29c602cf9c1d..7546135b3be48 100644 --- a/scripts/webpack/package.json +++ b/scripts/webpack/package.json @@ -8,10 +8,11 @@ "format:check": "yarn format -c", "lint": "eslint --ext .ts,.js .", "test": "jest --passWithNoTests", - "type-check": "tsc -b tsconfig.json" + "type-check": "just-scripts type-check" }, "dependencies": { "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-utils": "*" - } + }, + "devDependencies": {} } diff --git a/tools/workspace-plugin/package.json b/tools/workspace-plugin/package.json index 51cc71fe73fae..33b469662cdac 100644 --- a/tools/workspace-plugin/package.json +++ b/tools/workspace-plugin/package.json @@ -6,7 +6,11 @@ "generators": "./generators.json", "scripts": { "test": "nx run @fluentui/workspace-plugin:test", - "type-check": "nx run @fluentui/workspace-plugin:type-check", + "type-check": "node ./scripts/type-check", "lint": "eslint --ext .ts,.js,.json ." - } + }, + "dependencies": { + "@nx/devkit": "^17.3.2" + }, + "devDependencies": {} } diff --git a/tools/workspace-plugin/scripts/type-check.js b/tools/workspace-plugin/scripts/type-check.js new file mode 100644 index 0000000000000..f214c9fa1a81c --- /dev/null +++ b/tools/workspace-plugin/scripts/type-check.js @@ -0,0 +1,61 @@ +// @ts-check + +import fs from 'node:fs'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; +import { promisify } from 'node:util'; +import { exec } from 'node:child_process'; +import { exit } from 'node:process'; + +const asyncExec = promisify(exec); + +main().catch(err => { + console.error(err); + exit(1); +}); + +/** + * Copied from ${@link 'file://./../../../scripts/tasks/src/type-check.ts'} + */ +async function main() { + const __filename = fileURLToPath(import.meta.url); + const __dirname = path.dirname(__filename); + const rootConfig = JSON.parse(fs.readFileSync(path.join(__dirname, '../tsconfig.json'), 'utf-8')); + + const tsConfigsRefs = getTsConfigs(rootConfig, { spec: false, e2e: false }); + + const asyncQueue = []; + + for (const ref of tsConfigsRefs) { + const program = `tsc -p ${ref} --pretty --noEmit --baseUrl .`; + asyncQueue.push(asyncExec(program)); + } + + return Promise.all(asyncQueue).catch(err => { + console.error(err.stdout); + exit(1); + }); +} + +/** + * @param {{references?: Array<{ path: string }>;}} solutionConfig + * @param {{ spec: boolean, e2e: boolean }} exclude + */ +function getTsConfigs(solutionConfig, exclude) { + const refs = solutionConfig.references ?? []; + /** @type {string[]} */ + const refsPaths = []; + + for (const ref of refs) { + if (exclude.spec && ref.path.includes('spec')) { + continue; + } + if (exclude.e2e && ref.path.includes('cy')) { + continue; + } + + refsPaths.push(ref.path); + } + + return refsPaths; +} diff --git a/yarn.lock b/yarn.lock index b127c1f3db60f..40328bf4374ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2824,7 +2824,7 @@ dependencies: "@nx/workspace" "17.3.2" -"@nx/devkit@17.3.2": +"@nx/devkit@17.3.2", "@nx/devkit@^17.3.2": version "17.3.2" resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.3.2.tgz#c10b3e5f9bc642881c24aa2e3878ca4290994a80" integrity sha512-gbOIhwrZKCSSFFbh6nE6LLCvAU7mhSdBSnRiS14YBwJJMu4CRJ0IcaFz58iXqGWZefMivKtkNFtx+zqwUC4ziw== From faa1f7233b3691aeef775adb8ef1965dd2838d26 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Mon, 27 May 2024 11:02:04 +0200 Subject: [PATCH 2/8] fix(scripts/*): tweak lint target in order to avoid typescript-eslint errors --- scripts/api-extractor/just.config.ts | 1 + scripts/babel/just.config.ts | 1 + scripts/beachball/just.config.ts | 1 + scripts/cypress/package.json | 2 +- scripts/dangerjs/package.json | 2 +- scripts/executors/just.config.ts | 1 + scripts/fluentui-publish/package.json | 2 +- scripts/generators/just.config.ts | 1 + scripts/github/package.json | 2 +- scripts/gulp/package.json | 2 +- scripts/jest/package.json | 2 +- scripts/lint-staged/just.config.ts | 1 + scripts/monorepo/package.json | 2 +- scripts/package-manager/just.config.ts | 1 + scripts/perf-test-flamegrill/package.json | 2 +- scripts/prettier/package.json | 2 +- scripts/projects-test/package.json | 2 +- scripts/puppeteer/package.json | 2 +- scripts/storybook/package.json | 2 +- scripts/tasks/package.json | 5 +++-- scripts/test-ssr/package.json | 2 +- scripts/triage-bot/package.json | 2 +- scripts/ts-node/just.config.ts | 1 + scripts/update-release-notes/just.config.ts | 1 + scripts/utils/package.json | 2 +- scripts/webpack/package.json | 2 +- 26 files changed, 28 insertions(+), 18 deletions(-) diff --git a/scripts/api-extractor/just.config.ts b/scripts/api-extractor/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/api-extractor/just.config.ts +++ b/scripts/api-extractor/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/babel/just.config.ts b/scripts/babel/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/babel/just.config.ts +++ b/scripts/babel/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/beachball/just.config.ts b/scripts/beachball/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/beachball/just.config.ts +++ b/scripts/beachball/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/cypress/package.json b/scripts/cypress/package.json index c05df11cf8fee..68dffb5b04b1c 100644 --- a/scripts/cypress/package.json +++ b/scripts/cypress/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/dangerjs/package.json b/scripts/dangerjs/package.json index 076a74594fe51..93c5d4c05b7e0 100644 --- a/scripts/dangerjs/package.json +++ b/scripts/dangerjs/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/executors/just.config.ts b/scripts/executors/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/executors/just.config.ts +++ b/scripts/executors/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/fluentui-publish/package.json b/scripts/fluentui-publish/package.json index 3f040e8c6758a..69d7985ff2614 100644 --- a/scripts/fluentui-publish/package.json +++ b/scripts/fluentui-publish/package.json @@ -8,7 +8,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src ./bin", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/generators/just.config.ts b/scripts/generators/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/generators/just.config.ts +++ b/scripts/generators/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/github/package.json b/scripts/github/package.json index 39038f2294477..a83368bb81cf3 100644 --- a/scripts/github/package.json +++ b/scripts/github/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/gulp/package.json b/scripts/gulp/package.json index cabec223254fe..ce3b4c7192438 100644 --- a/scripts/gulp/package.json +++ b/scripts/gulp/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/jest/package.json b/scripts/jest/package.json index b34d3853cef34..a504f0fe9ccda 100644 --- a/scripts/jest/package.json +++ b/scripts/jest/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/lint-staged/just.config.ts b/scripts/lint-staged/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/lint-staged/just.config.ts +++ b/scripts/lint-staged/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/monorepo/package.json b/scripts/monorepo/package.json index d8c53a86d3006..6263f3d711907 100644 --- a/scripts/monorepo/package.json +++ b/scripts/monorepo/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/package-manager/just.config.ts b/scripts/package-manager/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/package-manager/just.config.ts +++ b/scripts/package-manager/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/perf-test-flamegrill/package.json b/scripts/perf-test-flamegrill/package.json index ad63be717a6da..b2521b7752f0d 100644 --- a/scripts/perf-test-flamegrill/package.json +++ b/scripts/perf-test-flamegrill/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/prettier/package.json b/scripts/prettier/package.json index 8681867ea180c..3981f1e130f40 100644 --- a/scripts/prettier/package.json +++ b/scripts/prettier/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/projects-test/package.json b/scripts/projects-test/package.json index adcd323734eee..56ae23c50c3d7 100644 --- a/scripts/projects-test/package.json +++ b/scripts/projects-test/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/puppeteer/package.json b/scripts/puppeteer/package.json index 3f64620943ac8..4df4c8c5c50dd 100644 --- a/scripts/puppeteer/package.json +++ b/scripts/puppeteer/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/storybook/package.json b/scripts/storybook/package.json index 2650f5b9d1118..750977293baaf 100644 --- a/scripts/storybook/package.json +++ b/scripts/storybook/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/tasks/package.json b/scripts/tasks/package.json index 5e8ec8dd4c127..a23299553f523 100644 --- a/scripts/tasks/package.json +++ b/scripts/tasks/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, @@ -14,7 +14,8 @@ "@fluentui/scripts-monorepo": "*", "@fluentui/scripts-utils": "*", "@fluentui/scripts-prettier": "*", - "flamegrill": "0.2.0" + "flamegrill": "0.2.0", + "just-scripts": "1.8.2" }, "devDependencies": {} } diff --git a/scripts/test-ssr/package.json b/scripts/test-ssr/package.json index 9161896f2f283..15469b6a6c52f 100644 --- a/scripts/test-ssr/package.json +++ b/scripts/test-ssr/package.json @@ -8,7 +8,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src ./bin", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/triage-bot/package.json b/scripts/triage-bot/package.json index 7c78ed3db7c01..1dd5e52e094a3 100644 --- a/scripts/triage-bot/package.json +++ b/scripts/triage-bot/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/ts-node/just.config.ts b/scripts/ts-node/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/ts-node/just.config.ts +++ b/scripts/ts-node/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/update-release-notes/just.config.ts b/scripts/update-release-notes/just.config.ts index b10db31a6aca5..926f3bd3c7e15 100644 --- a/scripts/update-release-notes/just.config.ts +++ b/scripts/update-release-notes/just.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/utils/package.json b/scripts/utils/package.json index 1c700a2a2cfb2..22f7489499c0c 100644 --- a/scripts/utils/package.json +++ b/scripts/utils/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/webpack/package.json b/scripts/webpack/package.json index 7546135b3be48..f02e85a0e7a93 100644 --- a/scripts/webpack/package.json +++ b/scripts/webpack/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, From 076aaca2c91d97936e4f862ff5f71d8078387645 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Mon, 27 May 2024 16:14:41 +0200 Subject: [PATCH 3/8] chore: normalize all scripts source to live under /src --- .vscode/launch.json | 10 ++++---- azure-pipelines.release-vnext-nightly.yml | 2 +- azure-pipelines.release-vnext.yml | 6 ++--- azure-pipelines.release.web-components.yml | 2 +- azure-pipelines.release.yml | 4 ++-- .../08-type-checking-perf-improvements.md | 2 +- package.json | 24 +++++++++---------- packages/react-charting/package.json | 2 +- packages/react/package.json | 2 +- packages/tokens/package.json | 2 +- scripts/api-extractor/just.config.ts | 1 - scripts/api-extractor/package.json | 2 +- scripts/api-extractor/src/index.js | 1 + scripts/api-extractor/tsconfig.lib.json | 2 +- scripts/babel/just.config.ts | 1 - scripts/babel/package.json | 20 +++++++++++++--- scripts/babel/project.json | 2 +- scripts/babel/{ => src}/index.js | 4 ++++ scripts/babel/{ => src}/preset-v9.js | 0 scripts/babel/{ => src}/preset-v9.spec.ts | 0 scripts/babel/{ => src}/types.ts | 0 scripts/babel/tsconfig.lib.json | 2 +- scripts/beachball/package.json | 4 ++-- scripts/beachball/project.json | 2 +- scripts/beachball/{ => src}/config.test.ts | 0 .../beachball/{ => src}/customRenderers.ts | 0 scripts/beachball/{ => src}/index.ts | 0 scripts/beachball/{ => src}/register.js | 2 +- .../beachball/{ => src}/release-v8.config.js | 0 .../{ => src}/release-vNext.config.js | 0 .../release-web-components.config.js | 0 scripts/beachball/{ => src}/shared.config.ts | 4 ++-- scripts/beachball/{ => src}/utils.ts | 0 scripts/beachball/tsconfig.lib.json | 2 +- scripts/executors/package.json | 2 +- scripts/executors/project.json | 2 +- .../{ => src}/check-for-modified-files.ts | 0 .../{ => src}/checkIfPackagesAffected.js | 0 scripts/executors/{ => src}/debug-test.js | 0 scripts/executors/{ => src}/format.js | 0 .../{ => src}/invalidate-just-cache.js | 0 scripts/executors/{ => src}/local-codepen.js | 0 scripts/executors/{ => src}/runPublished.js | 0 .../executors/{ => src}/runPublished.spec.ts | 0 scripts/executors/{ => src}/scrub.js | 0 scripts/executors/{ => src}/start.js | 0 .../{ => src}/tag-react-components.ts | 0 scripts/executors/tsconfig.lib.json | 2 +- scripts/gulp/package.json | 1 - .../src/babel-plugins}/index.ts | 0 .../transform-star-import-plugin.ts | 1 + .../src/babel-plugins}/types.ts | 2 +- .../gulp/src/plugins/gulp-example-source.ts | 3 ++- scripts/package-manager/package.json | 2 +- scripts/package-manager/project.json | 2 +- .../package-manager/{ => src}/postinstall.js | 0 .../{ => src}/use-yarn-please.js | 0 scripts/package-manager/tsconfig.lib.json | 2 +- .../perf-test-flamegrill/tsconfig.lib.json | 2 +- scripts/ts-node/package.json | 2 +- scripts/ts-node/project.json | 2 +- scripts/ts-node/src/index.js | 1 + scripts/ts-node/{ => src}/register.js | 0 scripts/ts-node/tsconfig.lib.json | 2 +- scripts/update-release-notes/project.json | 2 +- .../{ => src}/changelogsAndTags.ts | 0 .../update-release-notes/{ => src}/index.ts | 0 .../update-release-notes/{ => src}/init.ts | 0 .../{ => src}/markdown.ts | 0 .../{ => src}/pullRequests.ts | 0 .../{ => src}/releases.ts | 0 .../update-release-notes/{ => src}/types.ts | 0 .../update-release-notes/tsconfig.lib.json | 2 +- .../generators/migrate-v8-pkg/index.spec.ts | 2 +- 74 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 scripts/api-extractor/src/index.js rename scripts/babel/{ => src}/index.js (95%) rename scripts/babel/{ => src}/preset-v9.js (100%) rename scripts/babel/{ => src}/preset-v9.spec.ts (100%) rename scripts/babel/{ => src}/types.ts (100%) rename scripts/beachball/{ => src}/config.test.ts (100%) rename scripts/beachball/{ => src}/customRenderers.ts (100%) rename scripts/beachball/{ => src}/index.ts (100%) rename scripts/beachball/{ => src}/register.js (81%) rename scripts/beachball/{ => src}/release-v8.config.js (100%) rename scripts/beachball/{ => src}/release-vNext.config.js (100%) rename scripts/beachball/{ => src}/release-web-components.config.js (100%) rename scripts/beachball/{ => src}/shared.config.ts (86%) rename scripts/beachball/{ => src}/utils.ts (100%) rename scripts/executors/{ => src}/check-for-modified-files.ts (100%) rename scripts/executors/{ => src}/checkIfPackagesAffected.js (100%) rename scripts/executors/{ => src}/debug-test.js (100%) rename scripts/executors/{ => src}/format.js (100%) rename scripts/executors/{ => src}/invalidate-just-cache.js (100%) rename scripts/executors/{ => src}/local-codepen.js (100%) rename scripts/executors/{ => src}/runPublished.js (100%) rename scripts/executors/{ => src}/runPublished.spec.ts (100%) rename scripts/executors/{ => src}/scrub.js (100%) rename scripts/executors/{ => src}/start.js (100%) rename scripts/executors/{ => src}/tag-react-components.ts (100%) rename scripts/{babel/plugins => gulp/src/babel-plugins}/index.ts (100%) rename scripts/{babel/plugins => gulp/src/babel-plugins}/transform-star-import-plugin.ts (99%) rename scripts/{babel/plugins => gulp/src/babel-plugins}/types.ts (100%) rename scripts/package-manager/{ => src}/postinstall.js (100%) rename scripts/package-manager/{ => src}/use-yarn-please.js (100%) create mode 100644 scripts/ts-node/src/index.js rename scripts/ts-node/{ => src}/register.js (100%) rename scripts/update-release-notes/{ => src}/changelogsAndTags.ts (100%) rename scripts/update-release-notes/{ => src}/index.ts (100%) rename scripts/update-release-notes/{ => src}/init.ts (100%) rename scripts/update-release-notes/{ => src}/markdown.ts (100%) rename scripts/update-release-notes/{ => src}/pullRequests.ts (100%) rename scripts/update-release-notes/{ => src}/releases.ts (100%) rename scripts/update-release-notes/{ => src}/types.ts (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json index db3efb7177c52..b247df823c7b5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "name": "Debug test", "type": "node", "request": "launch", - "program": "${workspaceRoot}/scripts/executors/debug-test.js", + "program": "${workspaceRoot}/scripts/executors/src/debug-test.js", "cwd": "${fileDirname}", "stopOnEntry": false, "args": ["-i", "--watch"], @@ -22,7 +22,7 @@ "name": "Debug current open test", "type": "node", "request": "launch", - "program": "${workspaceRoot}/scripts/executors/debug-test.js", + "program": "${workspaceRoot}/scripts/executors/src/debug-test.js", "cwd": "${fileDirname}", "stopOnEntry": false, "args": ["-i", "--testPathPattern=\\b${fileBasenameNoExtension}", "--watch"], @@ -39,7 +39,7 @@ "name": "Debug current open test (v0)", "type": "node", "request": "launch", - "program": "${workspaceRoot}/scripts/executors/debug-test.js", + "program": "${workspaceRoot}/scripts/executors/src/debug-test.js", "cwd": "${fileDirname}", "stopOnEntry": false, "args": ["-i", "--testPathPattern=\\b${fileBasenameNoExtension}", "--watch"], @@ -128,7 +128,7 @@ "protocol": "inspector", "cwd": "${workspaceRoot}", "args": [ - "${workspaceRoot}/scripts/update-release-notes/index.ts", + "${workspaceRoot}/scripts/update-release-notes/src/index.ts", "--token", // For local testing, generate a personal access token (https://github.com/settings/tokens) // and replace "your token here" with the token. DO NOT COMMIT YOUR TOKEN! @@ -137,7 +137,7 @@ "--age", "10" ], - "runtimeArgs": ["--nolazy", "--inspect", "-r", "${workspaceRoot}/scripts/ts-node/register"], + "runtimeArgs": ["--nolazy", "--inspect", "-r", "${workspaceRoot}/scripts/ts-node/src/register"], "env": { "NODE_ENV": "development" }, diff --git a/azure-pipelines.release-vnext-nightly.yml b/azure-pipelines.release-vnext-nightly.yml index 9d4a074013a1c..2f672d7c092d9 100644 --- a/azure-pipelines.release-vnext-nightly.yml +++ b/azure-pipelines.release-vnext-nightly.yml @@ -97,7 +97,7 @@ extends: displayName: yarn build - script: | - yarn publish:beachball -n $(npmToken) --no-push --tag nightly --config scripts/beachball/release-vNext.config.js + yarn publish:beachball -n $(npmToken) --no-push --tag nightly --config scripts/beachball/src/release-vNext.config.js git reset --hard origin/master displayName: Publish changes and bump versions diff --git a/azure-pipelines.release-vnext.yml b/azure-pipelines.release-vnext.yml index 014cf998f5719..03d9d4d061d98 100644 --- a/azure-pipelines.release-vnext.yml +++ b/azure-pipelines.release-vnext.yml @@ -84,14 +84,14 @@ extends: displayName: yarn build - script: | - yarn publish:beachball -n $(npmToken) --config scripts/beachball/release-vNext.config.js + yarn publish:beachball -n $(npmToken) --config scripts/beachball/src/release-vNext.config.js git reset --hard origin/master env: GITHUB_PAT: $(githubPAT) displayName: Publish changes and bump versions - script: | - node -r ./scripts/ts-node/register scripts/executors/tag-react-components.ts --token $(npmToken) + node -r ./scripts/ts-node/src/register scripts/executors/src/tag-react-components.ts --token $(npmToken) displayName: Tag prelease packages with prerelease tag continueOnError: true @@ -102,7 +102,7 @@ extends: # TODO update release notes script for v9 # - script: | - # node -r ./scripts/ts-node/register ./scripts/update-release-notes/index.ts --token=$(githubPAT) --apply --debug + # node -r ./scripts/ts-node/src/register ./scripts/update-release-notes/src/index.ts --token=$(githubPAT) --apply --debug # displayName: 'Update github release notes' # This would usually be run automatically (via a pipeline decorator from an extension), but the diff --git a/azure-pipelines.release.web-components.yml b/azure-pipelines.release.web-components.yml index 7a41f66b0b2d3..2a1e4b04e4e61 100644 --- a/azure-pipelines.release.web-components.yml +++ b/azure-pipelines.release.web-components.yml @@ -75,7 +75,7 @@ extends: displayName: Build, [test], Lint - script: | - yarn publish:beachball -n $(npmToken) --config scripts/beachball/release-web-components.config.js + yarn publish:beachball -n $(npmToken) --config scripts/beachball/src/release-web-components.config.js git reset --hard origin/master env: GITHUB_PAT: $(githubPAT) diff --git a/azure-pipelines.release.yml b/azure-pipelines.release.yml index d4110dc1ae6b8..fd51c5c903967 100644 --- a/azure-pipelines.release.yml +++ b/azure-pipelines.release.yml @@ -120,7 +120,7 @@ extends: displayName: yarn bundle - script: | - yarn publish:beachball -n $(npmToken) --config scripts/beachball/release-v8.config.js + yarn publish:beachball -n $(npmToken) --config scripts/beachball/src/release-v8.config.js git reset --hard origin/master env: GITHUB_PAT: $(githubPAT) @@ -155,7 +155,7 @@ extends: # Run this near the end because it's more likely to fail than the artifact upload tasks, and its # failure doesn't need to block anything else - script: | - node -r ./scripts/ts-node/register ./scripts/update-release-notes/index.ts --token=$(githubPAT) --apply --debug + node -r ./scripts/ts-node/src/register ./scripts/update-release-notes/src/index.ts --token=$(githubPAT) --apply --debug displayName: 'Update github release notes' - template: .devops/templates/cleanup.yml@self diff --git a/docs/react-v9/contributing/rfcs/shared/build-system/08-type-checking-perf-improvements.md b/docs/react-v9/contributing/rfcs/shared/build-system/08-type-checking-perf-improvements.md index bb987f26c0e7d..a1f7940a3b52e 100644 --- a/docs/react-v9/contributing/rfcs/shared/build-system/08-type-checking-perf-improvements.md +++ b/docs/react-v9/contributing/rfcs/shared/build-system/08-type-checking-perf-improvements.md @@ -107,7 +107,7 @@ This dts generation can be done in 2 ways: > EXAMPLE PR: https://github.com/microsoft/fluentui/pull/28002 ```yml -- script: node ./scripts/executors/type-check-ci-hack.js --base $(targetBranch) +- script: node ./scripts/executors/src/type-check-ci-hack.js --base $(targetBranch) displayName: type-check perf preparation - script: yarn buildci $(sinceArg) ``` diff --git a/package.json b/package.json index 74a9c0caf08ee..f82c91e95fb32 100644 --- a/package.json +++ b/package.json @@ -20,24 +20,24 @@ "bundle": "lage bundle --verbose", "change": "beachball change --no-commit", "check:change": "beachball check", - "check:modified-files": "node -r ./scripts/ts-node/register ./scripts/executors/check-for-modified-files", - "check:affected": "node ./scripts/executors/checkIfPackagesAffected.js", + "check:modified-files": "node -r ./scripts/ts-node/src/register ./scripts/executors/src/check-for-modified-files", + "check:affected": "node ./scripts/executors/src/checkIfPackagesAffected.js", "check:installed-dependencies-versions": "satisfied --no-peers --skip-invalid", "clean": "lage clean --verbose", "code-style": "lage code-style --verbose", - "codepen": "cd packages/react && node ../../scripts/executors/local-codepen.js", + "codepen": "cd packages/react && node ../../scripts/executors/src/local-codepen.js", "copy-notices": "node scripts/generators/copy-notices.js", "create-component": "yarn nx g @fluentui/workspace-plugin:react-component", "create-package": "yarn nx g @fluentui/workspace-plugin:react-library", "e2e": "lage e2e --verbose --concurrency=1", - "format": "node scripts/executors/format.js", - "generate-version-files": "node -r ./scripts/ts-node/register ./scripts/generators/generate-version-files", + "format": "node scripts/executors/src/format.js", + "generate-version-files": "node -r ./scripts/ts-node/src/register ./scripts/generators/generate-version-files", "lint": "lage lint --verbose", "lint:log": "FORCE_COLOR=0 yarn lint > lint.log 2>&1", - "postinstall": "node ./scripts/package-manager/postinstall.js", - "preinstall": "node ./scripts/package-manager/use-yarn-please.js", + "postinstall": "node ./scripts/package-manager/src/postinstall.js", + "preinstall": "node ./scripts/package-manager/src/use-yarn-please.js", "publish:beachball": "beachball publish -b origin/master --access public -y", - "rebuild": "node ./scripts/executors/invalidate-just-cache.js && yarn build --reset-cache", + "rebuild": "node ./scripts/executors/src/invalidate-just-cache.js && yarn build --reset-cache", "northstar:release": "northstar-release", "northstar:build:docs": "yarn workspace @fluentui/docs build", "northstar:start": "yarn workspace @fluentui/docs start", @@ -45,10 +45,10 @@ "northstar:stats:build": "gulp stats", "northstar:stats:save": "gulp stats:save", "northstar:test:circulars": "gulp test:circulars:run", - "rename-package": "node -r ./scripts/ts-node/register ./scripts/generators/rename-package.ts", - "run:published": "node ./scripts/executors/runPublished.js", - "scrub": "node ./scripts/executors/scrub.js", - "start": "node ./scripts/executors/start.js", + "rename-package": "node -r ./scripts/ts-node/src/register ./scripts/generators/rename-package.ts", + "run:published": "node ./scripts/executors/src/runPublished.js", + "scrub": "node ./scripts/executors/src/scrub.js", + "start": "node ./scripts/executors/src/start.js", "test": "lage test --verbose", "update-snapshots": "lage update-snapshots --verbose" }, diff --git a/packages/react-charting/package.json b/packages/react-charting/package.json index fdd1b4511761c..2c7946845b870 100644 --- a/packages/react-charting/package.json +++ b/packages/react-charting/package.json @@ -20,7 +20,7 @@ "test": "cross-env TZ=UTC just-scripts test", "just": "just-scripts", "clean": "just-scripts clean", - "codepen": "node ../../scripts/executors/local-codepen.js", + "codepen": "node ../../scripts/executors/src/local-codepen.js", "code-style": "just-scripts code-style", "start": "just-scripts dev:storybook", "start:legacy": "just-scripts dev", diff --git a/packages/react/package.json b/packages/react/package.json index 48ab9394ea73d..bdb5667ab9f93 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -21,7 +21,7 @@ "build-storybook": "cross-env NODE_OPTIONS=--max-old-space-size=3072 just-scripts storybook:build", "clean": "just-scripts clean", "code-style": "just-scripts code-style", - "codepen": "node ../../scripts/executors/local-codepen.js", + "codepen": "node ../../scripts/executors/src/local-codepen.js", "e2e": "yarn workspace @fluentui/react-examples cypress run --component", "e2e:local": "yarn workspace @fluentui/react-examples cypress open --component", "just": "just-scripts", diff --git a/packages/tokens/package.json b/packages/tokens/package.json index efb192c2c2570..a209f7efdf4d5 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -18,7 +18,7 @@ "just": "just-scripts", "lint": "just-scripts lint", "test": "jest --passWithNoTests", - "token-pipeline": "node -r ../../scripts/ts-node/register ../../scripts/generators/token-pipeline.ts", + "token-pipeline": "node -r ../../scripts/ts-node/src/register ../../scripts/generators/token-pipeline.ts", "type-check": "just-scripts type-check", "generate-api": "just-scripts generate-api" }, diff --git a/scripts/api-extractor/just.config.ts b/scripts/api-extractor/just.config.ts index 926f3bd3c7e15..b10db31a6aca5 100644 --- a/scripts/api-extractor/just.config.ts +++ b/scripts/api-extractor/just.config.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/api-extractor/package.json b/scripts/api-extractor/package.json index 5cfa6cec91098..6c28f0b3cc5b6 100644 --- a/scripts/api-extractor/package.json +++ b/scripts/api-extractor/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/api-extractor/src/index.js b/scripts/api-extractor/src/index.js new file mode 100644 index 0000000000000..f053ebf7976e3 --- /dev/null +++ b/scripts/api-extractor/src/index.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/scripts/api-extractor/tsconfig.lib.json b/scripts/api-extractor/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/api-extractor/tsconfig.lib.json +++ b/scripts/api-extractor/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/babel/just.config.ts b/scripts/babel/just.config.ts index 926f3bd3c7e15..b10db31a6aca5 100644 --- a/scripts/babel/just.config.ts +++ b/scripts/babel/just.config.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/no-extraneous-dependencies import { preset } from '@fluentui/scripts-tasks'; preset(); diff --git a/scripts/babel/package.json b/scripts/babel/package.json index a9cab78e9901d..0a1449c953cb9 100644 --- a/scripts/babel/package.json +++ b/scripts/babel/package.json @@ -2,14 +2,28 @@ "name": "@fluentui/scripts-babel", "version": "0.0.1", "private": true, - "main": "index.js", + "main": "src/index.js", "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, "dependencies": {}, - "devDependencies": {} + "devDependencies": {}, + "exports": { + ".": { + "require": "./src/index.js", + "import": "./src/index.js" + }, + "./register": { + "require": "./register.js", + "import": "./register.js" + }, + "./preset-v9": { + "require": "./src/preset-v9.js", + "import": "./src/preset-v9.js" + } + } } diff --git a/scripts/babel/project.json b/scripts/babel/project.json index 406b4756629ad..40bf1bf6f1f30 100644 --- a/scripts/babel/project.json +++ b/scripts/babel/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-babel", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/babel", + "sourceRoot": "scripts/babel/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/babel/index.js b/scripts/babel/src/index.js similarity index 95% rename from scripts/babel/index.js rename to scripts/babel/src/index.js index 7363e8579669e..79cb6a797daae 100644 --- a/scripts/babel/index.js +++ b/scripts/babel/src/index.js @@ -1,3 +1,7 @@ +/** + * This files is used solely for react-northstar projects. Please don't any new logic here + */ + /** @typedef {import('@babel/core').TransformOptions['caller']} Caller */ const isNodeCaller = (/** @type {Caller}*/ caller) => { diff --git a/scripts/babel/preset-v9.js b/scripts/babel/src/preset-v9.js similarity index 100% rename from scripts/babel/preset-v9.js rename to scripts/babel/src/preset-v9.js diff --git a/scripts/babel/preset-v9.spec.ts b/scripts/babel/src/preset-v9.spec.ts similarity index 100% rename from scripts/babel/preset-v9.spec.ts rename to scripts/babel/src/preset-v9.spec.ts diff --git a/scripts/babel/types.ts b/scripts/babel/src/types.ts similarity index 100% rename from scripts/babel/types.ts rename to scripts/babel/src/types.ts diff --git a/scripts/babel/tsconfig.lib.json b/scripts/babel/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/babel/tsconfig.lib.json +++ b/scripts/babel/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/beachball/package.json b/scripts/beachball/package.json index 62ec8ad72a470..b341eb3c4b478 100644 --- a/scripts/beachball/package.json +++ b/scripts/beachball/package.json @@ -2,11 +2,11 @@ "name": "@fluentui/scripts-beachball", "version": "0.0.1", "private": true, - "main": "index.js", + "main": "src/index.js", "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/beachball/project.json b/scripts/beachball/project.json index 02da59d7eaffb..d38c5b2dcb36b 100644 --- a/scripts/beachball/project.json +++ b/scripts/beachball/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-beachball", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/beachball", + "sourceRoot": "scripts/beachball/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/beachball/config.test.ts b/scripts/beachball/src/config.test.ts similarity index 100% rename from scripts/beachball/config.test.ts rename to scripts/beachball/src/config.test.ts diff --git a/scripts/beachball/customRenderers.ts b/scripts/beachball/src/customRenderers.ts similarity index 100% rename from scripts/beachball/customRenderers.ts rename to scripts/beachball/src/customRenderers.ts diff --git a/scripts/beachball/index.ts b/scripts/beachball/src/index.ts similarity index 100% rename from scripts/beachball/index.ts rename to scripts/beachball/src/index.ts diff --git a/scripts/beachball/register.js b/scripts/beachball/src/register.js similarity index 81% rename from scripts/beachball/register.js rename to scripts/beachball/src/register.js index a3c902866714a..9c824b0374994 100644 --- a/scripts/beachball/register.js +++ b/scripts/beachball/src/register.js @@ -6,6 +6,6 @@ exports.register = register; function register() { if (process.env.NODE_ENV !== 'test') { // @ts-expect-error - ts-node/register doesn't provide types so this would error - require('@fluentui/scripts-ts-node/register'); + require('@fluentui/scripts-ts-node/src/register'); } } diff --git a/scripts/beachball/release-v8.config.js b/scripts/beachball/src/release-v8.config.js similarity index 100% rename from scripts/beachball/release-v8.config.js rename to scripts/beachball/src/release-v8.config.js diff --git a/scripts/beachball/release-vNext.config.js b/scripts/beachball/src/release-vNext.config.js similarity index 100% rename from scripts/beachball/release-vNext.config.js rename to scripts/beachball/src/release-vNext.config.js diff --git a/scripts/beachball/release-web-components.config.js b/scripts/beachball/src/release-web-components.config.js similarity index 100% rename from scripts/beachball/release-web-components.config.js rename to scripts/beachball/src/release-web-components.config.js diff --git a/scripts/beachball/shared.config.ts b/scripts/beachball/src/shared.config.ts similarity index 86% rename from scripts/beachball/shared.config.ts rename to scripts/beachball/src/shared.config.ts index 5df8edb9c271d..b28cc12ba5df3 100644 --- a/scripts/beachball/shared.config.ts +++ b/scripts/beachball/src/shared.config.ts @@ -6,8 +6,8 @@ import type { BeachballConfig } from 'beachball'; import { renderEntry, renderHeader } from './customRenderers'; -const baseConfig: typeof import('./base.config.json') = JSON.parse( - fs.readFileSync(path.resolve(__dirname, 'base.config.json'), { encoding: 'utf8' }), +const baseConfig: typeof import('../base.config.json') = JSON.parse( + fs.readFileSync(path.resolve(__dirname, '../base.config.json'), { encoding: 'utf8' }), ); export const config: typeof baseConfig & Required> = { diff --git a/scripts/beachball/utils.ts b/scripts/beachball/src/utils.ts similarity index 100% rename from scripts/beachball/utils.ts rename to scripts/beachball/src/utils.ts diff --git a/scripts/beachball/tsconfig.lib.json b/scripts/beachball/tsconfig.lib.json index b0d445627391c..040fb0e3c58a1 100644 --- a/scripts/beachball/tsconfig.lib.json +++ b/scripts/beachball/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node", "jest"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/executors/package.json b/scripts/executors/package.json index f6c7a4e6adb6a..96edc32a3945e 100644 --- a/scripts/executors/package.json +++ b/scripts/executors/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/executors/project.json b/scripts/executors/project.json index 0c5ee26727f6a..86d3fdb7f7a5b 100644 --- a/scripts/executors/project.json +++ b/scripts/executors/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-executors", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/executors", + "sourceRoot": "scripts/executors/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/executors/check-for-modified-files.ts b/scripts/executors/src/check-for-modified-files.ts similarity index 100% rename from scripts/executors/check-for-modified-files.ts rename to scripts/executors/src/check-for-modified-files.ts diff --git a/scripts/executors/checkIfPackagesAffected.js b/scripts/executors/src/checkIfPackagesAffected.js similarity index 100% rename from scripts/executors/checkIfPackagesAffected.js rename to scripts/executors/src/checkIfPackagesAffected.js diff --git a/scripts/executors/debug-test.js b/scripts/executors/src/debug-test.js similarity index 100% rename from scripts/executors/debug-test.js rename to scripts/executors/src/debug-test.js diff --git a/scripts/executors/format.js b/scripts/executors/src/format.js similarity index 100% rename from scripts/executors/format.js rename to scripts/executors/src/format.js diff --git a/scripts/executors/invalidate-just-cache.js b/scripts/executors/src/invalidate-just-cache.js similarity index 100% rename from scripts/executors/invalidate-just-cache.js rename to scripts/executors/src/invalidate-just-cache.js diff --git a/scripts/executors/local-codepen.js b/scripts/executors/src/local-codepen.js similarity index 100% rename from scripts/executors/local-codepen.js rename to scripts/executors/src/local-codepen.js diff --git a/scripts/executors/runPublished.js b/scripts/executors/src/runPublished.js similarity index 100% rename from scripts/executors/runPublished.js rename to scripts/executors/src/runPublished.js diff --git a/scripts/executors/runPublished.spec.ts b/scripts/executors/src/runPublished.spec.ts similarity index 100% rename from scripts/executors/runPublished.spec.ts rename to scripts/executors/src/runPublished.spec.ts diff --git a/scripts/executors/scrub.js b/scripts/executors/src/scrub.js similarity index 100% rename from scripts/executors/scrub.js rename to scripts/executors/src/scrub.js diff --git a/scripts/executors/start.js b/scripts/executors/src/start.js similarity index 100% rename from scripts/executors/start.js rename to scripts/executors/src/start.js diff --git a/scripts/executors/tag-react-components.ts b/scripts/executors/src/tag-react-components.ts similarity index 100% rename from scripts/executors/tag-react-components.ts rename to scripts/executors/src/tag-react-components.ts diff --git a/scripts/executors/tsconfig.lib.json b/scripts/executors/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/executors/tsconfig.lib.json +++ b/scripts/executors/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/gulp/package.json b/scripts/gulp/package.json index ce3b4c7192438..aade6af315a29 100644 --- a/scripts/gulp/package.json +++ b/scripts/gulp/package.json @@ -15,7 +15,6 @@ "@fluentui/scripts-utils": "*", "@fluentui/scripts-prettier": "*", "@fluentui/scripts-puppeteer": "*", - "@fluentui/scripts-babel": "*", "@fluentui/scripts-projects-test": "*" }, "devDependencies": {} diff --git a/scripts/babel/plugins/index.ts b/scripts/gulp/src/babel-plugins/index.ts similarity index 100% rename from scripts/babel/plugins/index.ts rename to scripts/gulp/src/babel-plugins/index.ts diff --git a/scripts/babel/plugins/transform-star-import-plugin.ts b/scripts/gulp/src/babel-plugins/transform-star-import-plugin.ts similarity index 99% rename from scripts/babel/plugins/transform-star-import-plugin.ts rename to scripts/gulp/src/babel-plugins/transform-star-import-plugin.ts index 7be63202b299f..cc07260008e08 100644 --- a/scripts/babel/plugins/transform-star-import-plugin.ts +++ b/scripts/gulp/src/babel-plugins/transform-star-import-plugin.ts @@ -1,4 +1,5 @@ import * as T from '@babel/types'; + import type { BabelPlugin } from './types'; /** diff --git a/scripts/babel/plugins/types.ts b/scripts/gulp/src/babel-plugins/types.ts similarity index 100% rename from scripts/babel/plugins/types.ts rename to scripts/gulp/src/babel-plugins/types.ts index a08b89da8b3e7..2b4196aabe124 100644 --- a/scripts/babel/plugins/types.ts +++ b/scripts/gulp/src/babel-plugins/types.ts @@ -1,5 +1,5 @@ -import * as T from '@babel/types'; import { NodePath } from '@babel/traverse'; +import * as T from '@babel/types'; export type BabelPluginArguments = { types: typeof T; diff --git a/scripts/gulp/src/plugins/gulp-example-source.ts b/scripts/gulp/src/plugins/gulp-example-source.ts index 20f4c70d5c07f..e7f5f08d92df8 100644 --- a/scripts/gulp/src/plugins/gulp-example-source.ts +++ b/scripts/gulp/src/plugins/gulp-example-source.ts @@ -1,11 +1,12 @@ import * as Babel from '@babel/core'; -import { transformStarImportPlugin } from '@fluentui/scripts-babel/plugins'; import { CLIEngine } from 'eslint'; import gutil from 'gulp-util'; import prettier from 'prettier'; import through from 'through2'; import Vinyl from 'vinyl'; +import { transformStarImportPlugin } from '../babel-plugins'; + import { getRelativePathToSourceFile } from './util'; import { ExampleSource } from './util/docs-types'; diff --git a/scripts/package-manager/package.json b/scripts/package-manager/package.json index 728118a0af6b9..ca4f315e7d9fe 100644 --- a/scripts/package-manager/package.json +++ b/scripts/package-manager/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/package-manager/project.json b/scripts/package-manager/project.json index 1847216e1515b..2c99ec85115b7 100644 --- a/scripts/package-manager/project.json +++ b/scripts/package-manager/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-package-manager", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/package-manager", + "sourceRoot": "scripts/package-manager/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/package-manager/postinstall.js b/scripts/package-manager/src/postinstall.js similarity index 100% rename from scripts/package-manager/postinstall.js rename to scripts/package-manager/src/postinstall.js diff --git a/scripts/package-manager/use-yarn-please.js b/scripts/package-manager/src/use-yarn-please.js similarity index 100% rename from scripts/package-manager/use-yarn-please.js rename to scripts/package-manager/src/use-yarn-please.js diff --git a/scripts/package-manager/tsconfig.lib.json b/scripts/package-manager/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/package-manager/tsconfig.lib.json +++ b/scripts/package-manager/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/perf-test-flamegrill/tsconfig.lib.json b/scripts/perf-test-flamegrill/tsconfig.lib.json index 5354d98dbfac2..f21721b5ee0d1 100644 --- a/scripts/perf-test-flamegrill/tsconfig.lib.json +++ b/scripts/perf-test-flamegrill/tsconfig.lib.json @@ -8,5 +8,5 @@ "types": ["webpack-env"] }, "exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx"], - "include": ["./**/*.ts", "./**/*.tsx", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.tsx", "./src/**/*.js"] } diff --git a/scripts/ts-node/package.json b/scripts/ts-node/package.json index 3cd88fba456ad..b70faff765411 100644 --- a/scripts/ts-node/package.json +++ b/scripts/ts-node/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/ts-node/project.json b/scripts/ts-node/project.json index e8ad5a577aa30..0cd3de132ffea 100644 --- a/scripts/ts-node/project.json +++ b/scripts/ts-node/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-ts-node", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/ts-node", + "sourceRoot": "scripts/ts-node/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/ts-node/src/index.js b/scripts/ts-node/src/index.js new file mode 100644 index 0000000000000..f053ebf7976e3 --- /dev/null +++ b/scripts/ts-node/src/index.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/scripts/ts-node/register.js b/scripts/ts-node/src/register.js similarity index 100% rename from scripts/ts-node/register.js rename to scripts/ts-node/src/register.js diff --git a/scripts/ts-node/tsconfig.lib.json b/scripts/ts-node/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/ts-node/tsconfig.lib.json +++ b/scripts/ts-node/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/update-release-notes/project.json b/scripts/update-release-notes/project.json index 8e8b4d82b2dc7..c1075c7c6d288 100644 --- a/scripts/update-release-notes/project.json +++ b/scripts/update-release-notes/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-update-release-notes", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/update-release-notes", + "sourceRoot": "scripts/update-release-notes/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/update-release-notes/changelogsAndTags.ts b/scripts/update-release-notes/src/changelogsAndTags.ts similarity index 100% rename from scripts/update-release-notes/changelogsAndTags.ts rename to scripts/update-release-notes/src/changelogsAndTags.ts diff --git a/scripts/update-release-notes/index.ts b/scripts/update-release-notes/src/index.ts similarity index 100% rename from scripts/update-release-notes/index.ts rename to scripts/update-release-notes/src/index.ts diff --git a/scripts/update-release-notes/init.ts b/scripts/update-release-notes/src/init.ts similarity index 100% rename from scripts/update-release-notes/init.ts rename to scripts/update-release-notes/src/init.ts diff --git a/scripts/update-release-notes/markdown.ts b/scripts/update-release-notes/src/markdown.ts similarity index 100% rename from scripts/update-release-notes/markdown.ts rename to scripts/update-release-notes/src/markdown.ts diff --git a/scripts/update-release-notes/pullRequests.ts b/scripts/update-release-notes/src/pullRequests.ts similarity index 100% rename from scripts/update-release-notes/pullRequests.ts rename to scripts/update-release-notes/src/pullRequests.ts diff --git a/scripts/update-release-notes/releases.ts b/scripts/update-release-notes/src/releases.ts similarity index 100% rename from scripts/update-release-notes/releases.ts rename to scripts/update-release-notes/src/releases.ts diff --git a/scripts/update-release-notes/types.ts b/scripts/update-release-notes/src/types.ts similarity index 100% rename from scripts/update-release-notes/types.ts rename to scripts/update-release-notes/src/types.ts diff --git a/scripts/update-release-notes/tsconfig.lib.json b/scripts/update-release-notes/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/update-release-notes/tsconfig.lib.json +++ b/scripts/update-release-notes/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts index 30905f3a4fe49..45600a9aa3af5 100644 --- a/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts +++ b/tools/workspace-plugin/src/generators/migrate-v8-pkg/index.spec.ts @@ -175,7 +175,7 @@ function setupDummyPackage( 'build-storybook': 'cross-env NODE_OPTIONS=--max-old-space-size=3072 just-scripts storybook:build', clean: 'just-scripts clean', 'code-style': 'just-scripts code-style', - codepen: 'node ../../scripts/executors/local-codepen.js', + codepen: 'node ../../scripts/executors/src/local-codepen.js', e2e: 'yarn workspace @fluentui/react-examples e2e --package react', just: 'just-scripts', lint: 'just-scripts lint', From dad6cd213026e2813158f7f6e4aa417700b2c4f9 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Mon, 27 May 2024 16:17:15 +0200 Subject: [PATCH 4/8] change files --- ...luentui-react-27671eeb-1fa7-49ce-8068-e6150048b1fa.json | 7 +++++++ ...eact-charting-6f19b95b-48d2-4551-8a48-3d536dabf40f.json | 7 +++++++ ...uentui-tokens-15117ef6-b2bf-4271-9818-c5f7ede5a743.json | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 change/@fluentui-react-27671eeb-1fa7-49ce-8068-e6150048b1fa.json create mode 100644 change/@fluentui-react-charting-6f19b95b-48d2-4551-8a48-3d536dabf40f.json create mode 100644 change/@fluentui-tokens-15117ef6-b2bf-4271-9818-c5f7ede5a743.json diff --git a/change/@fluentui-react-27671eeb-1fa7-49ce-8068-e6150048b1fa.json b/change/@fluentui-react-27671eeb-1fa7-49ce-8068-e6150048b1fa.json new file mode 100644 index 0000000000000..b7caa2b353051 --- /dev/null +++ b/change/@fluentui-react-27671eeb-1fa7-49ce-8068-e6150048b1fa.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: normalize all scripts source to live under /src", + "packageName": "@fluentui/react", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-charting-6f19b95b-48d2-4551-8a48-3d536dabf40f.json b/change/@fluentui-react-charting-6f19b95b-48d2-4551-8a48-3d536dabf40f.json new file mode 100644 index 0000000000000..59b8984dbf2b1 --- /dev/null +++ b/change/@fluentui-react-charting-6f19b95b-48d2-4551-8a48-3d536dabf40f.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: normalize all scripts source to live under /src", + "packageName": "@fluentui/react-charting", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-tokens-15117ef6-b2bf-4271-9818-c5f7ede5a743.json b/change/@fluentui-tokens-15117ef6-b2bf-4271-9818-c5f7ede5a743.json new file mode 100644 index 0000000000000..02f5ebf2acdfe --- /dev/null +++ b/change/@fluentui-tokens-15117ef6-b2bf-4271-9818-c5f7ede5a743.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "chore: normalize all scripts source to live under /src", + "packageName": "@fluentui/tokens", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none" +} From 0a52504c1ee77945b71071fb0def568a4d1e9b9d Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 May 2024 10:35:15 +0200 Subject: [PATCH 5/8] fix(workspace-tools): use explicit .mjs for type-check script --- tools/workspace-plugin/package.json | 2 +- .../workspace-plugin/scripts/{type-check.js => type-check.mjs} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/workspace-plugin/scripts/{type-check.js => type-check.mjs} (100%) diff --git a/tools/workspace-plugin/package.json b/tools/workspace-plugin/package.json index 33b469662cdac..99a87655055b9 100644 --- a/tools/workspace-plugin/package.json +++ b/tools/workspace-plugin/package.json @@ -6,7 +6,7 @@ "generators": "./generators.json", "scripts": { "test": "nx run @fluentui/workspace-plugin:test", - "type-check": "node ./scripts/type-check", + "type-check": "node ./scripts/type-check.mjs", "lint": "eslint --ext .ts,.js,.json ." }, "dependencies": { diff --git a/tools/workspace-plugin/scripts/type-check.js b/tools/workspace-plugin/scripts/type-check.mjs similarity index 100% rename from tools/workspace-plugin/scripts/type-check.js rename to tools/workspace-plugin/scripts/type-check.mjs From d5e81757b01979324d460b5ec787b4039cf703da Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 May 2024 10:47:06 +0200 Subject: [PATCH 6/8] chore(scripts-generators): normalize source to live under /src --- package.json | 6 +++--- packages/tokens/package.json | 2 +- scripts/generators/package.json | 2 +- scripts/generators/project.json | 2 +- scripts/generators/{ => src}/copy-notices.js | 0 scripts/generators/{ => src}/create-package/index.ts | 0 .../create-package/plop-templates-node/.eslintrc.json | 0 .../{ => src}/create-package/plop-templates-node/README.md | 0 .../create-package/plop-templates-node/jest.config.js | 0 .../create-package/plop-templates-node/just.config.ts | 0 .../create-package/plop-templates-node/package.json.hbs | 0 .../create-package/plop-templates-node/src/index.ts | 0 .../create-package/plop-templates-node/tsconfig.json | 0 .../{ => src}/create-package/plop-templates/.npmignore | 0 .../{ => src}/create-package/plop-templates/LICENSE | 0 scripts/generators/{ => src}/generate-package-manifest.js | 0 scripts/generators/{ => src}/generate-version-files.spec.ts | 0 scripts/generators/{ => src}/generate-version-files.ts | 0 scripts/generators/{ => src}/rename-package.ts | 0 scripts/generators/{ => src}/token-pipeline.ts | 0 scripts/generators/tsconfig.lib.json | 2 +- scripts/webpack/tsconfig.spec.json | 3 ++- 22 files changed, 9 insertions(+), 8 deletions(-) rename scripts/generators/{ => src}/copy-notices.js (100%) rename scripts/generators/{ => src}/create-package/index.ts (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/.eslintrc.json (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/README.md (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/jest.config.js (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/just.config.ts (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/package.json.hbs (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/src/index.ts (100%) rename scripts/generators/{ => src}/create-package/plop-templates-node/tsconfig.json (100%) rename scripts/generators/{ => src}/create-package/plop-templates/.npmignore (100%) rename scripts/generators/{ => src}/create-package/plop-templates/LICENSE (100%) rename scripts/generators/{ => src}/generate-package-manifest.js (100%) rename scripts/generators/{ => src}/generate-version-files.spec.ts (100%) rename scripts/generators/{ => src}/generate-version-files.ts (100%) rename scripts/generators/{ => src}/rename-package.ts (100%) rename scripts/generators/{ => src}/token-pipeline.ts (100%) diff --git a/package.json b/package.json index f82c91e95fb32..69cec0d6306e1 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "clean": "lage clean --verbose", "code-style": "lage code-style --verbose", "codepen": "cd packages/react && node ../../scripts/executors/src/local-codepen.js", - "copy-notices": "node scripts/generators/copy-notices.js", + "copy-notices": "node scripts/generators/src/copy-notices.js", "create-component": "yarn nx g @fluentui/workspace-plugin:react-component", "create-package": "yarn nx g @fluentui/workspace-plugin:react-library", "e2e": "lage e2e --verbose --concurrency=1", "format": "node scripts/executors/src/format.js", - "generate-version-files": "node -r ./scripts/ts-node/src/register ./scripts/generators/generate-version-files", + "generate-version-files": "node -r ./scripts/ts-node/src/register ./scripts/generators/src/generate-version-files", "lint": "lage lint --verbose", "lint:log": "FORCE_COLOR=0 yarn lint > lint.log 2>&1", "postinstall": "node ./scripts/package-manager/src/postinstall.js", @@ -45,7 +45,7 @@ "northstar:stats:build": "gulp stats", "northstar:stats:save": "gulp stats:save", "northstar:test:circulars": "gulp test:circulars:run", - "rename-package": "node -r ./scripts/ts-node/src/register ./scripts/generators/rename-package.ts", + "rename-package": "node -r ./scripts/ts-node/src/register ./scripts/generators/src/rename-package.ts", "run:published": "node ./scripts/executors/src/runPublished.js", "scrub": "node ./scripts/executors/src/scrub.js", "start": "node ./scripts/executors/src/start.js", diff --git a/packages/tokens/package.json b/packages/tokens/package.json index a209f7efdf4d5..1843bfc5dcb07 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -18,7 +18,7 @@ "just": "just-scripts", "lint": "just-scripts lint", "test": "jest --passWithNoTests", - "token-pipeline": "node -r ../../scripts/ts-node/src/register ../../scripts/generators/token-pipeline.ts", + "token-pipeline": "node -r ../../scripts/ts-node/src/register ../../scripts/generators/src/token-pipeline.ts", "type-check": "just-scripts type-check", "generate-api": "just-scripts generate-api" }, diff --git a/scripts/generators/package.json b/scripts/generators/package.json index aa30ffa0caa31..4ac5fe354ff18 100644 --- a/scripts/generators/package.json +++ b/scripts/generators/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js --ignore-pattern plop-templates-* .", + "lint": "eslint --ext .ts,.js --ignore-pattern plop-templates-* ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/generators/project.json b/scripts/generators/project.json index 75e6575cf5294..0605716585917 100644 --- a/scripts/generators/project.json +++ b/scripts/generators/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-generators", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/generators", + "sourceRoot": "scripts/generators/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/generators/copy-notices.js b/scripts/generators/src/copy-notices.js similarity index 100% rename from scripts/generators/copy-notices.js rename to scripts/generators/src/copy-notices.js diff --git a/scripts/generators/create-package/index.ts b/scripts/generators/src/create-package/index.ts similarity index 100% rename from scripts/generators/create-package/index.ts rename to scripts/generators/src/create-package/index.ts diff --git a/scripts/generators/create-package/plop-templates-node/.eslintrc.json b/scripts/generators/src/create-package/plop-templates-node/.eslintrc.json similarity index 100% rename from scripts/generators/create-package/plop-templates-node/.eslintrc.json rename to scripts/generators/src/create-package/plop-templates-node/.eslintrc.json diff --git a/scripts/generators/create-package/plop-templates-node/README.md b/scripts/generators/src/create-package/plop-templates-node/README.md similarity index 100% rename from scripts/generators/create-package/plop-templates-node/README.md rename to scripts/generators/src/create-package/plop-templates-node/README.md diff --git a/scripts/generators/create-package/plop-templates-node/jest.config.js b/scripts/generators/src/create-package/plop-templates-node/jest.config.js similarity index 100% rename from scripts/generators/create-package/plop-templates-node/jest.config.js rename to scripts/generators/src/create-package/plop-templates-node/jest.config.js diff --git a/scripts/generators/create-package/plop-templates-node/just.config.ts b/scripts/generators/src/create-package/plop-templates-node/just.config.ts similarity index 100% rename from scripts/generators/create-package/plop-templates-node/just.config.ts rename to scripts/generators/src/create-package/plop-templates-node/just.config.ts diff --git a/scripts/generators/create-package/plop-templates-node/package.json.hbs b/scripts/generators/src/create-package/plop-templates-node/package.json.hbs similarity index 100% rename from scripts/generators/create-package/plop-templates-node/package.json.hbs rename to scripts/generators/src/create-package/plop-templates-node/package.json.hbs diff --git a/scripts/generators/create-package/plop-templates-node/src/index.ts b/scripts/generators/src/create-package/plop-templates-node/src/index.ts similarity index 100% rename from scripts/generators/create-package/plop-templates-node/src/index.ts rename to scripts/generators/src/create-package/plop-templates-node/src/index.ts diff --git a/scripts/generators/create-package/plop-templates-node/tsconfig.json b/scripts/generators/src/create-package/plop-templates-node/tsconfig.json similarity index 100% rename from scripts/generators/create-package/plop-templates-node/tsconfig.json rename to scripts/generators/src/create-package/plop-templates-node/tsconfig.json diff --git a/scripts/generators/create-package/plop-templates/.npmignore b/scripts/generators/src/create-package/plop-templates/.npmignore similarity index 100% rename from scripts/generators/create-package/plop-templates/.npmignore rename to scripts/generators/src/create-package/plop-templates/.npmignore diff --git a/scripts/generators/create-package/plop-templates/LICENSE b/scripts/generators/src/create-package/plop-templates/LICENSE similarity index 100% rename from scripts/generators/create-package/plop-templates/LICENSE rename to scripts/generators/src/create-package/plop-templates/LICENSE diff --git a/scripts/generators/generate-package-manifest.js b/scripts/generators/src/generate-package-manifest.js similarity index 100% rename from scripts/generators/generate-package-manifest.js rename to scripts/generators/src/generate-package-manifest.js diff --git a/scripts/generators/generate-version-files.spec.ts b/scripts/generators/src/generate-version-files.spec.ts similarity index 100% rename from scripts/generators/generate-version-files.spec.ts rename to scripts/generators/src/generate-version-files.spec.ts diff --git a/scripts/generators/generate-version-files.ts b/scripts/generators/src/generate-version-files.ts similarity index 100% rename from scripts/generators/generate-version-files.ts rename to scripts/generators/src/generate-version-files.ts diff --git a/scripts/generators/rename-package.ts b/scripts/generators/src/rename-package.ts similarity index 100% rename from scripts/generators/rename-package.ts rename to scripts/generators/src/rename-package.ts diff --git a/scripts/generators/token-pipeline.ts b/scripts/generators/src/token-pipeline.ts similarity index 100% rename from scripts/generators/token-pipeline.ts rename to scripts/generators/src/token-pipeline.ts diff --git a/scripts/generators/tsconfig.lib.json b/scripts/generators/tsconfig.lib.json index 7d62e63759a56..bfb749f339c50 100644 --- a/scripts/generators/tsconfig.lib.json +++ b/scripts/generators/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/plop-templates/**", "**/plop-templates-node/**"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/webpack/tsconfig.spec.json b/scripts/webpack/tsconfig.spec.json index 4d20fc98b71dd..3a1444e6467a1 100644 --- a/scripts/webpack/tsconfig.spec.json +++ b/scripts/webpack/tsconfig.spec.json @@ -5,5 +5,6 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"] + "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"], + "files": ["../../typings/ignore-not-found-export-webpack-plugin/index.d.ts"] } From 38820d50787dafec1be922858a6be72cd401c1ba Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 May 2024 12:43:51 +0200 Subject: [PATCH 7/8] chore(lint-staged): normalize source to live under /src --- lint-staged.config.js | 2 +- scripts/lint-staged/package.json | 2 +- scripts/lint-staged/project.json | 2 +- scripts/lint-staged/{ => src}/eslint-for-package.js | 0 scripts/lint-staged/{ => src}/eslint.js | 0 scripts/lint-staged/tsconfig.lib.json | 2 +- scripts/monorepo/src/eslint-constants.js | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename scripts/lint-staged/{ => src}/eslint-for-package.js (100%) rename scripts/lint-staged/{ => src}/eslint.js (100%) diff --git a/lint-staged.config.js b/lint-staged.config.js index 93243d88b17b2..39d0b6f62b71a 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -10,7 +10,7 @@ const commands = { * - respect ignore files (which eslint doesn't do by default when passed a specific file path) * - match the set of files that are linted by the package's normal `lint` command */ - lint: 'node ./scripts/lint-staged/eslint', + lint: 'node ./scripts/lint-staged/src/eslint', }; // https://www.npmjs.com/package/lint-staged diff --git a/scripts/lint-staged/package.json b/scripts/lint-staged/package.json index 2028a93568e29..6857f42407935 100644 --- a/scripts/lint-staged/package.json +++ b/scripts/lint-staged/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" }, diff --git a/scripts/lint-staged/project.json b/scripts/lint-staged/project.json index 75f25449c3c7f..59c39db6114f9 100644 --- a/scripts/lint-staged/project.json +++ b/scripts/lint-staged/project.json @@ -1,7 +1,7 @@ { "name": "@fluentui/scripts-lint-staged", "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "scripts/lint-staged", + "sourceRoot": "scripts/lint-staged/src", "projectType": "library", "tags": ["tools"] } diff --git a/scripts/lint-staged/eslint-for-package.js b/scripts/lint-staged/src/eslint-for-package.js similarity index 100% rename from scripts/lint-staged/eslint-for-package.js rename to scripts/lint-staged/src/eslint-for-package.js diff --git a/scripts/lint-staged/eslint.js b/scripts/lint-staged/src/eslint.js similarity index 100% rename from scripts/lint-staged/eslint.js rename to scripts/lint-staged/src/eslint.js diff --git a/scripts/lint-staged/tsconfig.lib.json b/scripts/lint-staged/tsconfig.lib.json index bc31fef6f9184..f513783ef5307 100644 --- a/scripts/lint-staged/tsconfig.lib.json +++ b/scripts/lint-staged/tsconfig.lib.json @@ -7,5 +7,5 @@ "types": ["node"] }, "exclude": ["**/*.spec.ts", "**/*.test.ts"], - "include": ["./**/*.ts", "./**/*.js"] + "include": ["./src/**/*.ts", "./src/**/*.js"] } diff --git a/scripts/monorepo/src/eslint-constants.js b/scripts/monorepo/src/eslint-constants.js index 6e132278f87ee..b5ec79c2ce74b 100644 --- a/scripts/monorepo/src/eslint-constants.js +++ b/scripts/monorepo/src/eslint-constants.js @@ -1,4 +1,4 @@ -/** Constants used by the eslint task and scripts/lint-staged/eslint-for-package.js */ +/** Constants used by the eslint task and {@link file://./../../lint-staged/src/eslint-for-package.js } */ module.exports = { /** List of file extensions to lint, in format used by eslint (comma-separated, with leading .) */ extensions: '.ts,.tsx,.js,.jsx', From b04c6f3ad21b3746ea0ae8915abe7abd161bd12b Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 28 May 2024 15:51:01 +0200 Subject: [PATCH 8/8] fix(scripts-update-release-notes): add mising /src dir for lint target --- scripts/update-release-notes/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-release-notes/package.json b/scripts/update-release-notes/package.json index 6ead51d90ecc9..bd5881cdf198a 100644 --- a/scripts/update-release-notes/package.json +++ b/scripts/update-release-notes/package.json @@ -6,7 +6,7 @@ "scripts": { "format": "prettier -w --ignore-path ../../.prettierignore .", "format:check": "yarn format -c", - "lint": "eslint --ext .ts,.js .", + "lint": "eslint --ext .ts,.js ./src", "test": "jest --passWithNoTests", "type-check": "just-scripts type-check" },