[v2] Upgrade to v3

packages/gatsby-plugin-typescript/src/__tests__/gatsby-node.js

@@ -1,80 +1,100 @@
-jest.mock(`../resolve`, () => (
-  (module) => `/resolved/path/${module}`
-))
+jest.mock(`../resolve`, () => module => `/resolved/path/${module}`)
 
+const babelPluginRemoveQueries = require(`babel-plugin-remove-graphql-queries`)
 const {
   resolvableExtensions,
   modifyWebpackConfig,
   preprocessSource,
 } = require(`../gatsby-node`)
 
 describe(`gatsby-plugin-typescript`, () => {
-  it(`returns correct extensions`, () => {
-    expect(resolvableExtensions()).toMatchSnapshot()
-  })
+  let args
 
-  it(`modifies webpack config`, () => {
+  function getLoader() {
+    const call = args.boundActionCreators.setWebpackConfig.mock.calls[0]
+    return call[0].module.rules[0]
+  }
+
+  beforeEach(() => {
     const boundActionCreators = {
       setWebpackConfig: jest.fn(),
     }
-    const loaders = { js: () => `babel-loader` }
+    const loaders = { js: jest.fn(() => `babel-loader`) }
+    args = { boundActionCreators, loaders }
+  })
 
-    modifyWebpackConfig({ boundActionCreators, loaders }, { compilerOptions: {} })
+  it(`returns correct extensions`, () => {
+    expect(resolvableExtensions()).toMatchSnapshot()
+  })
+
+  it(`modifies webpack config`, () => {
+    modifyWebpackConfig(args, { compilerOptions: {} })
 
-    expect(boundActionCreators.setWebpackConfig).toHaveBeenCalledTimes(1)
-    const lastCall = boundActionCreators.setWebpackConfig.mock.calls.pop()
+    expect(args.boundActionCreators.setWebpackConfig).toHaveBeenCalledTimes(1)
+    const lastCall = args.boundActionCreators.setWebpackConfig.mock.calls.pop()
     expect(lastCall).toMatchSnapshot()
   })
 
+  it(`adds the remove graphql queries plugin`, () => {
+    modifyWebpackConfig(args, { compilerOptions: {} })
+
+    expect(args.loaders.js).toHaveBeenCalledTimes(1)
+    const lastCall = args.loaders.js.mock.calls.pop()
+
+    expect(lastCall[0]).toEqual({
+      plugins: [babelPluginRemoveQueries],
+    })
+  })
+
   it(`passes the configuration to the ts-loader plugin`, () => {
-    const config = {
-      loader: jest.fn(),
-    }
     const options = { compilerOptions: { foo: `bar` }, transpileOnly: false }
 
-    modifyWebpackConfig({ config }, options)
+    modifyWebpackConfig(args, options)
 
     const expectedOptions = {
       compilerOptions: {
         target: `esnext`,
         experimentalDecorators: true,
         jsx: `react`,
         foo: `bar`,
-        module: `commonjs`,
+        module: `es6`,
       },
       transpileOnly: false,
     }
 
-    expect(config.loader).toHaveBeenCalledWith(`typescript`, {
+    expect(getLoader()).toEqual({
       test: /\.tsx?$/,
-      loaders: [
-        `babel?${JSON.stringify({ plugins: [``] })}`,
-        `ts-loader?${JSON.stringify(expectedOptions)}`,
+      use: [
+        `babel-loader`,
+        {
+          loader: `/resolved/path/ts-loader`,
+          options: expectedOptions,
+        },
       ],
     })
   })
 
   it(`uses default configuration for the ts-loader plugin when no config is provided`, () => {
-    const config = {
-      loader: jest.fn(),
-    }
-    modifyWebpackConfig({ config }, { compilerOptions: {} })
+    modifyWebpackConfig(args, { compilerOptions: {} })
 
     const expectedOptions = {
       compilerOptions: {
         target: `esnext`,
         experimentalDecorators: true,
         jsx: `react`,
-        module: `commonjs`,
+        module: `es6`,
       },
       transpileOnly: true,
     }
 
-    expect(config.loader).toHaveBeenCalledWith(`typescript`, {
+    expect(getLoader()).toEqual({
       test: /\.tsx?$/,
-      loaders: [
-        `babel?${JSON.stringify({ plugins: [``] })}`,
-        `ts-loader?${JSON.stringify(expectedOptions)}`,
+      use: [
+        `babel-loader`,
+        {
+          loader: `/resolved/path/ts-loader`,
+          options: expectedOptions,
+        },
       ],
     })
   })

packages/gatsby-remark-embed-snippet/src/__tests__/__snapshots__/index.js.snap

@@ -1000,11 +1000,11 @@ Object {
           },
           "type": "html",
           "value": "<div class=\\"gatsby-highlight\\">
-        <pre class=\\"language-bash\\"><code><span class=\\"token comment\\" spellcheck=\\"true\\"># Yarn</span>
+        <pre class=\\"language-bash\\"><code><span class=\\"token comment\\"># Yarn</span>
 yarn init
 <span class=\\"gatsby-highlight-code-line\\">yarn add react react-dom
 </span>
-<span class=\\"token comment\\" spellcheck=\\"true\\"># NPM</span>
+<span class=\\"token comment\\"># NPM</span>
 <span class=\\"token function\\">npm</span> init
 <span class=\\"gatsby-highlight-code-line\\"><span class=\\"token function\\">npm</span> <span class=\\"token function\\">install</span> --save react react-dom
 </span></code></pre>

packages/gatsby-remark-prismjs/src/__tests__/__snapshots__/highlight-code.js.snap

@@ -24,10 +24,10 @@ exports[`highlight code and lines with PrismJS for language jsx 1`] = `
 <span class=\\"gatsby-highlight-code-line\\">      <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;</span>div</span><span class=\\"token punctuation\\">></span></span>
 </span><span class=\\"gatsby-highlight-code-line\\">        <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;</span>h1</span><span class=\\"token punctuation\\">></span></span>Counter<span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;/</span>h1</span><span class=\\"token punctuation\\">></span></span>
 </span>        <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;</span>p</span><span class=\\"token punctuation\\">></span></span>current count<span class=\\"token punctuation\\">:</span> <span class=\\"token punctuation\\">{</span><span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span>state<span class=\\"token punctuation\\">.</span>count<span class=\\"token punctuation\\">}</span><span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;/</span>p</span><span class=\\"token punctuation\\">></span></span>
-<span class=\\"gatsby-highlight-code-line\\">        <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;</span>button</span> <span class=\\"token attr-name\\">onClick</span><span class=\\"token script language-javascript\\"><span class=\\"token punctuation\\">=</span><span class=\\"token punctuation\\">{</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">)</span> <span class=\\"token operator\\">=></span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span><span class=\\"token function\\">setState</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">{</span> count<span class=\\"token punctuation\\">:</span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span>state<span class=\\"token punctuation\\">.</span>count <span class=\\"token operator\\">+</span> <span class=\\"token number\\">1</span> <span class=\\"token punctuation\\">}</span><span class=\\"token punctuation\\">)</span><span class=\\"token punctuation\\">}</span></span><span class=\\"token punctuation\\">></span></span>
+<span class=\\"gatsby-highlight-code-line\\">        <span class=\\"token operator\\">&lt;</span>button onClick<span class=\\"token operator\\">=</span><span class=\\"token punctuation\\">{</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">)</span> <span class=\\"token operator\\">=></span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span><span class=\\"token function\\">setState</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">{</span> count<span class=\\"token punctuation\\">:</span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span>state<span class=\\"token punctuation\\">.</span>count <span class=\\"token operator\\">+</span> <span class=\\"token number\\">1</span> <span class=\\"token punctuation\\">}</span><span class=\\"token punctuation\\">)</span><span class=\\"token punctuation\\">}</span><span class=\\"token operator\\">></span>
 </span>          plus
         <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;/</span>button</span><span class=\\"token punctuation\\">></span></span>
-        <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;</span>button</span> <span class=\\"token attr-name\\">onClick</span><span class=\\"token script language-javascript\\"><span class=\\"token punctuation\\">=</span><span class=\\"token punctuation\\">{</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">)</span> <span class=\\"token operator\\">=></span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span><span class=\\"token function\\">setState</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">{</span> count<span class=\\"token punctuation\\">:</span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span>state<span class=\\"token punctuation\\">.</span>count <span class=\\"token operator\\">-</span> <span class=\\"token number\\">1</span> <span class=\\"token punctuation\\">}</span><span class=\\"token punctuation\\">)</span><span class=\\"token punctuation\\">}</span></span><span class=\\"token punctuation\\">></span></span>
+        <span class=\\"token operator\\">&lt;</span>button onClick<span class=\\"token operator\\">=</span><span class=\\"token punctuation\\">{</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">)</span> <span class=\\"token operator\\">=></span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span><span class=\\"token function\\">setState</span><span class=\\"token punctuation\\">(</span><span class=\\"token punctuation\\">{</span> count<span class=\\"token punctuation\\">:</span> <span class=\\"token keyword\\">this</span><span class=\\"token punctuation\\">.</span>state<span class=\\"token punctuation\\">.</span>count <span class=\\"token operator\\">-</span> <span class=\\"token number\\">1</span> <span class=\\"token punctuation\\">}</span><span class=\\"token punctuation\\">)</span><span class=\\"token punctuation\\">}</span><span class=\\"token operator\\">></span>
           minus
         <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;/</span>button</span><span class=\\"token punctuation\\">></span></span>
       <span class=\\"token tag\\"><span class=\\"token tag\\"><span class=\\"token punctuation\\">&lt;/</span>div</span><span class=\\"token punctuation\\">></span></span>

packages/gatsby-remark-prismjs/src/__tests__/__snapshots__/index.js.snap

@@ -23,7 +23,7 @@ Object {
       },
       "type": "html",
       "value": "<div class=\\"gatsby-highlight\\">
-      <pre class=\\"custom-js\\"><code><span class=\\"token comment\\" spellcheck=\\"true\\">// Fake</span>
+      <pre class=\\"custom-js\\"><code><span class=\\"token comment\\">// Fake</span>
 </code></pre>
       </div>",
     },
@@ -67,7 +67,7 @@ Object {
       },
       "type": "html",
       "value": "<div class=\\"gatsby-highlight\\">
-      <pre class=\\"language-js\\"><code><span class=\\"token comment\\" spellcheck=\\"true\\">// Fake</span>
+      <pre class=\\"language-js\\"><code><span class=\\"token comment\\">// Fake</span>
 </code></pre>
       </div>",
     },

packages/gatsby/package.json

@@ -6,6 +6,10 @@
   "bin": {
     "gatsby": "./dist/bin/gatsby.js"
   },
+  "files": [
+    "./cache-dir",
+    "./dist"
+  ],
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
@@ -14,7 +18,7 @@
     "autoprefixer": "^7.1.2",
     "babel-code-frame": "^6.22.0",
     "babel-core": "^6.24.1",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.2",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-remove-graphql-queries": "^2.0.0-alpha.1",
     "babel-plugin-transform-object-assign": "^6.8.0",
@@ -33,7 +37,7 @@
     "convert-hrtime": "^2.0.0",
     "copyfiles": "^1.2.0",
     "core-js": "^2.5.0",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.7",
     "debug": "^2.6.0",
     "del": "^3.0.0",
     "detect-port": "^1.2.1",
@@ -47,8 +51,8 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "front-matter": "^2.1.0",
     "fs-extra": "^4.0.1",
-    "gatsby-module-loader": "^2.0.0-alpha.1",
     "gatsby-cli": "^1.1.25",
+    "gatsby-module-loader": "^2.0.0-alpha.1",
     "gatsby-react-router-scroll": "^1.0.6",
     "glob": "^7.1.1",
     "graphql": "^0.11.7",
@@ -59,7 +63,7 @@
     "is-relative": "^0.2.1",
     "is-relative-url": "^2.0.0",
     "joi": "12.x.x",
-    "json-loader": "^0.5.2",
+    "json-loader": "^0.5.7",
     "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.0",
     "lodash": "^4.17.4",
@@ -102,16 +106,16 @@
     "string-similarity": "^1.2.0",
     "style-loader": "^0.18.2",
     "type-of": "^2.0.1",
-    "url-loader": "^0.5.9",
-    "webpack": "^2.0.0",
-    "webpack-dev-middleware": "^1.11.0",
+    "uglifyjs-webpack-plugin": "^1.1.2",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.9.1",
+    "webpack-dev-middleware": "^1.12.2",
     "webpack-dev-server": "^2.6.1",
-    "webpack-hot-middleware": "^2.18.2",
+    "webpack-hot-middleware": "^2.21.0",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^4.1.0",
-    "webpack-stats-plugin": "^0.1.4",
-    "webpack-validator": "^2.2.7",
-    "yaml-loader": "^0.4.0"
+    "webpack-stats-plugin": "^0.1.5",
+    "yaml-loader": "^0.5.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

packages/gatsby/src/commands/develop-html.js

@@ -27,6 +27,7 @@ module.exports = async (program: any) => {
       const outputFile = `${directory}/public/render-page.js`
       if (stats.hasErrors()) {
         let webpackErrors = stats.toJson().errors
+        console.log(`here`, webpackErrors[0])
         return reject(
           createErrorFromString(webpackErrors[0], `${outputFile}.map`)
         )

packages/gatsby/src/utils/webpack-plugins.js

@@ -0,0 +1,57 @@
+// @flow
+
+const webpack = require(`webpack`)
+
+const plugin = (name, optimize) => {
+  let Plugin = (optimize ? webpack.optimize : webpack)[name]
+  return (...args: any) => new Plugin(...args)
+}
+
+const plugins = {
+  normalModuleReplacement: plugin(`NormalModuleReplacementPlugin`),
+  contextReplacement: plugin(`ContextReplacementPlugin`),
+  ignore: plugin(`IgnorePlugin`),
+  watchIgnore: plugin(`WatchIgnorePlugin`),
+  banner: plugin(`BannerPlugin`),
+  prefetch: plugin(`PrefetchPlugin`),
+  automaticPrefetch: plugin(`AutomaticPrefetchPlugin`),
+  define: plugin(`DefinePlugin`),
+  provide: plugin(`ProvidePlugin`),
+  hotModuleReplacement: plugin(`HotModuleReplacementPlugin`),
+  sourceMapDevTool: plugin(`SourceMapDevToolPlugin`),
+  evalSourceMapDevTool: plugin(`EvalSourceMapDevToolPlugin`),
+  evalDevToolModule: plugin(`EvalDevToolModulePlugin`),
+  cache: plugin(`CachePlugin`),
+  extendedAPI: plugin(`ExtendedAPIPlugin`),
+  externals: plugin(`ExternalsPlugin`),
+  jsonpTemplate: plugin(`JsonpTemplatePlugin`),
+  libraryTemplate: plugin(`LibraryTemplatePlugin`),
+  loaderTarget: plugin(`LoaderTargetPlugin`),
+  memoryOutputFile: plugin(`MemoryOutputFileSystem`),
+  progress: plugin(`ProgressPlugin`),
+  setVarMainTemplate: plugin(`SetVarMainTemplatePlugin`),
+  umdMainTemplate: plugin(`UmdMainTemplatePlugin`),
+  noErrors: plugin(`NoErrorsPlugin`),
+  noEmitOnErrors: plugin(`NoEmitOnErrorsPlugin`),
+  newWatching: plugin(`NewWatchingPlugin`),
+  environment: plugin(`EnvironmentPlugin`),
+  dll: plugin(`DllPlugin`),
+  dllReference: plugin(`DllReferencePlugin`),
+  loaderOptions: plugin(`LoaderOptionsPlugin`),
+  namedModules: plugin(`NamedModulesPlugin`),
+  namedChunks: plugin(`NamedChunksPlugin`),
+  hashedModuleIds: plugin(`HashedModuleIdsPlugin`),
+  moduleFilenameH: plugin(`ModuleFilenameHelpers`),
+
+  aggressiveMerging: plugin(`AggressiveMergingPlugin`, true),
+  aggressiveSplitting: plugin(`AggressiveSplittingPlugin`, true),
+  commonsChunk: plugin(`CommonsChunkPlugin`, true),
+  chunkModuleIdRange: plugin(`ChunkModuleIdRangePlugin`, true),
+  dedupe: plugin(`DedupePlugin`, true),
+  limitChunkCount: plugin(`LimitChunkCountPlugin`, true),
+  minChunkSize: plugin(`MinChunkSizePlugin`, true),
+  occurrenceOrder: plugin(`OccurrenceOrderPlugin`, true),
+  moduleConcatenation: plugin(`ModuleConcatenationPlugin`, true),
+}
+
+module.exports = plugins