Merge branch 'master' into remove-core-bin

spentacular · spentacular · commit 6d72bcbf2c8b · 2021-12-21T00:12:57.000-06:00
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -281,6 +281,24 @@
         "test",
         "code"
       ]
+    },
+    {
+      "login": "yucho",
+      "name": "Yucho Ho",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9959271?v=4",
+      "profile": "https://yuchoho.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sugarmanz",
+      "name": "Jeremiah Zucker",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9255651?v=4",
+      "profile": "https://github.com/sugarmanz",
+      "contributions": [
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7
diff --git a/.gitignore b/.gitignore
@@ -60,5 +60,8 @@ jspm_packages/
 # next.js build output
 .next
 
+# VSCode workspace settings
+.vscode
+
 dist
 .DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,39 @@
+# v4.13.1 (Tue Sep 21 2021)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, Jeremiah Zucker ([@sugarmanz](https://github.com/sugarmanz)), for all your work!
+
+#### 🐛 Bug Fix
+
+- `@design-systems/test`
+  - Jest 27 [#669](https://github.com/intuit/design-systems-cli/pull/669) ([@renovate-bot](https://github.com/renovate-bot) [@sugarmanz](https://github.com/sugarmanz))
+
+#### 🔩 Dependency Updates
+
+- `@design-systems/test`
+  - Update jest monorepo [#550](https://github.com/intuit/design-systems-cli/pull/550) ([@renovate-bot](https://github.com/renovate-bot))
+
+#### Authors: 2
+
+- Jeremiah Zucker ([@sugarmanz](https://github.com/sugarmanz))
+- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
+
+---
+
+# v4.13.0 (Mon Aug 16 2021)
+
+#### 🚀 Enhancement
+
+- `@design-systems/size`
+  - Implement --merge-base option in size plugin [#666](https://github.com/intuit/design-systems-cli/pull/666) ([@yucho](https://github.com/yucho))
+
+#### Authors: 1
+
+- Yucho Ho ([@yucho](https://github.com/yucho))
+
+---
+
 # v2.19.0 (Wed Jul 28 2021)
 
 :tada: This release contains work from a new contributor! :tada:
diff --git a/README.md b/README.md
@@ -117,6 +117,10 @@ Thank you to all these wonderful people ([emoji key](https://allcontributors.org
     <td align="center"><a href="https://github.com/hborawski"><img src="https://avatars.githubusercontent.com/u/1325154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Harris Borawski</b></sub></a><br /><a href="https://github.com/intuit/design-systems-cli/commits?author=hborawski" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/fattslug"><img src="https://avatars.githubusercontent.com/u/18297343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sean Powell</b></sub></a><br /><a href="https://github.com/intuit/design-systems-cli/commits?author=fattslug" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/melindali255"><img src="https://avatars.githubusercontent.com/u/29384338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>melindali255</b></sub></a><br /><a href="https://github.com/intuit/design-systems-cli/commits?author=melindali255" title="Documentation">📖</a> <a href="https://github.com/intuit/design-systems-cli/commits?author=melindali255" title="Tests">⚠️</a> <a href="https://github.com/intuit/design-systems-cli/commits?author=melindali255" title="Code">💻</a></td>
+    <td align="center"><a href="https://yuchoho.com/"><img src="https://avatars.githubusercontent.com/u/9959271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yucho Ho</b></sub></a><br /><a href="https://github.com/intuit/design-systems-cli/commits?author=yucho" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/sugarmanz"><img src="https://avatars.githubusercontent.com/u/9255651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeremiah Zucker</b></sub></a><br /><a href="https://github.com/intuit/design-systems-cli/commits?author=sugarmanz" title="Tests">⚠️</a></td>
   </tr>
 </table>
 
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.12.0",
+  "version": "4.13.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/babel-plugin-include-styles/package.json b/packages/babel-plugin-include-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/babel-plugin-include-styles",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "A babel plugin that automatically includes the styles for a scoped monorepo design system built with `@design-systems/cli`",
   "main": "./dist/index.js",
   "types": "./dist",
diff --git a/packages/babel-plugin-replace-styles/package.json b/packages/babel-plugin-replace-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/babel-plugin-replace-styles",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "A babel plugin that replaces CSS imports for a scoped monorepo design system built with `@design-systems/cli`",
   "main": "./dist/index.js",
   "types": "./dist",
diff --git a/packages/cli-utils/package.json b/packages/cli-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/cli-utils",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "Utility functions for the @design-systems CLI",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/cli",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "A cli for scaffolding and building design systems",
   "author": "Adam Dierkens <adam@dierkens.com>",
   "license": "MIT",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/core",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The core structure of the @design-systems CLI",
   "author": "Adam Dierkens <adam@dierkens.com>",
   "license": "MIT",
diff --git a/packages/create/package.json b/packages/create/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/create",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "Initialize a @design-systems/cli monorepo",
   "main": "dist/index.js",
   "bin": "dist/bundle.js",
diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/docs",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "private": true,
   "author": "Andrew Lisowski <lisowski54@gmail.com>",
   "repository": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/eslint-config",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The eslint-config of the @design-systems CLI",
   "main": "index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/hooks",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist",
diff --git a/packages/load-config/package.json b/packages/load-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/load-config",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "main": "./dist/index.js",
   "types": "./dist",
   "repository": "https://github.com/intuit/design-systems-cli.git",
diff --git a/packages/next-esm-css/package.json b/packages/next-esm-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/next-esm-css",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "main": "./src/index.js",
   "repository": "https://github.com/intuit/design-systems-cli.git",
   "author": "Andrew Lisowski lisowski54@gmail.com",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/plugin",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "Plugin structure for the @design-systems CLI",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/stylelint-config",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The stylelint-config of the @design-systems CLI",
   "main": "index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/packages/svg-icon-builder/package.json b/packages/svg-icon-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/svg-icon-builder",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "main": "./dist/cjs/index.js",
   "description": "A simple CLI for generating icon components from SVGs.",
   "bin": {
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/utils",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "Helper utilities for developing react components",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
diff --git a/plugins/build/package.json b/plugins/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/build",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The build command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/bundle/package.json b/plugins/bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/bundle",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The bundle command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/clean/package.json b/plugins/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/clean",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The clean command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/create-command/package.json b/plugins/create-command/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/create-command",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The create command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/dev/package.json b/plugins/dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/dev",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The dev command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/lint/package.json b/plugins/lint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/lint",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The lint command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/playroom/package.json b/plugins/playroom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/playroom",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The playroom command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/proof/package.json b/plugins/proof/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/proof",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The proof command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/size/CHANGELOG.md b/plugins/size/CHANGELOG.md
@@ -1,3 +1,25 @@
+# v4.13.0 (Mon Aug 16 2021)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, Yucho Ho ([@yucho](https://github.com/yucho)), for all your work!
+
+#### 🚀 Enhancement
+
+- Implement --merge-base option in size plugin [#666](https://github.com/intuit/design-systems-cli/pull/666) ([@yucho](https://github.com/yucho))
+
+#### 🐛 Bug Fix
+
+- Add --build-commant option ([@yucho](https://github.com/yucho))
+- Edit comments ([@yucho](https://github.com/yucho))
+- Implement --merge-base option in size plugin ([@yucho](https://github.com/yucho))
+
+#### Authors: 1
+
+- Yucho Ho ([@yucho](https://github.com/yucho))
+
+---
+
 # v2.17.2 (Mon Apr 12 2021)
 
 :tada: This release contains work from a new contributor! :tada:
diff --git a/plugins/size/package.json b/plugins/size/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@design-systems/size",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "description": "The size command for @design-systems-cli",
   "main": "dist/index.js",
   "author": "Adam Dierkens <adam@dierkens.com>",
diff --git a/plugins/size/src/command.ts b/plugins/size/src/command.ts
@@ -18,6 +18,10 @@ const command: CliCommand = {
     {
       example: 'ds size --ignore @foo/bar @foo/baz',
       desc: 'Ignore the sizes of packages @foo/bar and @foo/baz'
+    },
+    {
+      example: 'ds size --merge-base prerelease',
+      desc: 'Show the size changes between current HEAD and prerelease branch'
     }
   ],
   options: [
@@ -84,7 +88,18 @@ const command: CliCommand = {
       type: Number,
       description: 'Failure Threshold for Size',
       config: true
-    }    
+    },
+    {
+      name: 'merge-base',
+      type: String,
+      description: 'Run the plugin against merge base. (Will be slower due to additional build process)'
+    },
+    {
+      name: 'build-command',
+      type: String,
+      description: 'Build command for --merge-base (defaults to "yarn build")',
+      defaultValue: 'yarn build'
+    }
   ]
 };
 
diff --git a/plugins/size/src/index.ts b/plugins/size/src/index.ts
@@ -7,6 +7,7 @@ import {
   SizeArgs,
   SizeResult} from "./interfaces"
 import { formatLine, formatExports } from "./utils/formatUtils";
+import { buildPackages } from "./utils/BuildUtils";
 import { calcSizeForAllPackages, reportResults, table, diffSizeForPackage } from "./utils/CalcSizeUtils";
 import { startAnalyze } from "./utils/WebpackUtils";
 import { createDiff } from "./utils/DiffUtils";
@@ -37,8 +38,20 @@ export default class SizePlugin implements Plugin<SizeArgs> {
       logger.disable();
     }
 
+    if (Object.prototype.hasOwnProperty.call(args, 'mergeBase') && !args.mergeBase) {
+      throw new Error('You must specify a commit-ish when --merge-base is set')
+    }
+
+    let local;
     if (fs.existsSync('lerna.json')) {
-      calcSizeForAllPackages(args);
+      if (args.mergeBase) {
+        local = buildPackages({ mergeBase: args.mergeBase, buildCommand: args.buildCommand });
+      }
+
+      calcSizeForAllPackages({
+        ...args,
+        local
+      });
       return;
     }
 
@@ -48,8 +61,12 @@ export default class SizePlugin implements Plugin<SizeArgs> {
       throw new Error('Could not find "process.env.npm_package_name"');
     }
 
+    if (args.mergeBase) {
+      local = buildPackages({ mergeBase: args.mergeBase, buildCommand: args.buildCommand });
+    }
+
     if (args.analyze) {
-      await startAnalyze(name, args.registry);
+      await startAnalyze(name, args.registry, local);
       return;
     }
 
@@ -65,7 +82,8 @@ export default class SizePlugin implements Plugin<SizeArgs> {
       persist: args.persist || args.diff,
       chunkByExport: args.detailed,
       diff: args.diff,
-      registry: args.registry
+      registry: args.registry,
+      local
     });
     const header = args.css ? cssHeader : defaultHeader;
 
diff --git a/plugins/size/src/interfaces.ts b/plugins/size/src/interfaces.ts
diff --git a/plugins/size/src/utils/BuildUtils.ts b/plugins/size/src/utils/BuildUtils.ts
diff --git a/plugins/size/src/utils/CalcSizeUtils.ts b/plugins/size/src/utils/CalcSizeUtils.ts
diff --git a/plugins/size/src/utils/WebpackUtils.ts b/plugins/size/src/utils/WebpackUtils.ts
diff --git a/plugins/storybook/package.json b/plugins/storybook/package.json
diff --git a/plugins/test/CHANGELOG.md b/plugins/test/CHANGELOG.md
diff --git a/plugins/test/package.json b/plugins/test/package.json
diff --git a/plugins/test/src/jest.config.base.ts b/plugins/test/src/jest.config.base.ts
diff --git a/plugins/test/src/jest/transform.ts b/plugins/test/src/jest/transform.ts
diff --git a/plugins/update/package.json b/plugins/update/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "4.12.0",`
	`2`	`+ "version": "4.13.1",`
`3`	`3`	`"npmClient": "yarn",`
`4`	`4`	`"useWorkspaces": true`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@design-systems/babel-plugin-include-styles",`
`3`		`- "version": "4.12.0",`
	`3`	`+ "version": "4.13.1",`
`4`	`4`	"description": "A babel plugin that automatically includes the styles for a scoped monorepo design system built with `@design-systems/cli`",
`5`	`5`	`"main": "./dist/index.js",`
`6`	`6`	`"types": "./dist",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@design-systems/babel-plugin-replace-styles",`
`3`		`- "version": "4.12.0",`
	`3`	`+ "version": "4.13.1",`
`4`	`4`	"description": "A babel plugin that replaces CSS imports for a scoped monorepo design system built with `@design-systems/cli`",
`5`	`5`	`"main": "./dist/index.js",`
`6`	`6`	`"types": "./dist",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@design-systems/cli-utils",`
`3`		`- "version": "4.12.0",`
	`3`	`+ "version": "4.13.1",`
`4`	`4`	`"description": "Utility functions for the @design-systems CLI",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"author": "Adam Dierkens <[email protected]>",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@design-systems/cli",`
`3`		`- "version": "4.12.0",`
	`3`	`+ "version": "4.13.1",`
`4`	`4`	`"description": "A cli for scaffolding and building design systems",`
`5`	`5`	`"author": "Adam Dierkens <[email protected]>",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@design-systems/core",`
`3`		`- "version": "4.12.0",`
	`3`	`+ "version": "4.13.1",`
`4`	`4`	`"description": "The core structure of the @design-systems CLI",`
`5`	`5`	`"author": "Adam Dierkens <[email protected]>",`
`6`	`6`	`"license": "MIT",`