🔨 Cleans up the storyshots implementation

skellock · skellock · commit 3f45f0327db9 · 2017-11-12T09:39:07.000-05:00
diff --git a/.storybook/config.js b/.storybook/config.js
@@ -1,4 +1,3 @@
-// switched to commonjs, but this should work fine with ts too
 const { configure } = require('@storybook/react')
 
 const req = require.context('../src', true, /story\.tsx?$/)
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -11,10 +11,6 @@ module.exports = (config, env) => {
     include: path.resolve(__dirname, '..', 'src'),
   })
   
-  // i tried adding url-loader and file-loader
-  // but that only seems to break storybooks
-  // rather than fix storyshots
-
   myConfig.resolve.extensions.unshift('.tsx')
   myConfig.resolve.extensions.unshift('.ts')
 
diff --git a/package.json b/package.json
@@ -95,23 +95,20 @@
     "coveralls": "^3.0.0",
     "electron": "^1.7.9",
     "electron-builder": "^19.45.4",
-    "file-loader": "^1.1.5",
     "fuse-box": "^2.4.0",
     "husky": "^0.14.3",
     "jest": "^21.2.1",
     "jest-expect-contain-deep": "^1.0.1",
     "lint-staged": "^5.0.0",
     "npm-run-all": "^4.1.2",
     "prettier": "^1.8.2",
-    "raf": "^3.4.0",
     "react-powerplug": "^0.1.2",
     "react-test-renderer": "^16.0.0",
     "ts-jest": "^21.2.1",
     "ts-loader": "^3.1.1",
     "ts-node": "^3.3.0",
     "tslint": "^5.8.0",
-    "typescript": "~2.6.1",
-    "url-loader": "^0.6.2"
+    "typescript": "~2.6.1"
   },
   "jest": {
     "setupFiles": [
diff --git a/test/__snapshots__/storyshots.test.ts.snap b/test/__snapshots__/storyshots.test.ts.snap
diff --git a/test/mock-request-animation-frame.ts b/test/mock-request-animation-frame.ts
@@ -0,0 +1,8 @@
+/**
+ * Poor man's polyfill for raf.
+ */
+
+// @ts-ignore
+global.window = global
+window.addEventListener = () => {}
+window.requestAnimationFrame = () => 1
diff --git a/test/setup.ts b/test/setup.ts
@@ -1,4 +1,4 @@
-// import 'raf/polyfill'
+import './mock-request-animation-frame'
 
 jest.mock('electron-window-state-manager', () => {
   return jest.fn().mockImplementation(() => ({
diff --git a/test/storyshots.test.js b/test/storyshots.test.js
diff --git a/test/storyshots.test.ts b/test/storyshots.test.ts
@@ -0,0 +1,3 @@
+import initStoryshots from '@storybook/addon-storyshots'
+
+initStoryshots()
diff --git a/yarn.lock b/yarn.lock
@@ -6033,12 +6033,6 @@ radium@^0.19.0:
     inline-style-prefixer "^2.0.5"
     prop-types "^15.5.8"
 
-raf@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
-  dependencies:
-    performance-now "^2.1.0"
-
 ramda@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// switched to commonjs, but this should work fine with ts too`
`2`	`1`	`const { configure } = require('@storybook/react')`
`3`	`2`
`4`	`3`	`const req = require.context('../src', true, /story\.tsx?$/)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// import 'raf/polyfill'`
	`1`	`+import './mock-request-animation-frame'`
`2`	`2`
`3`	`3`	`jest.mock('electron-window-state-manager', () => {`
`4`	`4`	`return jest.fn().mockImplementation(() => ({`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import initStoryshots from '@storybook/addon-storyshots'`
	`2`	`+`
	`3`	`+initStoryshots()`