Merge branch 'main' into contextual-save-bar-updates

.changeset/cold-windows-occur.md

@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': minor
+---
+
+Added support to `Filters` for indicating `appliedFilters` have unsaved changes

.changeset/few-suits-love.md

@@ -0,0 +1,5 @@
+---
+'@shopify/polaris-migrator': minor
+---
+
+Created migration to replace deprecated `text` custom properties in polaris-react v14.0.0

.changeset/nine-humans-visit.md

@@ -0,0 +1,5 @@
+---
+'polaris.shopify.com': patch
+---
+
+Updated common action guidance.

.changeset/wicked-ears-matter.md

@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': patch
+---
+
+Added `touch-action: manipulation` to `Button` and `Link`

polaris-for-vscode/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.9.8
+
+### Patch Changes
+
+- Updated dependencies [[`f6308995e`](https://github.com/Shopify/polaris/commit/f6308995e3ef8b5f8f017471d23a08577243b323)]:
+  - @shopify/polaris-tokens@8.10.0
+
 ## 0.9.7
 
 ### Patch Changes

polaris-for-vscode/package.json

@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/Shopify/polaris/issues"
   },
-  "version": "0.9.7",
+  "version": "0.9.8",
   "private": true,
   "keywords": [
     "polaris",
@@ -38,7 +38,7 @@
     "clean": "rm -rf .turbo node_modules dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@shopify/polaris-tokens": "^8.9.0",
+    "@shopify/polaris-tokens": "^8.10.0",
     "vscode-languageclient": "^9.0.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11"

polaris-icons/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 8.11.0
+
+### Minor Changes
+
+- [#11841](https://github.com/Shopify/polaris/pull/11841) [`7750bfa4c`](https://github.com/Shopify/polaris/commit/7750bfa4c2c45215935cedcc21746e8fc3dd400e) Thanks [@heyjoethomas](https://github.com/heyjoethomas)! - Adds BulletIcon to repository
+
+## 8.10.0
+
+### Minor Changes
+
+- [#11816](https://github.com/Shopify/polaris/pull/11816) [`4b730c84d`](https://github.com/Shopify/polaris/commit/4b730c84dc3a636ea04570e36ad7b3bb39b24277) Thanks [@dGoligorsky](https://github.com/dGoligorsky)! - Added some icons for image editing
+
+### Patch Changes
+
+- [#11825](https://github.com/Shopify/polaris/pull/11825) [`fd5b31d59`](https://github.com/Shopify/polaris/commit/fd5b31d59f8452e487a4696f907fbbb606749ae9) Thanks [@ryanwilsonperkin](https://github.com/ryanwilsonperkin)! - Add missing peer dependency on React
+
 ## 8.9.0
 
 ### Minor Changes

polaris-icons/icons/BulletIcon.yml

@@ -0,0 +1,13 @@
+name: Bullet
+description:
+  Used for bulleted lists
+keywords:
+  - Bullet 
+  - List
+authors:
+  - Vihar Kothamasu
+  - Joe Thoams
+date_added: 2024-04-04
+date_modified: 2024-04-04
+# Optional: fill exclusive_use if the icon should *only* be used
+# in specific areas of the admin (such as “Orders”):

polaris-icons/icons/CropIcon.yml

@@ -0,0 +1,10 @@
+name: Crop
+description: Used in media editing for croping an image.
+keywords:
+  - crop
+authors:
+  - David Goligorsky
+  - Joe Thomas
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/icons/FlipHorizontalIcon.yml

@@ -0,0 +1,11 @@
+name: Flip horizontal
+description: Used in media editing for flipping an image horizontally.
+keywords:
+  - flip
+  - mirror
+  - horizontal
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/icons/FlipVerticalIcon.yml

@@ -0,0 +1,11 @@
+name: Flip vertical
+description: Used in media editing for flipping an image vertically.
+keywords:
+  - flip
+  - mirror
+  - vertical
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/icons/ImageMagicIcon.yml

@@ -0,0 +1,11 @@
+name: Image Magic
+description: Used for signifying Magic media editing, like background removal and image generation.
+keywords:
+  - Magic
+  - Generation
+  - Media
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/icons/RemoveBackgroundIcon.yml

@@ -0,0 +1,12 @@
+name: Remove background
+description: Used to signify the background removal feature in Magic media editing.
+keywords:
+  - Magic
+  - Background
+  - Removal
+  - Media
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-04-03
+date_modified: 2024-04-03

polaris-icons/icons/RotateLeftIcon.yml

@@ -0,0 +1,11 @@
+name: Rotate left
+description: Used in media editing for rotating an image counterclockwise.
+keywords:
+  - Rotate
+  - Left
+  - Counterclockwise
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/icons/RotateRightIcon.yml

@@ -0,0 +1,11 @@
+name: Rotate right
+description: Used in media editing for rotating an image clockwise.
+keywords:
+  - Rotate
+  - Right
+  - Clockwise
+authors:
+  - David Goligorsky
+  - Arda Karaçizmeli
+date_added: 2024-03-28
+date_modified: 2024-03-28

polaris-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-icons",
-  "version": "8.9.0",
+  "version": "8.11.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify Inc.",
   "main": "dist/index.js",
@@ -63,5 +63,13 @@
     "js-yaml": "^4.0.0",
     "rehype-parse": "^7.0.1",
     "unified": "^9.2.1"
+  },
+  "peerDependencies": {
+    "react": "*"
+  },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    }
   }
 }

polaris-migrator/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @shopify/polaris-migrator
 
+## 0.28.6
+
+### Patch Changes
+
+- [#11813](https://github.com/Shopify/polaris/pull/11813) [`c49809998`](https://github.com/Shopify/polaris/commit/c498099988dbc37490a3ccde92fda48151b00993) Thanks [@lgriffee](https://github.com/lgriffee)! - Removed `Text` `heading2xl` and associated tokens from v14 font migration
+
+## 0.28.5
+
+### Patch Changes
+
+- Updated dependencies [[`f6308995e`](https://github.com/Shopify/polaris/commit/f6308995e3ef8b5f8f017471d23a08577243b323)]:
+  - @shopify/polaris-tokens@8.10.0
+  - @shopify/stylelint-polaris@15.5.1
+
 ## 0.28.4
 
 ### Patch Changes

polaris-migrator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-migrator",
-  "version": "0.28.4",
+  "version": "0.28.6",
   "description": "Codemod transformations to help upgrade your Polaris codebase",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <[email protected]>",
@@ -36,8 +36,8 @@
     "generate": "plop"
   },
   "dependencies": {
-    "@shopify/polaris-tokens": "^8.9.0",
-    "@shopify/stylelint-polaris": "^15.5.0",
+    "@shopify/polaris-tokens": "^8.10.0",
+    "@shopify/stylelint-polaris": "^15.5.1",
     "chalk": "^4.1.0",
     "globby": "11.0.1",
     "is-git-clean": "^1.1.0",
@@ -55,7 +55,7 @@
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "@shopify/polaris": "^12.24.0",
+    "@shopify/polaris": "^12.26.1",
     "plop": "^3.1.1",
     "plop-dir": "^0.0.5",
     "prettier": "^2.7.1",

polaris-migrator/src/migrations/v14-styles-replace-custom-property-font/tests/v14-styles-replace-custom-property-font.input.scss

@@ -1,20 +1,7 @@
 .font {
-  font-size: var(--p-font-size-750);
   font-size: var(--p-font-size-800);
   font-size: var(--p-font-size-900);
   font-size: var(--p-font-size-1000);
-  font-size: var(--p-text-heading-2xl-font-size);
-  font-size: var(--p-text-heading-3xl-font-size);
-  letter-spacing: var(--p-font-letter-spacing-denser);
   letter-spacing: var(--p-font-letter-spacing-densest);
-  letter-spacing: var(--p-text-heading-2xl-font-letter-spacing);
-  letter-spacing: var(--p-text-heading-3xl-font-letter-spacing);
-  line-height: var(--p-font-line-height-1000);
   line-height: var(--p-font-line-height-1200);
-  line-height: var(--p-text-heading-2xl-font-line-height);
-  line-height: var(--p-text-heading-3xl-font-line-height);
-  font-family: var(--p-text-heading-2xl-font-family);
-  font-family: var(--p-text-heading-3xl-font-family);
-  font-weight: var(--p-text-heading-2xl-font-weight);
-  font-weight: var(--p-text-heading-3xl-font-weight);
 }

polaris-migrator/src/migrations/v14-styles-replace-custom-property-font/tests/v14-styles-replace-custom-property-font.output.scss

@@ -1,20 +1,7 @@
 .font {
-  font-size: var(--p-font-size-600);
-  font-size: var(--p-font-size-600);
-  font-size: var(--p-font-size-600);
-  font-size: var(--p-font-size-600);
-  font-size: var(--p-text-heading-xl-font-size);
-  font-size: var(--p-text-heading-xl-font-size);
-  letter-spacing: var(--p-font-letter-spacing-dense);
-  letter-spacing: var(--p-font-letter-spacing-dense);
-  letter-spacing: var(--p-text-heading-xl-font-letter-spacing);
-  letter-spacing: var(--p-text-heading-xl-font-letter-spacing);
-  line-height: var(--p-font-line-height-800);
-  line-height: var(--p-font-line-height-800);
-  line-height: var(--p-text-heading-xl-font-line-height);
-  line-height: var(--p-text-heading-xl-font-line-height);
-  font-family: var(--p-text-heading-xl-font-family);
-  font-family: var(--p-text-heading-xl-font-family);
-  font-weight: var(--p-text-heading-xl-font-weight);
-  font-weight: var(--p-text-heading-xl-font-weight);
+  font-size: var(--p-font-size-750);
+  font-size: var(--p-font-size-750);
+  font-size: var(--p-font-size-750);
+  letter-spacing: var(--p-font-letter-spacing-denser);
+  line-height: var(--p-font-line-height-1000);
 }

polaris-migrator/src/migrations/v14-styles-replace-custom-property-font/transform.ts

@@ -8,27 +8,10 @@ export default function transformer(fileInfo: FileInfo, _: API) {
 
 const replacementMaps = {
   '/.+/': {
-    '--p-font-size-750': '--p-font-size-600',
-    '--p-font-size-800': '--p-font-size-600',
-    '--p-font-size-900': '--p-font-size-600',
-    '--p-font-size-1000': '--p-font-size-600',
-    '--p-font-letter-spacing-denser': '--p-font-letter-spacing-dense',
-    '--p-font-letter-spacing-densest': '--p-font-letter-spacing-dense',
-    '--p-font-line-height-1000': '--p-font-line-height-800',
-    '--p-font-line-height-1200': '--p-font-line-height-800',
-    '--p-text-heading-3xl-font-family': '--p-text-heading-xl-font-family',
-    '--p-text-heading-3xl-font-size': '--p-text-heading-xl-font-size',
-    '--p-text-heading-3xl-font-weight': '--p-text-heading-xl-font-weight',
-    '--p-text-heading-3xl-font-letter-spacing':
-      '--p-text-heading-xl-font-letter-spacing',
-    '--p-text-heading-3xl-font-line-height':
-      '--p-text-heading-xl-font-line-height',
-    '--p-text-heading-2xl-font-family': '--p-text-heading-xl-font-family',
-    '--p-text-heading-2xl-font-size': '--p-text-heading-xl-font-size',
-    '--p-text-heading-2xl-font-weight': '--p-text-heading-xl-font-weight',
-    '--p-text-heading-2xl-font-letter-spacing':
-      '--p-text-heading-xl-font-letter-spacing',
-    '--p-text-heading-2xl-font-line-height':
-      '--p-text-heading-xl-font-line-height',
+    '--p-font-size-800': '--p-font-size-750',
+    '--p-font-size-900': '--p-font-size-750',
+    '--p-font-size-1000': '--p-font-size-750',
+    '--p-font-letter-spacing-densest': '--p-font-letter-spacing-denser',
+    '--p-font-line-height-1200': '--p-font-line-height-1000',
   },
 };

polaris-migrator/src/migrations/v14-styles-replace-custom-property-text/tests/transform.test.ts

@@ -0,0 +1,12 @@
+import {check} from '../../../utilities/check';
+
+const transform = 'v14-styles-replace-custom-property-text';
+const fixtures = ['v14-styles-replace-custom-property-text'];
+
+for (const fixture of fixtures) {
+  check(__dirname, {
+    fixture,
+    transform,
+    extension: 'scss',
+  });
+}