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 lerna #13

Merged
merged 5 commits into from
May 29, 2017
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
19 changes: 12 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
"author": "Thibaut REMY <thibaut.remy@fyndiq.com>",
"scripts": {
"bootstrap": "lerna bootstrap",
"build": "./scripts/build.sh",
"build-clean": "rm -rf ./packages/*/lib",
"publish": "npm run build-clean && npm run build && lerna publish",
"dev": "./scripts/build.sh dev",
"clean": "lerna exec -- rimraf lib",
"prebuild": "npm run clean",
"build": "lerna exec --ignore fyndiq-ui-test -- babel src -d lib --ignore *.test.js",
"build:watch": "lerna exec --parallel --ignore fyndiq-ui-test -- babel src -d lib --ignore *.test.js -w",
"publish": "npm run build && lerna publish",
"dev": "npm run build:watch & lerna run storybook",
"lerna": "lerna",
"lint": "npm run lint:js && npm run lint:less",
"lint:js": "eslint --cache --ignore-pattern coverage --ignore-pattern node_modules --ignore-pattern lib .",
"lint:less": "stylelint --syntax less \"packages/**/*.less\"",
Expand All @@ -30,11 +33,13 @@
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.3",
"file-loader": "^0.10.1",
"identity-obj-proxy": "^3.0.0",
"jest": "^20.0.0",
"lerna": "2.0.0-beta.38",
"lerna": "2.0.0-rc.5",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-test-renderer": "^15.5.4"
"react-test-renderer": "^15.5.4",
"rimraf": "^2.6.1"
},
"dependencies": {
"css-loader": "^0.27.3",
Expand All @@ -50,7 +55,7 @@
"enzyme-to-json/serializer"
],
"moduleNameMapper": {
"\\.less$": "<rootDir>/scripts/less-mock.js"
"\\.less$": "identity-obj-proxy"
}
}
}
2 changes: 2 additions & 0 deletions packages/fyndiq-styles-fonts/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const STANDARD = 'MuseoSans, Arial, sans-serif'
export const HEADLINE = 'Cubano, Arial, sans-serif'
25 changes: 0 additions & 25 deletions scripts/build.sh

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/less-mock.js

This file was deleted.