fix: improve rebuild detection (#232)

- changed input file detection: default config vs. explicit config (see above) - changed output detection: default config vs. explicit config (see above) - fix reading of tsconfig (support comments, inheritance, exclude affects only input) support custom tsconfig filename - fix output existence check (handle files) - support glob as input & output - remove haveCheckedForRerun from yarn.build.json (no longer necessary) - mark every non-related project for this build for rerun, when this project was affected by others and therefore needs a build in the future (see above) - using a checksum based on last modified and size for each file instead of the latest last modified timestamp
ojkelly · Sep 22, 2022 · e884a41 · e884a41
1 parent 53d85b4
commit e884a41
Show file tree

Hide file tree

Showing 27 changed files with 933 additions and 652 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@types-glob-npm-7.1.4-d45247eaa2-6911a95644.zip b/.yarn/cache/@types-glob-npm-7.1.4-d45247eaa2-6911a95644.zip
diff --git a/.yarn/cache/@types-minimatch-npm-3.0.5-802bb0797f-c41d136f67.zip b/.yarn/cache/@types-minimatch-npm-3.0.5-802bb0797f-c41d136f67.zip
diff --git a/.yarn/cache/@types-object-hash-npm-2.2.1-1e19446be3-bbcbf07690.zip b/.yarn/cache/@types-object-hash-npm-2.2.1-1e19446be3-bbcbf07690.zip
diff --git a/.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip b/.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip
diff --git a/.yarn/cache/get-tsconfig-npm-4.2.0-96dd0cfce0-dfae3520be.zip b/.yarn/cache/get-tsconfig-npm-4.2.0-96dd0cfce0-dfae3520be.zip
diff --git a/.yarn/cache/glob-promise-npm-4.2.1-6e8e1a890c-51bbb658e2.zip b/.yarn/cache/glob-promise-npm-4.2.1-6e8e1a890c-51bbb658e2.zip
diff --git a/.yarn/cache/glob-promise-npm-4.2.2-30777327f7-c1a3d95f7c.zip b/.yarn/cache/glob-promise-npm-4.2.2-30777327f7-c1a3d95f7c.zip
diff --git a/.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip b/.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip
diff --git a/.yarn/cache/ignore-npm-5.2.0-fc4b58a4f3-6b1f926792.zip b/.yarn/cache/ignore-npm-5.2.0-fc4b58a4f3-6b1f926792.zip
diff --git a/.yarn/cache/object-hash-npm-3.0.0-d941e0cabe-80b4904bb3.zip b/.yarn/cache/object-hash-npm-3.0.0-d941e0cabe-80b4904bb3.zip
diff --git a/.yarn/plugins/@ojkelly/plugin-all.cjs b/.yarn/plugins/@ojkelly/plugin-all.cjs
diff --git a/.yarn/plugins/@ojkelly/plugin-build.cjs b/.yarn/plugins/@ojkelly/plugin-build.cjs
diff --git a/.yarn/plugins/@ojkelly/plugin-bundle.cjs b/.yarn/plugins/@ojkelly/plugin-bundle.cjs
diff --git a/.yarn/plugins/@ojkelly/plugin-test.cjs b/.yarn/plugins/@ojkelly/plugin-test.cjs
diff --git a/packages/examples/words/quitter/package.json b/packages/examples/words/quitter/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@internal/quitter",
+  "version": "1.0.0",
+  "main": "build/index.js",
+  "license": "UNLICENSED",
+  "private": true,
+  "scripts": {
+    "build": "tsc --noEmit"
+  },
+  "yarn.build": {
+    "output": null
+  },
+  "dependencies": {
+    "typescript": "^4"
+  }
+}
diff --git a/packages/examples/words/quitter/src/index.ts b/packages/examples/words/quitter/src/index.ts
@@ -0,0 +1 @@
+export default "quitter";
diff --git a/packages/examples/words/quitter/tsconfig.json b/packages/examples/words/quitter/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build",
+    "target": "es6",
+    "module": "commonjs",
+    "pretty": true,
+    "baseUrl": ".",
+    "paths": {
+      "@src/*": [
+        "./src/*"
+      ]
+    }
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "src/**/*.spec.ts"
+  ]
+}
diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json
@@ -8,7 +8,6 @@
     "@types/is-ci": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/js-yaml": "^4.0.2",
-    "@types/micromatch": "^4.0.1",
     "@types/yup": "^0.26.12",
     "@yarnpkg/builder": "*",
     "@yarnpkg/cli": "*",
@@ -43,11 +42,8 @@
     "clipanion": "^3.x",
     "date-fns": "^2.12.0",
     "esprima": "^4.0.1",
-    "glob": "^7.2.0",
-    "glob-promise": "^4.2.2",
     "ignore": "^5.1.8",
     "is-ci": "^2.0.0",
-    "micromatch": "^4.0.2",
     "p-limit": "^2.3.0",
     "p-queue": "^6.3.0",
     "slice-ansi": "^4.0.0",

diff --git a/packages/plugins/plugin-build/package.json b/packages/plugins/plugin-build/package.json
@@ -48,8 +48,6 @@
     "clipanion": "^3.x",
     "date-fns": "^2.12.0",
     "esprima": "^4.0.1",
-    "glob": "^7.2.0",
-    "glob-promise": "^4.2.1",
     "ignore": "^5.1.8",
     "is-ci": "^2.0.0",
     "micromatch": "^4.0.2",

diff --git a/packages/plugins/plugin-bundle/package.json b/packages/plugins/plugin-bundle/package.json
@@ -8,7 +8,6 @@
     "@types/is-ci": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/js-yaml": "^4.0.2",
-    "@types/micromatch": "^4.0.1",
     "@types/yup": "^0.26.12",
     "@yarnpkg/builder": "*",
     "@yarnpkg/cli": "*",
@@ -46,11 +45,9 @@
     "clipanion": "^3.x",
     "date-fns": "^2.12.0",
     "esprima": "^4.0.1",
-    "glob": "^7.2.0",
-    "glob-promise": "^4.2.1",
+    "globby": "^11.0.4",
     "ignore": "^5.1.8",
     "is-ci": "^2.0.0",
-    "micromatch": "^4.0.2",
     "p-limit": "^2.3.0",
     "p-queue": "^6.3.0",
     "slice-ansi": "^4.0.0",

diff --git a/packages/plugins/plugin-bundle/src/commands/bundle/ignore/getAllFiles.ts b/packages/plugins/plugin-bundle/src/commands/bundle/ignore/getAllFiles.ts
@@ -1,5 +1,5 @@
 import { Filename } from "@yarnpkg/fslib";
-import glob from "glob-promise";
+import globby from "globby";
 
 interface GetAllFilesProps {
   cwd: string;
@@ -9,11 +9,13 @@ export const getAllFiles = async ({
   cwd,
 }: GetAllFilesProps): Promise<Filename[]> => {
   try {
-    const files = (await glob(`${cwd}/**/*`, { dot: true })) as Filename[];
+    const files = (await globby(`**/*`, {
+      dot: true,
+      cwd: cwd,
+      absolute: false,
+    })) as Filename[];
 
-    return files
-      .map((fileName) => fileName.split(`${cwd}/`)[1] ?? "")
-      .filter(Boolean) as Filename[];
+    return files;
   } catch (_e) {
     return [];
   }

diff --git a/packages/plugins/plugin-test/package.json b/packages/plugins/plugin-test/package.json
@@ -8,7 +8,6 @@
     "@types/is-ci": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/js-yaml": "^4.0.2",
-    "@types/micromatch": "^4.0.1",
     "@types/yup": "^0.26.12",
     "@yarnpkg/builder": "*",
     "@yarnpkg/cli": "*",
@@ -41,11 +40,8 @@
     "clipanion": "^3.x",
     "date-fns": "^2.12.0",
     "esprima": "^4.0.1",
-    "glob": "^7.2.0",
-    "glob-promise": "^4.2.1",
     "ignore": "^5.1.8",
     "is-ci": "^2.0.0",
-    "micromatch": "^4.0.2",
     "p-limit": "^2.3.0",
     "p-queue": "^6.3.0",
     "slice-ansi": "^4.0.0",

diff --git a/packages/plugins/shared/package.json b/packages/plugins/shared/package.json
@@ -12,8 +12,8 @@
     "@types/is-ci": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/js-yaml": "^4.0.2",
-    "@types/micromatch": "^4.0.1",
     "@types/node": "^17.0.23",
+    "@types/object-hash": "^2.2.1",
     "@types/yup": "^0.26.12",
     "@yarnpkg/builder": "*",
     "@yarnpkg/cli": "*",
@@ -55,11 +55,11 @@
     "clipanion": "^3.x",
     "date-fns": "^2.12.0",
     "esprima": "^4.0.1",
-    "glob": "^7.2.0",
-    "glob-promise": "^4.2.2",
+    "get-tsconfig": "^4.2.0",
+    "globby": "^11.0.4",
     "ignore": "^5.1.8",
     "is-ci": "^2.0.0",
-    "micromatch": "^4.0.2",
+    "object-hash": "^3.0.0",
     "p-limit": "^2.3.0",
     "p-queue": "^6.3.0",
     "slice-ansi": "^4.0.0",

diff --git a/packages/plugins/shared/src/config.ts b/packages/plugins/shared/src/config.ts
@@ -11,20 +11,32 @@ const DEFAULT_IGNORE_FILE = ".bundleignore" as Filename;
 const isYarnBuildConfiguration = t.isObject({
   folders: t.isObject({
     input: t.isOneOf([t.isString(), t.isArray(t.isString())]),
-    output: t.isOneOf([t.isString(), t.isArray(t.isString())]),
+    output: t.isNullable(t.isOneOf([t.isString(), t.isArray(t.isString())])),
   }),
   exclude: t.isArray(t.isString()),
   bail: t.isBoolean(),
   hideYarnBuildBadge: t.isBoolean(),
   ignoreFile: t.isString(),
 });
 
+const isYarnBuildManifestConfiguration = t.isObject({
+  input: t.isOptional(t.isOneOf([t.isString(), t.isArray(t.isString())])),
+  output: t.isOptional(
+    t.isNullable(t.isOneOf([t.isString(), t.isArray(t.isString())]))
+  ),
+  tsconfig: t.isOptional(t.isString()),
+});
+
 type YarnBuildConfiguration = t.InferType<typeof isYarnBuildConfiguration>;
 
+type YarnBuildManifestConfiguration = t.InferType<
+  typeof isYarnBuildManifestConfiguration
+>;
+
 const DEFAULT_CONFIG: YarnBuildConfiguration = {
   folders: {
     input: ".",
-    output: ["build", "node_modules"],
+    output: null,
   },
   exclude: [],
   bail: true,
@@ -93,11 +105,28 @@ async function GetPluginConfiguration(
   };
 }
 
+function getWorkspaceConfiguration(packageJsonManifest: {
+  [key: string]: any;
+}): YarnBuildManifestConfiguration {
+  const configuration = {
+    ...packageJsonManifest["yarn.build"],
+  };
+
+  if (isYarnBuildManifestConfiguration(configuration)) {
+    return configuration;
+  }
+
+  return {};
+}
+
 export {
   isYarnBuildConfiguration,
   YarnBuildConfiguration,
   GetPluginConfiguration,
   GetPartialPluginConfiguration,
   DEFAULT_IGNORE_FILE,
   DEFAULT_YARN_BUILD_CONFIGRATION_FILENAME,
+  isYarnBuildManifestConfiguration,
+  YarnBuildManifestConfiguration,
+  getWorkspaceConfiguration,
 };