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.

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

Update dependencies babel 7 #151

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 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
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@kaliber/build": "*",
"npm-run-all": "^4.1.2",
"react-markdown": "^3.3.0",
"react-syntax-highlighter": "^7.0.2"
"react-markdown": "^4.0.2",
"react-syntax-highlighter": "^9.0.0"
}
}
3 changes: 1 addition & 2 deletions docs/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Content from '/Content'
import PublicPath from '/PublicPath'

import styles from './style.css'
console.log('styles', styles)

const pages = [
['', 'Introduction', introduction],
['getting-started', 'Getting started', gettingStarted],
Expand Down Expand Up @@ -121,7 +121,6 @@ export default class App extends Component {
function getPageInfo(extractedLocation, userHash) {
const location = extractedLocation.endsWith('/') ? extractedLocation : extractedLocation + '/'
const pageInfo = flattenedPages.find(([page]) =>
//console.log('searching:', page + '/', location) ||
page + '/' === location
)
return pageInfo && {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Link.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styles from './style.css'
export default function Link({ title, to, active }) {
return (
<PublicPath.Consumer>
{ publicPath => <a href={`${publicPath}${to.slice(1)}`} onClick={onClick} className={active && styles.active}>{title}</a> }
{ publicPath => <a href={`${publicPath}${to.slice(1)}`} onClick={onClick} className={active ? styles.active : ''}>{title}</a> }
</PublicPath.Consumer>
)

Expand Down
7 changes: 4 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
"npm-run-all": "^4.1.3"
},
"dependencies": {
"@babel/runtime": "^7.0.0",
Copy link
Contributor

@klaasman klaasman Oct 11, 2018

Choose a reason for hiding this comment

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

Shouldn't this dependency be part of the library?
remove this depedency

"@kaliber/build": "*",
"express-basic-auth": "^1.1.4",
"firebase": "^4.12.1",
"firebase-admin": "^5.12.0",
"gsap": "^2.0.1",
"firebase": "^5.4.2",
"firebase-admin": "^6.0.0",
"gsap": "^2.0.2",
"mjml": "^4.0.3",
"normalize.css": "^8.0.0",
"react-stickynode": "^2.0.1",
Expand Down
15 changes: 7 additions & 8 deletions library/lib/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,15 @@ const babelLoader = {
loader: 'babel-loader',
options: {
babelrc: false, // this needs to be false, any other value will cause .babelrc to interfere with these settings
presets: [['env', { modules: false }], 'react'],
presets: [['@babel/preset-env', { modules: false }], '@babel/preset-react'],
plugins: [
'syntax-dynamic-import',
'transform-decorators-legacy',
'transform-class-properties',
'transform-object-rest-spread',
'transform-async-to-generator',
['transform-runtime', {
'@babel/syntax-dynamic-import',
['@babel/proposal-decorators', { legacy: true }],
'@babel/proposal-class-properties',
'@babel/proposal-object-rest-spread',
'@babel/transform-async-to-generator',
['@babel/transform-runtime', {
'helpers': false,
'polyfill': false,
'regenerator': true
}]
]
Expand Down
74 changes: 36 additions & 38 deletions library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,66 +13,64 @@
"kaliber-scaffold": "bin/scaffold.js"
},
"dependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-async-to-generator": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@kaliber/config": "^0.0.1",
"ansi-regex": "^3.0.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.2",
"babel-loader": "^7.1.4",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"caniuse-lite": "^1.0.30000827",
"ansi-regex": "^4.0.0",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.2",
"case-sensitive-paths-webpack-plugin": "^2.1.2",
"compression": "^1.7.2",
"cross-spawn": "^6.0.5",
"cssnano": "^4.0.5",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint-config-standard-react": "^6.0.0",
"cssnano": "^4.1.0",
"eslint": "^5.5.0",
"eslint-config-standard": "^12.0.0",
"eslint-config-standard-react": "^7.0.2",
"eslint-import-resolver-node": "^0.3.2",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-react": "^7.7.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-standard": "^4.0.0",
"express": "^4.16.3",
"file-loader": "^1.1.11",
"find-yarn-workspace-root": "^1.1.0",
"fs-extra": "^5.0.0",
"file-loader": "^2.0.0",
"find-yarn-workspace-root": "^1.2.1",
"fs-extra": "^7.0.0",
"gm": "^1.23.1",
"helmet": "^3.12.0",
"history": "^4.7.2",
"hoist-non-react-statics": "^2.5.0",
"hoist-non-react-statics": "^3.0.1",
"image-maxsize-webpack-loader": "^1.0.0",
"image-webpack-loader": "^4.2.0",
"json-loader": "^0.5.7",
"loader-utils": "^1.1.0",
"pkg-dir": "^2.0.0",
"postcss": "^6.0.21",
"postcss-apply": "^0.9.0",
"pkg-dir": "^3.0.0",
"postcss": "^7.0.2",
"postcss-apply": "^0.11.0",
"postcss-cssnext": "^3.1.0",
"postcss-import": "^11.1.0",
"postcss-import": "^12.0.0",
"postcss-modules": "^1.1.0",
"progress-bar-webpack-plugin": "^1.11.0",
"raw-loader": "^0.5.1",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react": "^16.5.0",
"react-dom": "^16.5.0",
"source-map": "^0.6.1",
"tapable": "^1.0.0",
"time-fix-plugin": "^2.0.0",
"uglifyjs-webpack-plugin": "^1.2.4",
"url-loader": "^1.0.1",
"walk-sync": "^0.3.2",
"webpack": "^4.5.0",
"uglifyjs-webpack-plugin": "^2.0.1",
"url-loader": "^1.1.1",
"walk-sync": "^0.3.3",
"webpack": "^4.17.2",
"webpack-node-externals": "^1.7.2",
"ws": "^5.1.1"
"ws": "^6.0.0"
},
"keywords": [
"webpack",
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"private": true,
"workspaces": ["example", "library", "docs"]
"workspaces": [
"example",
"library",
"docs"
]
}
Loading