Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/graphql-playground-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"graphql": "^0.13.2",
"graphql-config": "^2.1.0",
"graphql-config-extension-graphcool": "1.0.8",
"graphql-config-extension-prisma": "^0.2.0",
"graphql-config-extension-prisma": "^0.2.2",
"graphql-playground-html": "^1.6.0",
"graphql-playground-react": "1.7.4",
"immutable": "4.0.0-rc.9",
Expand Down
27 changes: 13 additions & 14 deletions packages/graphql-playground-electron/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1853,7 +1853,7 @@ code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

codemirror-graphql@^0.6.11, "codemirror-graphql@github:timsuchanek/codemirror-graphql#details-fix":
codemirror-graphql@^0.6.11, codemirror-graphql@timsuchanek/codemirror-graphql#details-fix:
version "0.6.12"
resolved "https://codeload.github.com/timsuchanek/codemirror-graphql/tar.gz/801ec32683c38d6dc0f8f7bc19014a111edc9ebd"
dependencies:
Expand Down Expand Up @@ -3700,12 +3700,12 @@ [email protected]:
graphcool-yml "0.4.15"
graphql-config "^2.0.1"

graphql-config-extension-prisma@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.2.0.tgz#6cbc82b55db7070e48bb65f4691aac0c2f4297ba"
graphql-config-extension-prisma@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.2.2.tgz#88d6b741279ceb4330be465e5272c0dc4736a3e5"
dependencies:
graphql-config "^2.0.1"
prisma-yml "1.0.92"
prisma-yml "1.0.95"

[email protected]:
version "1.1.4"
Expand Down Expand Up @@ -6524,13 +6524,13 @@ pretty-format@^22.4.0, pretty-format@^22.4.3:
ansi-regex "^3.0.0"
ansi-styles "^3.2.0"

[email protected].0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/prisma-json-schema/-/prisma-json-schema-0.1.0.tgz#0e53346421dc09241fe7240e5479f9673e5fbd10"
[email protected].2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/prisma-json-schema/-/prisma-json-schema-0.1.2.tgz#2ad1cad7858d42bb8b32d3a31e9d3d9a7318d2e0"

[email protected].92:
version "1.0.92"
resolved "https://registry.yarnpkg.com/prisma-yml/-/prisma-yml-1.0.92.tgz#33b25974ebd89153e2291a9831635fd0fbf08cf1"
[email protected].95:
version "1.0.95"
resolved "https://registry.yarnpkg.com/prisma-yml/-/prisma-yml-1.0.95.tgz#0b025336b068eb029d25fc1357a39994fe26b89f"
dependencies:
ajv "5"
bluebird "^3.5.1"
Expand All @@ -6546,7 +6546,7 @@ [email protected]:
json-stable-stringify "^1.0.1"
jsonwebtoken "^8.1.0"
lodash "^4.17.4"
prisma-json-schema "0.1.0"
prisma-json-schema "0.1.2"
replaceall "^0.1.6"
scuid "^1.0.2"
yaml-ast-parser "^0.0.40"
Expand Down Expand Up @@ -7907,9 +7907,8 @@ styled-components@^3.3.2:
postcss-load-plugins "^2.2.0"
styled-jsx "^0.5.7"

"styled-jsx-postcss@github:timsuchanek/styled-jsx-postcss#build3":
styled-jsx-postcss@timsuchanek/styled-jsx-postcss#build3:
version "0.2.0"
uid "677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
resolved "https://codeload.github.com/timsuchanek/styled-jsx-postcss/tar.gz/677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
dependencies:
babel-traverse "^6.21.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-playground-react/.babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"presets": ["es2015", "es2016", "react"],
"plugins": ["styled-jsx-postcss/babel", "babel-plugin-styled-components"]
"plugins": ["babel-plugin-styled-components"]
}
88 changes: 33 additions & 55 deletions packages/graphql-playground-react/config/webpack.config.dev.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict'

const autoprefixer = require('autoprefixer')
const path = require('path')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
Expand Down Expand Up @@ -35,7 +34,7 @@ module.exports = {
index: [
require.resolve('./polyfills'),
require.resolve('react-dev-utils/webpackHotDevClient'),
paths.appIndexJs,
paths.appIndexJs
],
// middleware: [
// require.resolve('./polyfills'),
Expand All @@ -45,8 +44,8 @@ module.exports = {
localDev: [
require.resolve('./polyfills'),
require.resolve('react-dev-utils/webpackHotDevClient'),
paths.localDevIndexJs,
],
paths.localDevIndexJs
]
},
output: {
// Next line is not used in dev but WebpackDevServer crashes without it:
Expand All @@ -63,7 +62,7 @@ module.exports = {
publicPath: publicPath,
// Point sourcemap entries to original disk location (format as URL on Windows)
devtoolModuleFilenameTemplate: info =>
path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')
},
resolve: {
// This allows you to set a fallback for where Webpack should look for modules.
Expand All @@ -72,7 +71,7 @@ module.exports = {
// https://github.com/facebookincubator/create-react-app/issues/253
modules: ['node_modules', paths.appNodeModules].concat(
// It is guaranteed to exist because we tweak it in `env.js`
process.env.NODE_PATH.split(path.delimiter).filter(Boolean),
process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
),
// These are the reasonable defaults supported by the Node ecosystem.
// We also include JSX as a common component filename extension to support
Expand All @@ -89,21 +88,21 @@ module.exports = {
'.js',
'.json',
'.web.jsx',
'.jsx',
'.jsx'
],
alias: {
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
'react-native': 'react-native-web',
'react-native': 'react-native-web'
},
plugins: [
// Prevents users from importing files from outside of src/ (or node_modules/).
// This often causes confusion because we only process files within src/ with babel.
// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
// please link the files into your node_modules/ and let module-resolution kick in.
// Make sure your source files are compiled, as they will not be processed in any way.
new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
],
new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson])
]
},
module: {
strictExportPresence: true,
Expand All @@ -118,13 +117,13 @@ module.exports = {
test: /\.(ts|tsx)$/,
loader: require.resolve('tslint-loader'),
enforce: 'pre',
include: paths.appSrc,
include: paths.appSrc
},
{
test: /\.js$/,
loader: require.resolve('source-map-loader'),
enforce: 'pre',
include: paths.appSrc,
include: paths.appSrc
},
{
// "oneOf" will traverse all following loaders until one will
Expand All @@ -139,23 +138,22 @@ module.exports = {
loader: require.resolve('url-loader'),
options: {
limit: 10000,
name: 'static/media/[name].[hash:8].[ext]',
},
name: 'static/media/[name].[hash:8].[ext]'
}
},
// Compile .tsx?
{
test: /\.(ts|tsx)$/,
include: paths.appSrc,
use: [
{
loader: require.resolve('babel-loader'),
loader: require.resolve('babel-loader')
},
{
loader: require.resolve('ts-loader'),
},
],
loader: require.resolve('ts-loader')
}
]
},
// "postcss" loader applies autoprefixer to our CSS.
// "css" loader resolves paths in CSS and adds assets as dependencies.
// "style" loader turns CSS into JS modules that inject <style> tags.
// In production, we use a plugin to extract that CSS to a file, but
Expand All @@ -167,30 +165,10 @@ module.exports = {
{
loader: require.resolve('css-loader'),
options: {
importLoaders: 1,
},
},
{
loader: require.resolve('postcss-loader'),
options: {
// Necessary for external CSS imports to work
// https://github.com/facebookincubator/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
require('postcss-flexbugs-fixes'),
autoprefixer({
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
],
flexbox: 'no-2009',
}),
],
},
},
],
importLoaders: 1
}
}
]
},
// "file" loader makes sure those assets get served by WebpackDevServer.
// When you `import` an asset, you get its (virtual) filename.
Expand All @@ -205,14 +183,14 @@ module.exports = {
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: require.resolve('file-loader'),
options: {
name: 'static/media/[name].[hash:8].[ext]',
},
},
],
},
name: 'static/media/[name].[hash:8].[ext]'
}
}
]
}
// ** STOP ** Are you adding a new loader?
// Make sure to add the new loader(s) before the "file" loader.
],
]
},
plugins: [
// Makes some environment variables available in index.html.
Expand All @@ -224,7 +202,7 @@ module.exports = {
new HtmlWebpackPlugin({
inject: true,
chunks: ['index'],
template: paths.appHtml,
template: paths.appHtml
}),
// new HtmlWebpackPlugin({
// inject: true,
Expand All @@ -236,7 +214,7 @@ module.exports = {
inject: true,
chunks: ['localDev'],
template: paths.appHtml,
filename: 'localDev.html',
filename: 'localDev.html'
}),
// Add module names to factory functions so they appear in browser profiler.
new webpack.NamedModulesPlugin(),
Expand All @@ -259,7 +237,7 @@ module.exports = {
// solution that requires the user to opt into importing specific locales.
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
],
// Some libraries import Node modules but don't use them in the browser.
// Tell Webpack to provide empty mocks for them so importing them works.
Expand All @@ -268,12 +246,12 @@ module.exports = {
fs: 'empty',
net: 'empty',
tls: 'empty',
child_process: 'empty',
child_process: 'empty'
},
// Turn off performance hints during development because we don't do any
// splitting or minification in interest of speed. These warnings become
// cumbersome.
performance: {
hints: false,
},
hints: false
}
}
Loading