Fix merge conflict

laurkim · laurkim · commit 294326f78f1c · 2023-02-01T10:27:07.000-05:00
diff --git a/.changeset/brown-gifts-notice.md b/.changeset/brown-gifts-notice.md
diff --git a/.changeset/kind-jobs-beg.md b/.changeset/kind-jobs-beg.md
diff --git a/.changeset/quick-pets-protect.md b/.changeset/quick-pets-protect.md
diff --git a/polaris-cli/CHANGELOG.md b/polaris-cli/CHANGELOG.md
@@ -1,4 +1,17 @@
-# @shopify/plugin-polaris
+# @shopify/polaris-cli
+
+## 0.1.0
+
+### Minor Changes
+
+- [#8223](https://github.com/Shopify/polaris/pull/8223) [`de7987c42`](https://github.com/Shopify/polaris/commit/de7987c426174b73d67e54eacf197da9490c76ec) Thanks [@samrose3](https://github.com/samrose3)! - Renamed Polaris CLI package and add docs to website
+
+## 0.0.32
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @shopify/polaris-migrator@0.11.3
 
 ## 0.0.31
 
diff --git a/polaris-cli/README.md b/polaris-cli/README.md
@@ -4,38 +4,7 @@
 
 [Shopify CLI][] plugin for managing Shopify Apps using [Polaris][].
 
-## Installation
+[Polaris CLI documentation](https://polaris.shopify.com/tools/polaris-cli)
 
-You can install the Polaris plugin using the Shopify CLI by running the following command:
-
-```sh
-shopify plugins install polaris
-```
-
-> Note: run the `shopify` CLI using the [following syntax](https://shopify.dev/apps/tools/cli/commands#command-syntax) based on your package manager (ex: npm, Yarn, or pnpm).
-
-## Commands
-
-This reference lists the [Shopify CLI][] commands for Polaris.
-
-### `migrate`
-
-Codemod transformations to help upgrade your Polaris codebase.
-
-```sh
-shopify polaris migrate <migration> <path>
-```
-
-- `migration` - name of migration, see available migrations on the docs site below.
-- `path` - files or directory to perform migration
-
-#### Flags
-
-| Flag      | Description                                          |
-| --------- | ---------------------------------------------------- |
-| `--dry`   | Do a dry-run, no code will be edited                 |
-| `--print` | Prints the changed output for comparison             |
-| `--force` | Bypass Git safety checks and forcibly run migrations |
-
-[shopify cli]: https://shopify.dev/apps/tools/cli
+[shopify cli]: https://shopify.dev/apps/tools/cli/commands
 [polaris]: https://polaris.shopify.com
diff --git a/polaris-cli/package.json b/polaris-cli/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "@shopify/plugin-polaris",
-  "version": "0.0.31",
+  "name": "@shopify/polaris-cli",
+  "version": "0.1.0",
   "description": "Commands for building Shopify Apps with Polaris",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <dev@shopify.com>",
-  "homepage": "https://polaris.shopify.com",
+  "homepage": "https://polaris.shopify.com/tools/cli",
   "repository": "https://github.com/Shopify/polaris",
   "bugs": {
     "url": "https://github.com/Shopify/polaris/issues"
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@oclif/core": "^1.13.10",
-    "@shopify/polaris-migrator": "^0.11.2"
+    "@shopify/polaris-migrator": "^0.11.3"
   },
   "devDependencies": {
     "typescript": "^4.7.4"
diff --git a/polaris-icons/CHANGELOG.md b/polaris-icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.11.0
+
+### Minor Changes
+
+- [#8159](https://github.com/Shopify/polaris/pull/8159) [`977e70a84`](https://github.com/Shopify/polaris/commit/977e70a847cdc446c28c2b06dc771e5970aa0f4f) Thanks [@kmeleta](https://github.com/kmeleta)! - Added Rows2Major icon
+
 ## 6.10.0
 
 ### Minor Changes
diff --git a/polaris-icons/package.json b/polaris-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-icons",
-  "version": "6.10.0",
+  "version": "6.11.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify Inc.",
   "main": "dist/index.js",
diff --git a/polaris-migrator/CHANGELOG.md b/polaris-migrator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @shopify/polaris-migrator
 
+## 0.11.3
+
+### Patch Changes
+
+- Updated dependencies [[`69d27dbf6`](https://github.com/Shopify/polaris/commit/69d27dbf63d360a7cb3722fa8cd16e605288b3b9)]:
+  - @shopify/stylelint-polaris@5.1.3
+
 ## 0.11.2
 
 ### Patch Changes
diff --git a/polaris-migrator/package.json b/polaris-migrator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-migrator",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Codemod transformations to help upgrade your Polaris codebase",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <dev@shopify.com>",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@shopify/polaris-tokens": "^6.3.0",
-    "@shopify/stylelint-polaris": "^5.1.2",
+    "@shopify/stylelint-polaris": "^5.1.3",
     "chalk": "^4.1.0",
     "globby": "11.0.1",
     "is-git-clean": "^1.1.0",
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@types/is-git-clean": "^1.1.0",
     "@types/jscodeshift": "^0.11.5",
-    "@shopify/polaris": "^10.24.0",
+    "@shopify/polaris": "^10.24.2",
     "plop": "^3.1.1",
     "plop-dir": "^0.0.5",
     "prettier": "^2.7.1",
diff --git a/polaris-react/CHANGELOG.md b/polaris-react/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 10.24.2
+
+### Patch Changes
+
+- [#8209](https://github.com/Shopify/polaris/pull/8209) [`d1a332963`](https://github.com/Shopify/polaris/commit/d1a3329634a1f4cd02f0d97b8239bbedad7cf889) Thanks [@aveline](https://github.com/aveline)! - Updated `Bleed` to take up full width of container
+
+* [#8224](https://github.com/Shopify/polaris/pull/8224) [`e30d1f51b`](https://github.com/Shopify/polaris/commit/e30d1f51b205c6875c0e712291081d836e851d97) Thanks [@peterlazzarino](https://github.com/peterlazzarino)! - Repair styling for Checkbox when indeterminate and disabled
+
+## 10.24.1
+
+### Patch Changes
+
+- [#8166](https://github.com/Shopify/polaris/pull/8166) [`ec0e2f671`](https://github.com/Shopify/polaris/commit/ec0e2f671487e167ee43326372ad2367b3e7f4a6) Thanks [@rjur11](https://github.com/rjur11)! - Fixed focus not returning to the `Popover` `activator` on keypress of Escape
+
+- Updated dependencies [[`977e70a84`](https://github.com/Shopify/polaris/commit/977e70a847cdc446c28c2b06dc771e5970aa0f4f)]:
+  - @shopify/polaris-icons@6.11.0
+
 ## 10.24.0
 
 ### Minor Changes
diff --git a/polaris-react/README.md b/polaris-react/README.md
@@ -33,7 +33,7 @@ Otherwise include the CSS in your HTML. We suggest copying the styles file into
 ```html
 <link
   rel="stylesheet"
-  href="https://unpkg.com/@shopify/polaris@10.24.0/build/esm/styles.css"
+  href="https://unpkg.com/@shopify/polaris@10.24.2/build/esm/styles.css"
 />
 ```
 
@@ -70,7 +70,7 @@ If React doesn’t make sense for your application, you can use a CSS-only versi
 ```html
 <link
   rel="stylesheet"
-  href="https://unpkg.com/@shopify/polaris@10.24.0/build/esm/styles.css"
+  href="https://unpkg.com/@shopify/polaris@10.24.2/build/esm/styles.css"
 />
 ```
 
diff --git a/polaris-react/package.json b/polaris-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@shopify/polaris",
   "description": "Shopify’s admin product component library",
-  "version": "10.24.0",
+  "version": "10.24.2",
   "private": false,
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <dev@shopify.com>",
@@ -65,7 +65,7 @@
     "preversion": "node ./scripts/readme-update-version"
   },
   "dependencies": {
-    "@shopify/polaris-icons": "^6.10.0",
+    "@shopify/polaris-icons": "^6.11.0",
     "@shopify/polaris-tokens": "^6.3.0",
     "@types/react": "*",
     "@types/react-dom": "*",
diff --git a/polaris-react/src/components/Bleed/Bleed.scss b/polaris-react/src/components/Bleed/Bleed.scss
@@ -1,6 +1,7 @@
 @import '../../styles/common';
 
 .Bleed {
+  min-width: 100%;
   // stylelint-disable -- Polaris component custom properties
   --pc-bleed-margin-block-start-xs: initial;
   --pc-bleed-margin-block-start-sm: var(--pc-bleed-margin-block-start-xs);
diff --git a/polaris-react/src/components/Checkbox/Checkbox.scss b/polaris-react/src/components/Checkbox/Checkbox.scss
@@ -42,7 +42,8 @@
     }
   }
 
-  &:disabled:checked {
+  &:disabled:checked,
+  &:disabled.Input-indeterminate {
     + .Backdrop {
       background: var(--p-border-disabled);
 
diff --git a/polaris-react/src/components/Checkbox/Checkbox.stories.tsx b/polaris-react/src/components/Checkbox/Checkbox.stories.tsx
@@ -6,14 +6,71 @@ export default {
   component: Checkbox,
 } as ComponentMeta<typeof Checkbox>;
 
+type CheckboxState = boolean | 'indeterminate';
+
 export function Default() {
-  const [checked, setChecked] = useState(false);
+  const [checked, setChecked] = useState<CheckboxState>(false);
+  const handleChange = useCallback((newChecked) => setChecked(newChecked), []);
+
+  return (
+    <Checkbox
+      label="Basic checkbox"
+      checked={checked}
+      onChange={handleChange}
+    />
+  );
+}
+
+export function Indeterminate() {
+  const [checked, setChecked] = useState<CheckboxState>('indeterminate');
+  const handleChange = useCallback((newChecked) => setChecked(newChecked), []);
+
+  return (
+    <Checkbox
+      label="Basic checkbox"
+      checked={checked}
+      onChange={handleChange}
+    />
+  );
+}
+
+export function DisabledUnchecked() {
+  const [checked, setChecked] = useState<CheckboxState>(false);
+  const handleChange = useCallback((newChecked) => setChecked(newChecked), []);
+
+  return (
+    <Checkbox
+      label="Basic checkbox"
+      checked={checked}
+      disabled
+      onChange={handleChange}
+    />
+  );
+}
+
+export function DisabledChecked() {
+  const [checked, setChecked] = useState<CheckboxState>(true);
+  const handleChange = useCallback((newChecked) => setChecked(newChecked), []);
+
+  return (
+    <Checkbox
+      label="Basic checkbox"
+      checked={checked}
+      disabled
+      onChange={handleChange}
+    />
+  );
+}
+
+export function DisabledIndeterminate() {
+  const [checked, setChecked] = useState<CheckboxState>('indeterminate');
   const handleChange = useCallback((newChecked) => setChecked(newChecked), []);
 
   return (
     <Checkbox
       label="Basic checkbox"
       checked={checked}
+      disabled
       onChange={handleChange}
     />
   );
diff --git a/polaris.shopify.com/CHANGELOG.md b/polaris.shopify.com/CHANGELOG.md
@@ -1,5 +1,24 @@
 # polaris.shopify.com
 
+## 0.31.0
+
+### Minor Changes
+
+- [#8223](https://github.com/Shopify/polaris/pull/8223) [`de7987c42`](https://github.com/Shopify/polaris/commit/de7987c426174b73d67e54eacf197da9490c76ec) Thanks [@samrose3](https://github.com/samrose3)! - Renamed Polaris CLI package and add docs to website
+
+### Patch Changes
+
+- Updated dependencies [[`d1a332963`](https://github.com/Shopify/polaris/commit/d1a3329634a1f4cd02f0d97b8239bbedad7cf889), [`e30d1f51b`](https://github.com/Shopify/polaris/commit/e30d1f51b205c6875c0e712291081d836e851d97)]:
+  - @shopify/polaris@10.24.2
+
+## 0.30.2
+
+### Patch Changes
+
+- Updated dependencies [[`ec0e2f671`](https://github.com/Shopify/polaris/commit/ec0e2f671487e167ee43326372ad2367b3e7f4a6), [`977e70a84`](https://github.com/Shopify/polaris/commit/977e70a847cdc446c28c2b06dc771e5970aa0f4f)]:
+  - @shopify/polaris@10.24.1
+  - @shopify/polaris-icons@6.11.0
+
 ## 0.30.1
 
 ### Patch Changes
diff --git a/polaris.shopify.com/content/tools/polaris-cli.md b/polaris.shopify.com/content/tools/polaris-cli.md
@@ -0,0 +1,39 @@
+---
+title: Polaris CLI
+description: Commands for building Shopify Apps with Polaris.
+icon: CodeMajor
+order: 2
+keywords:
+  - cli
+  - shopify cli
+  - polaris cli
+---
+
+[<img src="https://img.shields.io/npm/v/@shopify/polaris-cli.svg?labelColor=f9f9f9&color=dcf5f0" alt="npm version" style="width: 95px" />](https://www.npmjs.com/package/@shopify/polaris-cli)
+
+### migrate
+
+Executes the [Polaris Migrator](/tools/polaris-migrator). This makes version upgrades faster and safer by performing codemod transformations to your codebase. You can apply any of the [available Polaris migrations](/tools/polaris-migrator#migrations) using the [Shopify CLI](https://shopify.dev/apps/tools/cli/commands) `migrate` command.
+
+```
+shopify polaris migrate <migration> <path>
+```
+
+- `migration` - name of migration
+- `path` - files or directory to perform migration
+
+The following is a complete CLI command example using `npm`:
+
+```
+npm run shopify polaris migrate react-replace-text-component '/src/components/**/*.tsx'
+```
+
+See the [Shopify CLI command syntax](https://shopify.dev/apps/tools/cli/commands#command-syntax) section for how to execute commands using other package managers.
+
+#### Flags
+
+| Flag      | Description                                          |
+| --------- | ---------------------------------------------------- |
+| `--dry`   | Do a dry-run, no code will be edited                 |
+| `--print` | Prints the changed output for comparison             |
+| `--force` | Bypass Git safety checks and forcibly run migrations |
diff --git a/polaris.shopify.com/content/tools/polaris-migrator.md b/polaris.shopify.com/content/tools/polaris-migrator.md
@@ -2,7 +2,7 @@
 title: Polaris Migrator
 description: Codemod transformations to help upgrade your Polaris codebase.
 icon: ReplaceMajor
-order: 2
+order: 3
 ---
 
 [<img src="https://img.shields.io/npm/v/@shopify/polaris-migrator.svg?labelColor=f9f9f9&color=dcf5f0" alt="npm version" style="width: 95px" />](https://www.npmjs.com/package/@shopify/polaris-migrator)
diff --git a/polaris.shopify.com/content/tools/sandbox.md b/polaris.shopify.com/content/tools/sandbox.md
@@ -1,7 +1,7 @@
 ---
 title: Sandbox
 description: Effortless prototyping with Polaris components.
-order: 4
+order: 5
 icon: SandboxMajor
 url: /sandbox?code=N4Igxg9gJgpiBcIA8BhAhgJygHQHYAJ8BnGSXKTATwDEIIAXGDAQTHoEsJciBeYAbWBlGuevHwByACLsiAW1lEJAXwC6yvIQAOGdnKq0GTVhy58hXEWMkBRAB5aIGevgBKMR85UbcAPk34qJhQAHQAEjBosBj4aGyc3HyC%2BMIwouISACoMaAA2%2BADKeTBK%2BGrK%2BBz0uTA82CBFNUT1-gSEgQAKEI4AbkwB7bHxfXwAZnkkPoOEcRw9aPROfAPTSABCAK70iwRQsmC5EEQbGDD4Wrlo7H4r0-gAauwwAO6Fxc1td0gA9JvbXK07lNplwUIcSHwABQASnwPF8%2BGAymBhEBqxMCQAMrIXOxGHJeAILKI0tYJABxDBHIhvJoqAA0iNS6UkADkYC5GiUVOp8N80YQfl1ekw0T90FhwpFomKJaECqRTDdPoFMjA7PQUJYrrhRbd8ABNCAbFJoAgbEjEd74U6eeg0xbEGBna6jJz6JWxABGxpclGNMTAFsWciYREAmAT6pzRGletAkKD4LgpXSMXRoYgbMAAC1iNKI1ogfRiHFDjK9lBS2bNutyjKc%2BAr%2BqI9DQo1GIRWPzVGq1oh1era4uCIQV8QBASCkrHnqqNTqIGyrfyXJpa1OaAA1lAIM9cC0u%2B4iAGwDBsS39adjydT6y0KHzERrgBzDaXDAZAs1CSMi4nPKfu83j6niMAEkk%2BqEMAkHtF%2BJQZAA8lgYY-jBMxyMaLISAAqgUUgACQAAwhIRhGoSqdwnLkGS2k49rfNGKH0jByjMRR7TQexgxwUQGTuPQJzcORdyDPemFkgAtLhBEAEwAKzEaRwkiYQVE0R4dFEN8pwCRgQlsSprH6uol5pNEACS%2BJQqBciwvCiIwWQLaIjxjJiRsoiMlRFQ8PgNkANwwTpgn4JCaGBEeJ5njiISWWB4WqRguR8N5CVDKeRBPl67C5HilCYmgXowMlwAAAaPC8tIlPgboxPhwA8copUoip%2BACq1SAFK2YCbu1rWBF1cSbrF%2BI1TluS%2BA17zKD8g09SNYF9R1c3DXFciTe5ogzd8K0LetaWzd1vXhT8kU3tFLZ7UthDQoF7HIvq-KTt8cqjoqCSyiOM4JJUeLzvUUiRMMCwwImtHOM0ICZl6UAbKD7VIOe9BLYjMVrb4HRoP6WxED8SNXfqqOXejS55FVa6Vig1a4LWeNo-iCPfEjYovV970TkOr3fcmc61PUrJGAeKpID2mratcg53Jk2ZnDxNoaRDsSnLE8w5YVNRJrguSVuwoz4NjMQtk4Lo0jzMuFNm3S65Q%2BoXGaSYxNm7DPjLGCdsL3yi32rYSxgLNc%2BzyrDlgvggPSID0DLoZEAg-AgIcYDFPAaQgKo4fPOwUCRzH8D8OoQA
 status:
diff --git a/polaris.shopify.com/content/tools/stylelint-polaris/index.md b/polaris.shopify.com/content/tools/stylelint-polaris/index.md
diff --git a/polaris.shopify.com/package.json b/polaris.shopify.com/package.json
diff --git a/stylelint-polaris/CHANGELOG.md b/stylelint-polaris/CHANGELOG.md
diff --git a/stylelint-polaris/package.json b/stylelint-polaris/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@shopify/polaris-icons",`
`3`		`- "version": "6.10.0",`
	`3`	`+ "version": "6.11.0",`
`4`	`4`	`"license": "SEE LICENSE IN LICENSE.md",`
`5`	`5`	`"author": "Shopify Inc.",`
`6`	`6`	`"main": "dist/index.js",`