Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2 - Switch Sources and Transformers to use createNodeId for ids #3807

Merged
merged 4 commits into from
Feb 10, 2018
Merged

V2 - Switch Sources and Transformers to use createNodeId for ids #3807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4484f10
Switch Sources and Transformers to use createNodeId for ids
danielfarrell Feb 1, 2018
1270734
Merge branch 'v2' into danielfarrell-v2-uuid
KyleAMathews Feb 10, 2018
b1752b3
Only use createNodeId if an id isn't passed in
KyleAMathews Feb 10, 2018
6f1d87e
Remove unused imports
KyleAMathews Feb 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/gatsby-plugin-postcss-sass/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@
"main": "index.js",
"readme": "README.md",
"scripts": {
"build": "babel src --out-dir . --ignore __tests__",
"watch": "babel -w src --out-dir . --ignore __tests__",
"prepublish": "cross-env NODE_ENV=production npm run build"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this whole package should be deleted, the files here are leftover from a bad merge with master

}
}
17 changes: 0 additions & 17 deletions packages/gatsby-plugin-typescript/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
const babelPluginRemoveQueries = require(`babel-plugin-remove-graphql-queries`)
const { transpileModule } = require(`typescript`)
<<<<<<< HEAD
const resolve = require(`./resolve`)
=======
>>>>>>> origin/master

const test = /\.tsx?$/
const compilerDefaults = {
Expand All @@ -16,20 +13,14 @@ const compilerDefaults = {
module.exports.resolvableExtensions = () => [`.ts`, `.tsx`]

module.exports.modifyWebpackConfig = (
<<<<<<< HEAD
{ actions, loaders },
{ compilerOptions, ...options }
=======
{ config, babelConfig },
{ compilerOptions, transpileOnly = true }
>>>>>>> origin/master
) => {
// Gatsby removes graphql queries from source code because they queries are
// run ahead of time. We need to do that here as well in order to avoid
// extra dead code sitting in the typescript files.
const jsLoader = loaders.js({ plugins: [babelPluginRemoveQueries] })

<<<<<<< HEAD
const typescriptOptions = {
// React-land is rather undertyped; nontrivial TS projects will most likely
// error (i.e., not build) at something or other.
Expand All @@ -56,14 +47,6 @@ module.exports.modifyWebpackConfig = (
},
],
},
=======
config.loader(`typescript`, {
test,
loaders: [
`babel?${JSON.stringify(babelConfig)}`,
`ts-loader?${JSON.stringify(opts)}`,
],
>>>>>>> origin/master
})
}

Expand Down
Loading