Permalink
Browse files

Bump AVA and fix tests (#548)

  • Loading branch information...
kevva authored and sindresorhus committed Oct 9, 2018
1 parent 1d4ed32 commit ee3e88227126cb9c90650e85986d347fbb026e10
Showing with 589 additions and 2,270 deletions.
  1. +56 −0 babel.config.js
  2. +11 −64 package.json
  3. +0 −8 webpack.config.js
  4. +522 −2,198 yarn.lock
@@ -0,0 +1,56 @@
'use strict';
const path = require('path');
const srcPath = path.join(__dirname, 'app', 'renderer');
const plugins = [
[
'styled-jsx/babel',
{
vendorPrefixes: false,
},
],
'@babel/plugin-transform-modules-commonjs',
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-object-rest-spread',
[
'@babel/plugin-proposal-class-properties',
{
loose: false,
},
],
[
'module-resolver', {
alias: {
components: path.join(srcPath, 'components'),
containers: path.join(srcPath, 'containers'),
views: path.join(srcPath, 'views'),
icons: path.join(srcPath, 'icons'),
},
},
],
];
module.exports = {
presets: [
'@babel/preset-react',
],
plugins: [
...plugins,
'react-hot-loader/babel',
],
env: {
test: {
plugins: [
...plugins,
[
'transform-require-ignore',
{
extensions: [
'.scss',
],
},
],
],
},
},
};
@@ -2,7 +2,7 @@
"scripts": {
"postinstall": "electron-builder install-app-deps",
"lint": "xo && stylelint 'app/renderer/**/*.scss'",
"test": "yarn lint",
"test": "yarn lint && ava",
"start:watch": "webpack-dev-server --hot",
"start:launch": "wait-for-localhost 8080 && run-electron app",
"start": "yarn && run-p start:*",
@@ -11,6 +11,7 @@
"release": "cd app && np --no-publish"
},
"dependencies": {
"@babel/register": "^7.0.0",
"@sindresorhus/slugify": "^0.3.0",
"@sindresorhus/to-milliseconds": "^1.0.0",
"bip39": "^2.5.0",
@@ -57,17 +58,17 @@
"unstated-debug": "^0.2.0"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
"@babel/plugin-transform-modules-commonjs": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"ava": "^0.25.0",
"ava": "^1.0.0-beta.8",
"babel-eslint": "^9.0.0",
"babel-loader": "^8.0.2",
"babel-plugin-module-resolver": "^3.1.1",
"babel-plugin-transform-require-ignore": "^0.1.1",
"babel-plugin-webpack-alias": "^2.1.2",
"browser-env": "^3.2.5",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.2",
@@ -101,67 +102,13 @@
"xo": "^0.23.0"
},
"ava": {
"babel": "inherit",
"require": [
"babel-register",
"@babel/register",
"./test/_index"
]
},
"babel": {
"presets": [
"@babel/preset-react"
],
"plugins": [
[
"styled-jsx/babel",
{
"vendorPrefixes": false
}
],
"@babel/plugin-transform-modules-commonjs",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-object-rest-spread",
[
"@babel/plugin-proposal-class-properties",
{
"loose": false
}
],
"react-hot-loader/babel"
],
"env": {
"test": {
"plugins": [
[
"webpack-alias",
{
"config": "./webpack.config.js"
}
],
[
"transform-require-ignore",
{
"extensions": [
".scss"
]
}
],
[
"styled-jsx/babel",
{
"vendorPrefixes": false
}
],
"@babel/plugin-transform-modules-commonjs",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-object-rest-spread",
[
"@babel/plugin-proposal-class-properties",
{
"loose": false
}
]
]
"babel": {
"testOptions": {
"configFile": "./babel.config.js"
}
}
},
@@ -26,14 +26,6 @@ module.exports = (env, options) => ({
optimization: {
minimize: false,
},
resolve: {
alias: {
components: path.join(PATHS.src, 'components'),
containers: path.join(PATHS.src, 'containers'),
views: path.join(PATHS.src, 'views'),
icons: path.join(PATHS.src, 'icons'),
},
},
module: {
rules: [
{
Oops, something went wrong.

0 comments on commit ee3e882

Please sign in to comment.