fix: broken build and lint

shisama · shisama · commit 1493c212e567 · 2020-01-05T23:57:13.000+09:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+test
+src/demo
diff --git a/demo/slideshow.js b/demo/slideshow.js
diff --git a/demo/vendor.dll.js b/demo/vendor.dll.js
diff --git a/dll/vendor-manifest.json b/dll/vendor-manifest.json
@@ -1 +1 @@
-{"name":"vendor","content":{"./node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"./node_modules/object-assign/index.js":{"id":1,"buildMeta":{"providedExports":true}},"./node_modules/webpack/buildin/global.js":{"id":2,"buildMeta":{"providedExports":true}},"./node_modules/react/cjs/react.production.min.js":{"id":4,"buildMeta":{"providedExports":true}},"./node_modules/toggle-fullscreen/lib/index.js":{"id":5,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/auto.js":{"id":6,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/dist/es6-promise.js":{"id":7,"buildMeta":{"providedExports":true}},"./node_modules/node-libs-browser/node_modules/process/browser.js":{"id":8,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/index.js":{"id":9,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/cjs/react-dom.production.min.js":{"id":10,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/index.js":{"id":11,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/cjs/scheduler.production.min.js":{"id":12,"buildMeta":{"providedExports":true}}}}
+{"name":"vendor","content":{"./node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"./node_modules/object-assign/index.js":{"id":1,"buildMeta":{"providedExports":true}},"./node_modules/webpack/buildin/global.js":{"id":2,"buildMeta":{"providedExports":true}},"./node_modules/react/cjs/react.production.min.js":{"id":4,"buildMeta":{"providedExports":true}},"./node_modules/toggle-fullscreen/lib/index.js":{"id":5,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/auto.js":{"id":6,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/dist/es6-promise.js":{"id":7,"buildMeta":{"providedExports":true}},"./node_modules/process/browser.js":{"id":8,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/index.js":{"id":9,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/cjs/react-dom.production.min.js":{"id":10,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/index.js":{"id":11,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/cjs/scheduler.production.min.js":{"id":12,"buildMeta":{"providedExports":true}}}}
diff --git a/lib/SlideShow.js b/lib/SlideShow.js
@@ -119,7 +119,7 @@ class SlideShow extends React.Component {
         }
         if (props.style) {
             for (const key in props.style) {
-                if (props.style.hasOwnProperty(key)) {
+                if (Object.prototype.hasOwnProperty.call(props.style, key)) {
                     styles_1.default.ROOT[key] = props.style[key];
                 }
             }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,8 +51,10 @@
     "@types/jest": "24.0.25",
     "@types/react": "16.9.17",
     "@types/react-dom": "16.9.4",
+    "@types/react-test-renderer": "^16.9.1",
     "@types/sinon": "7.0.13",
     "@typescript-eslint/eslint-plugin": "2.14.0",
+    "@typescript-eslint/parser": "^2.14.0",
     "browser-env": "3.2.6",
     "cache-loader": "4.1.0",
     "enzyme": "3.10.0",
diff --git a/src/SlideShow.tsx b/src/SlideShow.tsx
@@ -41,7 +41,7 @@ export default class SlideShow extends React.Component<Props, State> {
 
     if (props.style) {
       for (const key in props.style) {
-        if (props.style.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(props.style, key)) {
           styles.ROOT[key] = props.style[key];
         }
       }
diff --git a/src/arrayutils.ts b/src/arrayutils.ts
@@ -1,4 +1,4 @@
-const isEmptyArray = (arr: string[]): boolean => {
+const isEmptyArray = (arr?: string[] | null): boolean => {
   return arr === undefined || arr === null || arr.length === 0;
 };
 
diff --git a/test/ProgressBar.test.tsx b/test/ProgressBar.test.tsx
@@ -26,12 +26,17 @@ describe("ProgressBar", () => {
         }}
       />
     );
-    expect(
-      wrapper
-        .find("div")
-        .at(1)
-        .props().style.width
-    ).toBe(progress + "%");
+    const props = wrapper
+      .find("div")
+      .at(1)
+      .props();
+    if (!props) {
+      throw Error();
+    }
+    if (!props.style) {
+      throw Error();
+    }
+    expect(props.style.width).toBe(progress + "%");
   });
 
   test("click event", () => {
diff --git a/test/Viewer.test.tsx b/test/Viewer.test.tsx
@@ -13,6 +13,7 @@ const _imgClassName = "testImage";
 
 describe("Viewer", () => {
   test("props src", () => {
+    const timestamp = Math.floor(Date.now() / 1000);
     const wrapper = mount(
       <Viewer
         src={_src}
@@ -23,11 +24,11 @@ describe("Viewer", () => {
         onClickNextButton={() => {
           return;
         }}
-        timestamp={null}
+        timestamp={timestamp}
         imgClassName="test"
       />
     );
-    expect(wrapper.find("img").props().src).toBe(_src);
+    expect(wrapper.find("img").props().src).toBe(`${_src}?${timestamp}`);
   });
 
   test("props src & timestamp", () => {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"name":"vendor","content":{"./node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"./node_modules/object-assign/index.js":{"id":1,"buildMeta":{"providedExports":true}},"./node_modules/webpack/buildin/global.js":{"id":2,"buildMeta":{"providedExports":true}},"./node_modules/react/cjs/react.production.min.js":{"id":4,"buildMeta":{"providedExports":true}},"./node_modules/toggle-fullscreen/lib/index.js":{"id":5,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/auto.js":{"id":6,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/dist/es6-promise.js":{"id":7,"buildMeta":{"providedExports":true}},"./node_modules/node-libs-browser/node_modules/process/browser.js":{"id":8,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/index.js":{"id":9,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/cjs/react-dom.production.min.js":{"id":10,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/index.js":{"id":11,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/cjs/scheduler.production.min.js":{"id":12,"buildMeta":{"providedExports":true}}}}
	`1`	+{"name":"vendor","content":{"./node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"./node_modules/object-assign/index.js":{"id":1,"buildMeta":{"providedExports":true}},"./node_modules/webpack/buildin/global.js":{"id":2,"buildMeta":{"providedExports":true}},"./node_modules/react/cjs/react.production.min.js":{"id":4,"buildMeta":{"providedExports":true}},"./node_modules/toggle-fullscreen/lib/index.js":{"id":5,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/auto.js":{"id":6,"buildMeta":{"providedExports":true}},"./node_modules/es6-promise/dist/es6-promise.js":{"id":7,"buildMeta":{"providedExports":true}},"./node_modules/process/browser.js":{"id":8,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/index.js":{"id":9,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/cjs/react-dom.production.min.js":{"id":10,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/index.js":{"id":11,"buildMeta":{"providedExports":true}},"./node_modules/react-dom/node_modules/scheduler/cjs/scheduler.production.min.js":{"id":12,"buildMeta":{"providedExports":true}}}}
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class SlideShow extends React.Component {`
`119`	`119`	`}`
`120`	`120`	`if (props.style) {`
`121`	`121`	`for (const key in props.style) {`
`122`		`- if (props.style.hasOwnProperty(key)) {`
	`122`	`+ if (Object.prototype.hasOwnProperty.call(props.style, key)) {`
`123`	`123`	`styles_1.default.ROOT[key] = props.style[key];`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export default class SlideShow extends React.Component<Props, State> {`
`41`	`41`
`42`	`42`	`if (props.style) {`
`43`	`43`	`for (const key in props.style) {`
`44`		`- if (props.style.hasOwnProperty(key)) {`
	`44`	`+ if (Object.prototype.hasOwnProperty.call(props.style, key)) {`
`45`	`45`	`styles.ROOT[key] = props.style[key];`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const isEmptyArray = (arr: string[]): boolean => {`
	`1`	`+const isEmptyArray = (arr?: string[] \| null): boolean => {`
`2`	`2`	`return arr === undefined \|\| arr === null \|\| arr.length === 0;`
`3`	`3`	`};`
`4`	`4`