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
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ packages/*/
.editorconfig
.eslintignore
.gitignore
.snyk

LICENSE
yarn.lock
yarn-error.log
lerna-debug.log
3 changes: 3 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ ignore:
'npm:underscore.string:20170908':
- underscore.string:
reason: DoS attack in a devDependency
'npm:braces:20180219':
- babel-watch > chokidar > anymatch > micromatch > braces:
reason: Dos in a dev dependency
patch: {}
12 changes: 12 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
presets: ['@babel/env', '@babel/react', '@babel/flow'],
plugins: [
'@babel/proposal-object-rest-spread',
'@babel/proposal-class-properties',
],
env: {
es: {
presets: [['@babel/env', { modules: false }]],
},
},
}
28 changes: 15 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,19 @@
"check": "yarn run is-pretty && yarn run lint && yarn run test -- -- -w 1 && yarn run build && yarn run vulnerabilities"
},
"devDependencies": {
"babel-cli": "^6.24.0",
"babel-core": "^6.24.0",
"babel-eslint": "^8.2.6",
"babel-loader": "^7.1.1",
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
"babel-preset-env": "^1.7.0",
"babel-preset-flow": "^6.23.0",
"babel-preset-react": "^6.24.1",
"babel-watch": "^2.0.6",
"@babel/cli": "^7.0.0-rc.3",
"@babel/core": "^7.0.0-rc.3",
"@babel/plugin-proposal-class-properties": "^7.0.0-rc.3",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-rc.3",
"@babel/plugin-syntax-dynamic-import": "^7.0.0-rc.3",
"@babel/preset-env": "^7.0.0-rc.3",
"@babel/preset-flow": "^7.0.0-rc.3",
"@babel/preset-react": "^7.0.0-rc.3",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0-beta.3",
"babel-jest": "^23.4.2",
"babel-loader": "^8.0.0-beta.6",
"babel-watch": "git://github.com/hedgepigdaniel/babel-watch.git",
"commitizen": "^2.9.6",
"cross-env": "^5.0.1",
"css-loader": "^1.0.0",
Expand All @@ -52,8 +54,8 @@
"flow-bin": "^0.78.0",
"flow-copy-source": "^2.0.2",
"husky": "^0.14.3",
"jest": "^23.4.2",
"jest-cli": "^23.4.2",
"jest": "^23.5.0",
"jest-cli": "^23.5.0",
"jest-localstorage-mock": "^2.2.0",
"lerna": "^3.1.1",
"lint-staged": "^7.2.0",
Expand Down
8 changes: 0 additions & 8 deletions packages/boilerplate/.babelrc

This file was deleted.

3 changes: 3 additions & 0 deletions packages/boilerplate/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: '../../babel.config',
}
3 changes: 1 addition & 2 deletions packages/boilerplate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
"vulnerabilities": "snyk test"
},
"dependencies": {
"@babel/polyfill": "^7.0.0-rc.3",
"@respond-framework/rudy": "^0.1.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-polyfill": "^6.23.0",
"express": "^4.15.2",
"react": "^16.1.1",
"react-dom": "^16.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/boilerplate/server/serveDev.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/no-extraneous-dependencies */

import 'source-map-support/register'
import 'babel-polyfill'
import '@babel/polyfill'
import path from 'path'
import express from 'express'
import favicon from 'serve-favicon'
Expand Down
2 changes: 1 addition & 1 deletion packages/boilerplate/server/serveProd.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'source-map-support/register'
import 'babel-polyfill'
import '@babel/polyfill'
import { resolve } from 'path'
import express from 'express'
import favicon from 'serve-favicon'
Expand Down
11 changes: 2 additions & 9 deletions packages/boilerplate/server/webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default (env) => {
isClient &&
isDev &&
'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000&reload=false&quiet=false&noInfo=false',
isClient && 'babel-polyfill',
isClient && '@babel/polyfill',
res(isServer ? '../src/render.server.js' : '../src/render.browser.js'),
].filter(Boolean),
},
Expand All @@ -45,18 +45,11 @@ export default (env) => {
use: {
loader: 'babel-loader',
options: {
// { modules: false } allows tree shaking, HMR, and import errors/warnings to work correctly
// Sadly, node doesn't support ES imports/exports yet, so it can't go in .babelrc
babelrc: false,
cacheDirectory: true,
presets: [['env', { modules: false }], 'react'],
plugins: [
'react-hot-loader/babel',
'syntax-dynamic-import',
'@babel/syntax-dynamic-import',
'universal-import',
'transform-flow-strip-types',
'syntax-object-rest-spread',
'transform-class-properties',
],
},
},
Expand Down
36 changes: 0 additions & 36 deletions packages/rudy/.babelrc

This file was deleted.

3 changes: 3 additions & 0 deletions packages/rudy/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: '../../babel.config',
}
7 changes: 5 additions & 2 deletions packages/rudy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "yarn run build:cjs && yarn run build:es && yarn run flow-copy && yarn run build:umd && yarn run build:umd:min",
"build:cjs": "babel --source-maps true src -d dist",
"build:es": "BABEL_ENV=es babel --source-maps true src -d es",
"build:umd": "NODE_ENV=production BABEL_ENV=es webpack --mode production --env.minimize=false src/index.js -o dist/redux-first-router.js",
"build:umd:min": "NODE_ENV=production BABEL_ENV=es webpack --mode production --env.minimize=true src/index.js -o dist/redux-first-router.min.js",
"build:umd": "NODE_ENV=production webpack --mode production --env.minimize=false src/index.js -o dist/redux-first-router.js",
"build:umd:min": "NODE_ENV=production webpack --mode production --env.minimize=true src/index.js -o dist/redux-first-router.min.js",
"flow-copy": "flow-copy-source src dist && flow-copy-source src es",
"flow-watch": "clear; printf \"\\033[3J\" & npm run flow & fswatch -o ./ | xargs -n1 -I{} sh -c 'clear; printf \"\\033[3J\" && npm run flow'",
"flow": "flow; test $? -eq 0 -o $? -eq 2",
Expand Down Expand Up @@ -63,6 +63,9 @@
"testPathIgnorePatterns": [
"/node_modules/",
".eslintrc.js"
],
"transformIgnorePatterns": [
"<rootDir>/node_modules/(?!@respond-framework)"
]
},
"config": {
Expand Down
Loading