Skip to content

Commit d128af1

Browse files
Merge pull request #33 from jaredpetersen/fix-dependencies-and-copy
Fix dependencies and copy
2 parents f70363c + e6a4740 commit d128af1

38 files changed

+4244
-1446
lines changed

β€Ž.storybook/config.jsβ€Ž

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { configure } from '@storybook/react';
22

33
function loadStories() {
4-
require('../src/common/dropdown-toggle-select/index.story.js');
5-
require('../src/navbar/index.story.js');
6-
require('../src/editor/index.story.js');
7-
require('../src/editor/toolbar/index.story.js');
8-
require('../src/editor/toolbar/font-dropdown/index.story.js');
9-
require('../src/editor/toolbar/size-dropdown/index.story.js');
10-
require('../src/editor/toolbar/theme-dropdown/index.story.js');
11-
require('../src/editor/document/index.story.js');
12-
require('../src/heart/index.story.js');
13-
require('../src/not-found/index.story.js');
4+
require('../src/common/dropdown-toggle-select/index.story.jsx');
5+
require('../src/navbar/index.story.jsx');
6+
require('../src/editor/index.story.jsx');
7+
require('../src/editor/toolbar/index.story.jsx');
8+
require('../src/editor/toolbar/font-dropdown/index.story.jsx');
9+
require('../src/editor/toolbar/size-dropdown/index.story.jsx');
10+
require('../src/editor/toolbar/theme-dropdown/index.story.jsx');
11+
require('../src/editor/document/index.story.jsx');
12+
require('../src/heart/index.story.jsx');
13+
require('../src/not-found/index.story.jsx');
1414
}
1515

1616
configure(loadStories, module);

β€Žpackage-lock.jsonβ€Ž

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

β€Žpackage.jsonβ€Ž

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeprinter",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"private": true,
55
"homepage": "http://jaredpetersen.github.io/codeprinter",
66
"engines": {
@@ -20,7 +20,7 @@
2020
"collectCoverageFrom": [
2121
"src/**/*.{js,jsx}",
2222
"!<rootDir>/node_modules/",
23-
"!src/index.js",
23+
"!src/index.jsx",
2424
"!src/registerServiceWorker.js",
2525
"!setupTests.js",
2626
"!src/**/*.story.{js,jsx}"
@@ -44,26 +44,26 @@
4444
]
4545
},
4646
"dependencies": {
47-
"bootstrap": "^4.1.3",
48-
"enzyme": "^3.7.0",
49-
"enzyme-adapter-react-16": "^1.7.0",
47+
"bootstrap": "^4.2.1",
5048
"prop-types": "^15.6.2",
51-
"react": "^16.6.3",
52-
"react-dom": "^16.6.3",
49+
"react": "^16.7.0",
50+
"react-dom": "^16.7.0",
5351
"react-router-dom": "^4.3.1",
54-
"react-scripts": "2.1.1",
55-
"react-syntax-highlighter": "^10.1.1",
56-
"reactstrap": "^6.5.0"
52+
"react-scripts": "2.1.3",
53+
"react-syntax-highlighter": "^10.1.2",
54+
"reactstrap": "^7.1.0"
5755
},
5856
"devDependencies": {
59-
"@storybook/addon-actions": "^4.0.12",
60-
"@storybook/addon-links": "^4.0.12",
61-
"@storybook/addons": "^4.0.12",
62-
"@storybook/react": "^4.0.12",
57+
"@storybook/addon-actions": "^4.1.7",
58+
"@storybook/addon-links": "^4.1.7",
59+
"@storybook/addons": "^4.1.7",
60+
"@storybook/react": "^4.1.7",
61+
"enzyme": "^3.8.0",
62+
"enzyme-adapter-react-16": "^1.7.1",
6363
"gh-pages": "^2.0.1",
64-
"husky": "^1.2.0",
64+
"husky": "^1.3.1",
6565
"lint-staged": "^8.1.0",
66-
"prettier": "1.15.3"
66+
"prettier": "1.16.1"
6767
},
6868
"browserslist": [
6969
">0.2%",
File renamed without changes.
File renamed without changes.

β€Žsrc/common/dropdown-toggle-select/index.story.jsβ€Ž renamed to β€Žsrc/common/dropdown-toggle-select/index.story.jsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { storiesOf } from '@storybook/react';
33
import { action } from '@storybook/addon-actions';
44
import 'bootstrap/dist/css/bootstrap.css';
55
import { UncontrolledDropdown, DropdownMenu, DropdownItem } from 'reactstrap';
6-
import DropdownToggleSelect from './index.js';
6+
import DropdownToggleSelect from './index.jsx';
77

88
storiesOf('Common/DropdownToggleSelect', module).add('default', () => (
99
<UncontrolledDropdown inNavbar>

β€Žsrc/common/dropdown-toggle-select/index.test.jsβ€Ž renamed to β€Žsrc/common/dropdown-toggle-select/index.test.jsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { shallow } from 'enzyme';
3-
import DropdownToggleSelect from './index.js';
3+
import DropdownToggleSelect from './index.jsx';
44

55
describe('Common DropdownToggleSelect', () => {
66
it('renders without crashing', () => {

β€Žsrc/editor/document/index.jsβ€Ž renamed to β€Žsrc/editor/document/index.jsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
tomorrow,
1414
vs,
1515
xcode
16-
} from 'react-syntax-highlighter/styles/hljs';
16+
} from 'react-syntax-highlighter/dist/styles/hljs';
1717
import './index.css';
1818

1919
const themeMap = {

0 commit comments

Comments
Β (0)