chore: update clear-package-dir to check files array (#26645)

gatsbyjs · Aug 26, 2020 · 9898b72 · 9898b72
1 parent 6eefdee
commit 9898b72
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 52 deletions.
diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
@@ -61,8 +61,8 @@
     "typescript": "^3.9.5"
   },
   "files": [
-    "lib",
-    "scripts",
+    "lib/",
+    "scripts/",
     "cli.js"
   ],
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-cli#readme",

diff --git a/packages/gatsby-core-utils/package.json b/packages/gatsby-core-utils/package.json
@@ -26,8 +26,7 @@
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
   "files": [
-    "dist/",
-    "dist/index.d.ts"
+    "dist/"
   ],
   "dependencies": {
     "ci-info": "2.0.0",

diff --git a/packages/gatsby-design-tokens/.gitignore b/packages/gatsby-design-tokens/.gitignore
@@ -1,2 +1 @@
-/*.js
-/__tests__
+/dist
diff --git a/packages/gatsby-design-tokens/.npmignore b/packages/gatsby-design-tokens/.npmignore
diff --git a/packages/gatsby-design-tokens/package.json b/packages/gatsby-design-tokens/package.json
@@ -14,7 +14,7 @@
     "directory": "packages/gatsby-design-tokens"
   },
   "files": [
-    "dist/**/*"
+    "dist/"
   ],
   "scripts": {
     "build": "npm run build:tokens && npm run build:theme && npm run build:theme-gatsbyjs-org",

diff --git a/packages/gatsby-legacy-polyfills/.gitignore b/packages/gatsby-legacy-polyfills/.gitignore
@@ -1,3 +1,3 @@
-/dist/*.js
+/dist
 yarn.lock
 .tmp
diff --git a/packages/gatsby-legacy-polyfills/package.json b/packages/gatsby-legacy-polyfills/package.json
@@ -27,7 +27,7 @@
     "core-js-compat": "^3.6.5"
   },
   "files": [
-    "dist/**"
+    "dist/"
   ],
   "devDependencies": {
     "chokidar-cli": "^2.1.0",

diff --git a/packages/gatsby-page-utils/package.json b/packages/gatsby-page-utils/package.json
@@ -37,7 +37,7 @@
     "cross-env": "^5.2.1"
   },
   "files": [
-    "dist/*"
+    "dist/"
   ],
   "engines": {
     "node": ">=10.13.0"

diff --git a/packages/gatsby-telemetry/package.json b/packages/gatsby-telemetry/package.json
@@ -34,8 +34,8 @@
     "jest-junit": "^6.4.0"
   },
   "files": [
-    "lib",
-    "src"
+    "lib/",
+    "src/"
   ],
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-telemetry#readme",
   "keywords": [

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -186,17 +186,17 @@
   "files": [
     "apis.json",
     "ipc.json",
-    "cache-dir",
+    "cache-dir/",
     "cli.js",
-    "dist",
-    "gatsby-admin-public",
+    "dist/",
+    "gatsby-admin-public/",
     "graphql.js",
     "index.d.ts",
     "scripts/postinstall.js",
     "utils.js",
     "internal.js",
     "internal.d.ts",
-    "!cache-dir/__tests__/"
+    "!**/__tests__/"
   ],
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby#readme",
   "keywords": [

diff --git a/scripts/clear-package-dir.js b/scripts/clear-package-dir.js
@@ -87,8 +87,20 @@ const getListOfFilesToClear = ({ location, name }) => {
     npmignore = npmignore.concat([`node_modules/**`])
   }
 
-  const result = glob.sync(`**/*`, {
-    nodir: true,
+  let globPattern = `**/*`
+  // check files array in package.json and use it as glob pattern
+  try {
+    const pkg = require(`${location}/package.json`)
+    if (pkg.files && pkg.files.length) {
+      globPattern =
+        pkg.files.length > 1 ? `{${pkg.files.join(`,`)}}` : pkg.files[0]
+    }
+  } catch {
+    // do nothing
+  }
+
+  let result = []
+  result = glob.sync(globPattern, {
     ignore: npmignore,
     cwd: location,
   })