chore(scripts/*): replace just-scripts and npm script aliases with nx (…

…#32371)
microsoft · Sep 11, 2024 · 4fb90db · 4fb90db
1 parent 7d68d05
commit 4fb90db
Show file tree

Hide file tree

Showing 79 changed files with 175 additions and 240 deletions.
diff --git a/nx.json b/nx.json
@@ -34,7 +34,8 @@
     },
     "type-check": {
       "dependsOn": ["^build"],
-      "cache": true
+      "cache": true,
+      "executor": "@fluentui/workspace-plugin:type-check"
     },
     "prepare": {
       "dependsOn": ["^prepare"],
@@ -81,6 +82,23 @@
         "command": "eslint src"
       }
     },
+    "format": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "prettier --write {projectRoot}"
+      },
+      "metadata": {
+        "help": {
+          "command": "yarn prettier --help",
+          "options": {}
+        }
+      },
+      "configurations": {
+        "check": {
+          "command": "prettier --check {projectRoot}"
+        }
+      }
+    },
     "verify-packaging": {
       "dependsOn": ["build"],
       "cache": true

diff --git a/scripts/api-extractor/just.config.ts b/scripts/api-extractor/just.config.ts
diff --git a/scripts/api-extractor/package.json b/scripts/api-extractor/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {},
   "devDependencies": {}
 }
diff --git a/scripts/api-extractor/project.json b/scripts/api-extractor/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/api-extractor",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/babel/just.config.ts b/scripts/babel/just.config.ts
diff --git a/scripts/babel/package.json b/scripts/babel/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {},
   "devDependencies": {},
   "exports": {

diff --git a/scripts/babel/project.json b/scripts/babel/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/babel/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/beachball/just.config.ts b/scripts/beachball/just.config.ts
diff --git a/scripts/beachball/package.json b/scripts/beachball/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-github": "*",
     "@fluentui/scripts-monorepo": "*",

diff --git a/scripts/beachball/project.json b/scripts/beachball/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/beachball/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/cypress/just.config.ts b/scripts/cypress/just.config.ts
diff --git a/scripts/cypress/package.json b/scripts/cypress/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.ts",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {},
   "devDependencies": {}
 }
diff --git a/scripts/cypress/project.json b/scripts/cypress/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/cypress/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/dangerjs/just.config.ts b/scripts/dangerjs/just.config.ts
diff --git a/scripts/dangerjs/package.json b/scripts/dangerjs/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-monorepo": "*",
     "@fluentui/scripts-utils": "*"

diff --git a/scripts/dangerjs/project.json b/scripts/dangerjs/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/dangerjs/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/executors/just.config.ts b/scripts/executors/just.config.ts
diff --git a/scripts/executors/package.json b/scripts/executors/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-utils": "*",
     "@fluentui/scripts-monorepo": "*",

diff --git a/scripts/executors/project.json b/scripts/executors/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/executors/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/fluentui-publish/just.config.ts b/scripts/fluentui-publish/just.config.ts
diff --git a/scripts/fluentui-publish/package.json b/scripts/fluentui-publish/package.json
@@ -6,11 +6,8 @@
     "northstar-release": "./bin/northstar-release.js"
   },
   "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
     "lint": "eslint --ext .ts,.js ./src ./bin",
-    "test": "jest --passWithNoTests",
-    "type-check": "just-scripts type-check"
+    "test": "jest --passWithNoTests"
   },
   "dependencies": {
     "@fluentui/scripts-monorepo": "*"

diff --git a/scripts/fluentui-publish/project.json b/scripts/fluentui-publish/project.json
@@ -12,6 +12,8 @@
         "{workspaceRoot}/jest.preset.js",
         "{workspaceRoot}/packages/fluentui/*/project.json"
       ]
-    }
+    },
+    "type-check": {},
+    "format": {}
   }
 }
diff --git a/scripts/generators/just.config.ts b/scripts/generators/just.config.ts
diff --git a/scripts/generators/package.json b/scripts/generators/package.json
@@ -4,11 +4,8 @@
   "private": true,
   "main": "index.js",
   "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
     "lint": "eslint --ext .ts,.js --ignore-pattern plop-templates-* ./src",
-    "test": "jest --passWithNoTests",
-    "type-check": "just-scripts type-check"
+    "test": "jest --passWithNoTests"
   },
   "dependencies": {
     "@fluentui/scripts-monorepo": "*",

diff --git a/scripts/generators/project.json b/scripts/generators/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/generators/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/github/just.config.ts b/scripts/github/just.config.ts
diff --git a/scripts/github/package.json b/scripts/github/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.ts",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {},
   "devDependencies": {}
 }
diff --git a/scripts/github/project.json b/scripts/github/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/github/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/gulp/just.config.ts b/scripts/gulp/just.config.ts
diff --git a/scripts/gulp/package.json b/scripts/gulp/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.ts",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-monorepo": "*",
     "@fluentui/scripts-utils": "*",

diff --git a/scripts/gulp/project.json b/scripts/gulp/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/gulp/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/jest/just.config.ts b/scripts/jest/just.config.ts
diff --git a/scripts/jest/package.json b/scripts/jest/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-monorepo": "*",
     "@fluentui/scripts-utils": "*"

diff --git a/scripts/jest/project.json b/scripts/jest/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/jest/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/lint-staged/just.config.ts b/scripts/lint-staged/just.config.ts
diff --git a/scripts/lint-staged/package.json b/scripts/lint-staged/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-monorepo": "*",
     "@fluentui/scripts-utils": "*"

diff --git a/scripts/lint-staged/project.json b/scripts/lint-staged/project.json
@@ -3,5 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "scripts/lint-staged/src",
   "projectType": "library",
-  "tags": ["tools"]
+  "tags": ["tools"],
+  "targets": {
+    "type-check": {},
+    "format": {}
+  }
 }
diff --git a/scripts/monorepo/just.config.ts b/scripts/monorepo/just.config.ts
diff --git a/scripts/monorepo/package.json b/scripts/monorepo/package.json
@@ -3,11 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "main": "src/index.js",
-  "scripts": {
-    "format": "prettier -w --ignore-path ../../.prettierignore .",
-    "format:check": "yarn format -c",
-    "type-check": "just-scripts type-check"
-  },
+  "scripts": {},
   "dependencies": {
     "@fluentui/scripts-utils": "*"
   },