Merge branch 'main' into v11-major

Author: laurkim

.changeset/popular-geckos-tease.md

@@ -1,5 +1,12 @@
 # @shopify/polaris-cli
 
+## 0.1.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @shopify/polaris-migrator@0.15.1
+
 ## 0.1.15
 
 ## 0.1.14

.changeset/real-turkeys-poke.md

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-cli",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Commands for building Shopify Apps with Polaris",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Shopify <[email protected]>",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@oclif/core": "^1.13.10",
-    "@shopify/polaris-migrator": "^0.15.0"
+    "@shopify/polaris-migrator": "^0.15.1"
   },
   "engine-strict": true,
   "engines": {

.changeset/smart-icons-add.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.4.0
+
+### Minor Changes
+
+- [#8572](https://github.com/Shopify/polaris/pull/8572) [`7d1c4f1db`](https://github.com/Shopify/polaris/commit/7d1c4f1db629ad9cfc68f65bd5f704127d10136e) Thanks [@lgriffee](https://github.com/lgriffee)! - Added completions for new `shadow` token group
+
 ## 0.3.0
 
 ### Minor Changes

polaris-cli/CHANGELOG.md

@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/Shopify/polaris/issues"
   },
-  "version": "0.3.0",
+  "version": "0.4.0",
   "private": true,
   "keywords": [
     "polaris",
@@ -43,7 +43,7 @@
     "vscode-languageserver-textdocument": "^1.0.4"
   },
   "devDependencies": {
-    "@shopify/polaris-tokens": "^6.7.0",
+    "@shopify/polaris-tokens": "^6.8.0",
     "@types/vscode": "^1.64.0",
     "@vscode/test-electron": "^2.1.2",
     "globby": "^11.1.0",

polaris-cli/package.json

@@ -70,12 +70,13 @@ const groupedCompletionItemPatterns: GroupedCompletionItemPatterns = {
     /color|background|shadow|border|column-rule|filter|opacity|outline|text-decoration/,
   colors:
     /color|background|shadow|border|column-rule|filter|opacity|outline|text-decoration/,
-  spacing: /margin|padding|gap|top|left|right|bottom/,
-  font: /font|line-height/,
-  zIndex: /z-index/,
-  shape: /border/,
   depth: /shadow/,
+  font: /font|line-height/,
   motion: /animation/,
+  shadow: /shadow/,
+  shape: /border/,
+  spacing: /margin|padding|gap|top|left|right|bottom/,
+  zIndex: /z-index/,
 };
 
 connection.onInitialize((params: InitializeParams) => {

polaris-for-vscode/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @shopify/polaris-migrator
 
+## 0.15.1
+
+### Patch Changes
+
+- Updated dependencies [[`7d1c4f1db`](https://github.com/Shopify/polaris/commit/7d1c4f1db629ad9cfc68f65bd5f704127d10136e)]:
+  - @shopify/polaris-tokens@6.8.0
+  - @shopify/stylelint-polaris@8.0.2
+
 ## 0.15.0
 
 ### Minor Changes

polaris-for-vscode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/polaris-migrator",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "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": "^6.7.0",
-    "@shopify/stylelint-polaris": "^8.0.1",
+    "@shopify/polaris-tokens": "^6.8.0",
+    "@shopify/stylelint-polaris": "^8.0.2",
     "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.34.0",
+    "@shopify/polaris": "^10.35.0",
     "plop": "^3.1.1",
     "plop-dir": "^0.0.5",
     "prettier": "^2.7.1",