Skip to content

Commit 9288c5e

Browse files
ganderzzganderzz
committed
Resolve merge conflict
2 parents 3fe4f05 + 2b5cc2f commit 9288c5e

26 files changed

+628
-203
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@ jobs:
1313
steps:
1414
- checkout
1515

16-
# Download and cache dependencies
17-
- restore_cache:
18-
keys:
19-
- v1-dependencies-{{ checksum "package.json" }}
20-
# fallback to using the latest cache if no exact match is found
21-
- v1-dependencies-
22-
23-
- run: yarn install
16+
- run: yarn
2417

2518
- save_cache:
2619
paths:
@@ -37,13 +30,7 @@ jobs:
3730
steps:
3831
- checkout
3932

40-
- restore_cache:
41-
keys:
42-
- v1-dependencies-{{ checksum "package.json" }}
43-
# fallback to using the latest cache if no exact match is found
44-
- v1-dependencies-
45-
46-
- run: yarn install
33+
- run: yarn
4734

4835
- run:
4936
name: Authenticate with registry

‎.npmignore‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
./src
2-
./node_modules
3-
./.circleci
4-
./.github
5-
./config
6-
./docs
7-
./stories
8-
./.storybook
1+
src/*
2+
node_modules/*
3+
.circleci/*
4+
.github/*
5+
config/*
6+
docs/*
7+
stories/*
8+
.storybook/*
99

1010
*.lock
1111
.gitignore

‎config/tsconfig.json‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
{
2-
"compilerOptions": {
3-
"module": "commonjs",
4-
"lib": [
5-
"es6",
6-
],
7-
"noImplicitAny": false,
8-
"noImplicitThis": false,
9-
"strictNullChecks": false,
10-
"strictFunctionTypes": true,
11-
"baseUrl": "../",
12-
"typeRoots": [
13-
"../"
14-
],
15-
"types": [ "react" ],
16-
"noEmit": true,
17-
"forceConsistentCasingInFileNames": true
18-
},
19-
"files": [
20-
"src/index.d.ts",
21-
]
22-
}
2+
"compilerOptions": {
3+
"module": "commonjs",
4+
"noImplicitAny": false,
5+
"noImplicitThis": false,
6+
"strictNullChecks": false,
7+
"strictFunctionTypes": true,
8+
"baseUrl": "../",
9+
"typeRoots": ["../"],
10+
"types": ["react"],
11+
"noEmit": true,
12+
"forceConsistentCasingInFileNames": true,
13+
"esModuleInterop": true,
14+
"jsxFactory": "createElement"
15+
},
16+
"files": ["src/index.d.ts"]
17+
}

‎docs/iframe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@
6464
box-shadow: 2px 5px 6px rgba(0, 0, 0, 0.4);
6565
}</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the storybook config.</li><li>Try reloading the page.</li></ul></div></div><div class="sb-errordisplay sb-wrapper"><div id="error-message" class="sb-heading"></div><pre class="sb-errordisplay_code">
6666
<code id="error-stack"></code>
67-
</pre></div><div id="root"></div><script src="static/runtime~iframe.36305751f78a2d599ec4.bundle.js"></script><script src="static/vendors~iframe.64825ef69626ef9c8f63.bundle.js"></script><script src="static/iframe.6cc71ada6d24d09cf9ad.bundle.js"></script></body></html>
67+
</pre></div><div id="root"></div><script src="static/runtime~iframe.36305751f78a2d599ec4.bundle.js"></script><script src="static/vendors~iframe.94b36a16be0c28a621bb.bundle.js"></script><script src="static/iframe.7a6ba081df3f0d028ac7.bundle.js"></script></body></html>

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}
1212
} catch (e) {
1313
console.warn('unable to connect to parent frame for connecting dev tools');
14-
}</script></head><body><div id="root"></div><script src="static/runtime~manager.9ffd8dd7b8642e4235e2.bundle.js"></script><script src="static/manager.08c9b945bba98c15a6a7.bundle.js"></script></body></html>
14+
}</script></head><body><div id="root"></div><script src="static/runtime~manager.9ffd8dd7b8642e4235e2.bundle.js"></script><script src="static/manager.29ab769f2d6d5d8dba28.bundle.js"></script></body></html>

‎docs/static/iframe.6cc71ada6d24d09cf9ad.bundle.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/static/iframe.6cc71ada6d24d09cf9ad.bundle.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/static/iframe.7a6ba081df3f0d028ac7.bundle.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)