Skip to content

Commit da2ac07

Browse files
SaerisSaeris
committed
Merge master into new-profiles
2 parents fca54d7 + 2548a06 commit da2ac07

File tree

272 files changed

+8994
-3044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+8994
-3044
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,15 @@
15031503
"contributions": [
15041504
"doc"
15051505
]
1506+
},
1507+
{
1508+
"login": "soorajshankar",
1509+
"name": "soorajshankar",
1510+
"avatar_url": "https://avatars2.githubusercontent.com/u/8408875?v=4",
1511+
"profile": "https://github.com/soorajshankar",
1512+
"contributions": [
1513+
"code"
1514+
]
15061515
}
15071516
],
15081517
"contributorsPerLine": 7,

‎.circleci/config.yml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ aliases:
1313
paths:
1414
- packages/codesandbox-api/dist
1515
- packages/common/lib
16+
- packages/components/lib
1617
- packages/deps/dist
1718
- packages/executors/dist
1819
- packages/node-services/lib
@@ -25,17 +26,18 @@ aliases:
2526

2627
- &restore_deps_cache
2728
keys:
28-
- v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
29-
- v30-dependency-cache-{{ .Branch }}
30-
- v30-dependency-cache
29+
- v31-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
30+
- v31-dependency-cache-{{ .Branch }}
31+
- v31-dependency-cache
3132

3233
- &save_deps_cache
33-
key: v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
34+
key: v31-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
3435
paths:
3536
- node_modules
3637
- packages/app/node_modules
3738
- packages/chrome-extension/node_modules
3839
- packages/codesandbox-api/node_modules
40+
- packages/components/node_modules
3941
- packages/common/node_modules
4042
- packages/dynamic-pages/node_modules
4143
- packages/deps/node_modules
@@ -49,51 +51,51 @@ aliases:
4951

5052
- &restore_standalone_deps_cache
5153
keys:
52-
- v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
54+
- v31-standalone-dependency-cache-{{ .Branch }}-{{ checksum
5355
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
54-
- v30-standalone-dependency-cache-{{ .Branch }}
55-
- v30-standalone-dependency-cache
56+
- v31-standalone-dependency-cache-{{ .Branch }}
57+
- v31-standalone-dependency-cache
5658

5759
- &save_standalone_deps_cache
5860
key:
59-
v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
61+
v31-standalone-dependency-cache-{{ .Branch }}-{{ checksum
6062
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
6163
paths:
6264
- standalone-packages/codesandbox-browserfs/node_modules
6365

6466
- &restore_prod_homepage_cache
65-
key: v30-prod-homepage-build-cache-master
67+
key: v31-prod-homepage-build-cache-master
6668

6769
- &restore_prod_result
6870
key:
69-
v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH
71+
v31-prod-build-result-{{ .Environment.CIRCLE_BRANCH
7072
}}-{{.Environment.CIRCLE_SHA1 }}
7173

7274
- &save_prod_build_cache
7375
key:
74-
v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
76+
v31-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
7577
}}-{{.Environment.CIRCLE_SHA1 }}
7678
paths:
7779
- packages/app/node_modules/.cache
7880

7981
- &restore_prod_build_cache
8082
keys:
81-
- v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
83+
- v31-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
8284
}}-{{.Environment.CIRCLE_SHA1 }}
83-
- v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
84-
- v30-prod-build-cache-master-
85+
- v31-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
86+
- v31-prod-build-cache-master-
8587

8688
# To persist the images built by sharp
8789
- &save_prod_homepage_cache
8890
key:
89-
v30-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
91+
v31-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
9092
.Environment.CIRCLE_SHA1 }}
9193
paths:
9294
- ./packages/homepage/public
9395

9496
- &save_prod_result
9597
key:
96-
v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
98+
v31-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
9799
.Environment.CIRCLE_SHA1 }}
98100
paths:
99101
- ./www
@@ -134,14 +136,14 @@ commands:
134136
steps:
135137
- restore_cache:
136138
keys:
137-
- v30-source-cache-{{ .Branch }}-{{ .Revision }}
138-
- v30-source-cache-{{ .Branch }}-
139-
- v30-source-cache-
139+
- v31-source-cache-{{ .Branch }}-{{ .Revision }}
140+
- v31-source-cache-{{ .Branch }}-
141+
- v31-source-cache-
140142

141143
- checkout
142144

143145
- save_cache:
144-
key: v30-source-cache-{{ .Branch }}-{{ .Revision }}
146+
key: v31-source-cache-{{ .Branch }}-{{ .Revision }}
145147
paths:
146148
- '.git'
147149
build_deps:
@@ -194,6 +196,8 @@ commands:
194196
./packages/app/integration-tests/BrowserStackLocal --key
195197
$BROWSER_STACK_KEY || true'
196198
background: true
199+
- run:
200+
command: yarn chromatic
197201
- run:
198202
name: Test Integrations
199203
command: |

‎.imgbotconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ignoredFiles": [
3+
"**/__image_snapshots__/**"
4+
]
5+
}

0 commit comments

Comments
 (0)