Merge branch 'main' into v11-major

Author: alex-page

package.json

@@ -26,7 +26,7 @@
     ]
   },
   "scripts": {
-    "build": "turbo run build",
+    "build": "turbo run build --filter=!polaris.shopify.com && turbo run build --filter=polaris.shopify.com",
     "dev": "turbo run dev --filter=@shopify/polaris... --parallel",
     "lint": "turbo run lint",
     "test": "turbo run test",
@@ -89,7 +89,7 @@
     {
       "name": "polaris-react-cjs",
       "path": "polaris-react/build/cjs/index.js",
-      "limit": "220 kB"
+      "limit": "225 kB"
     },
     {
       "name": "polaris-react-esm",

polaris-cli/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @shopify/plugin-polaris
 
+## 0.0.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @shopify/polaris-migrator@0.11.2
+
+## 0.0.30
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @shopify/polaris-migrator@0.11.1
+
+## 0.0.29
+
+## 0.0.28
+
+## 0.0.27
+
+### Patch Changes
+
+- Updated dependencies [[`64d57de02`](https://github.com/Shopify/polaris/commit/64d57de0277ff39fd54746f48d11b9841e62e32b)]:
+  - @shopify/polaris-migrator@0.11.0
+
+## 0.0.26
+
+### Patch Changes
+
+- Updated dependencies [[`fad3809ef`](https://github.com/Shopify/polaris/commit/fad3809ef39054b125c661f9b1bf6397b2b89fd0), [`56b0bc2dc`](https://github.com/Shopify/polaris/commit/56b0bc2dc414a085e935c3975a74410e7df530f1)]:
+  - @shopify/polaris-migrator@0.10.3
+
+## 0.0.25
+
 ## 0.0.24
 
 ## 0.0.23

polaris-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/plugin-polaris",
-  "version": "0.0.24",
+  "version": "0.0.31",
   "description": "Commands for building Shopify Apps with Polaris",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <dev@shopify.com>",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@oclif/core": "^1.13.10",
-    "@shopify/polaris-migrator": "^0.10.2"
+    "@shopify/polaris-migrator": "^0.11.2"
   },
   "devDependencies": {
     "typescript": "^4.7.4"

polaris-for-vscode/README.md

@@ -1,26 +1,5 @@
 # Polaris for VS Code
 
-Official VS Code extension for building with the Shopify [Polaris Design System](https://polaris.shopify.com/).
+Official VS Code extension for building with the Shopify Polaris Design System
 
-![Demo of Polaris for VS Code tokens autocomplete](https://github.com/Shopify/polaris/blob/main/polaris-for-vscode/docs/polaris-for-vscode-preview.gif?raw=true)
-
-## Features
-
-### Design Token Autocomplete
-
-Get code autocomplete suggestions for the [Polaris Design Tokens](https://polaris.shopify.com/tokens/colors#navigation)
-
-- 🗄️ Automatically works for CSS and Sass files
-- 🔍 Preview design token values in autocomplete description
-- 🎨 Color previews for all `color` tokens
-- 🥇 Relevant code completions based on the current line of code
-
-## How to use
-
-Once installed and enabled, the Polaris for VS Code extension will automatically run in any CSS and Sass files.
-
-To trigger tokens autocomplete feature:
-
-1. Open a CSS or Sass file from your project
-2. Start typing the CSS property you want to set ex. `color: `
-3. Type the extension trigger characters `--`. This will bring up the relevant autocomplete tokens associated with the CSS property typed.
+[Polaris for VS Code documentation](https://polaris.shopify.com/tools/polaris-for-vscode)

polaris-icons/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## 6.10.0
+
+### Minor Changes
+
+- [#8150](https://github.com/Shopify/polaris/pull/8150) [`a0c6e467b`](https://github.com/Shopify/polaris/commit/a0c6e467b71be484e708d4c06d4172e3890b5a15) Thanks [@leileu](https://github.com/leileu)! - Adding two metaobject icons: Metaobject and Metaobject Reference.
+
+### Patch Changes
+
+- [#8148](https://github.com/Shopify/polaris/pull/8148) [`0ca0b7899`](https://github.com/Shopify/polaris/commit/0ca0b7899d480ca7bf87e7dfca24bc5721b0775c) Thanks [@zecarlostorre](https://github.com/zecarlostorre)! - Updated clipboard icon
+
+## 6.9.0
+
+### Minor Changes
+
+- [#8139](https://github.com/Shopify/polaris/pull/8139) [`b998ca007`](https://github.com/Shopify/polaris/commit/b998ca00736c5cf1a7772a1ee0acc9f3f4a2748e) Thanks [@leileu](https://github.com/leileu)! - Adding content minor icon for left nav in admin
+
+* [#8094](https://github.com/Shopify/polaris/pull/8094) [`94988bc26`](https://github.com/Shopify/polaris/commit/94988bc260b0c4f371a8c1f22a0a3fd5e11fee45) Thanks [@Tamas-Kisss](https://github.com/Tamas-Kisss)! - Added major and minor icon for Papercheck
+
+- [#8121](https://github.com/Shopify/polaris/pull/8121) [`f74e8ffcc`](https://github.com/Shopify/polaris/commit/f74e8ffcc4d0864212e53e28e7bb02f3b224ba33) Thanks [@zecarlostorre](https://github.com/zecarlostorre)! - Added EnterMajor icon
+
+## 6.8.0
+
+### Minor Changes
+
+- [#8049](https://github.com/Shopify/polaris/pull/8049) [`dca31f2a0`](https://github.com/Shopify/polaris/commit/dca31f2a00737c77a96d26da1535cad83e5af0b0) Thanks [@leileu](https://github.com/leileu)! - Added 8 minor icons for metafields
+
+* [#8069](https://github.com/Shopify/polaris/pull/8069) [`f67e2997e`](https://github.com/Shopify/polaris/commit/f67e2997ef6f5ea026ec076fe480bb7924620f34) Thanks [@leileu](https://github.com/leileu)! - Added file minor icon
+
+- [#8063](https://github.com/Shopify/polaris/pull/8063) [`d5da4778c`](https://github.com/Shopify/polaris/commit/d5da4778c73179b5f1606f3a8b029b9c4a3b818c) Thanks [@eric-blue](https://github.com/eric-blue)! - Added minor icon for diamond_alert
+
+* [#8037](https://github.com/Shopify/polaris/pull/8037) [`1aeed2414`](https://github.com/Shopify/polaris/commit/1aeed2414b8be48e7c3009663fbd407bd40aa3c9) Thanks [@dGoligorsky](https://github.com/dGoligorsky)! - Added major and minor icon for Magic
+
+### Patch Changes
+
+- [#8085](https://github.com/Shopify/polaris/pull/8085) [`56b757036`](https://github.com/Shopify/polaris/commit/56b75703622a8abc987cac8b87dcd7b53c16e508) Thanks [@sarahill](https://github.com/sarahill)! - Added icon name for magic major and minor
+
+* [#8066](https://github.com/Shopify/polaris/pull/8066) [`68acc4593`](https://github.com/Shopify/polaris/commit/68acc45939e64239be2d9d1a854db096e3620556) Thanks [@kyledurand](https://github.com/kyledurand)! - Added better error documentation on icon validation
+
 ## 6.7.0
 
 ### Minor Changes

polaris-icons/icons/CalendarTimeMinor.svg

@@ -0,0 +1,17 @@
+name: Calendar time
+set: minor
+description: Used to denote the action of opening a date picker with time
+keywords:
+  - calendar
+  - date
+  - time
+  - month
+  - year
+  - day
+authors:
+  - Sai Nihas
+  - Leina Leung
+date_added: 2023-01-12
+date_modified: 2023-01-12
+version: 1
+exclusive_use:

polaris-icons/icons/CalendarTimeMinor.yml

@@ -4,9 +4,11 @@ description: Used to represent a clipboard, usually accompanying a copy action.
 keywords:
   - clipboard
   - copy
+  - copy and paste
 authors:
   - Adam Whitcroft
-version: 1
+  - José Torre
+version: 2
 date_added: 2019-03-15
-date_modified: 2019-03-15
+date_modified: 2023-01-24
 exclusive_use: