Skip to content

Commit

Permalink
feat: switch to Yarn + Yarn workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
sghoweri committed Oct 12, 2019
1 parent b5dd553 commit f4c4ec3
Show file tree
Hide file tree
Showing 5 changed files with 15,576 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ packages/*/public
!packages/core/test/patterns/testDependencyGraph.json
lerna-debug.log
packages/edition-node-gulp/dependencyGraph.json
packages/uikit-workshop/dist
22 changes: 12 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ addons:
chrome: stable

before_install:
- phantomjs --version
# version lifted from `.nvmrc`
- nvm install
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.19.0
- export PATH="$HOME/.yarn/bin:$PATH"

before_script:
- npm install -g [email protected]
- npm run setup
- lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
- lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
- lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
- lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
- lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
- lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
- yarn run setup
- npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
- npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
- npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
- npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
- npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
- npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core

script: travis_wait npm run test
script: travis_wait yarn run test

branches:
only:
Expand Down
36 changes: 23 additions & 13 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
{
"lerna": "3.11.0",
"version": "0.0.0",
"packages": [
"packages/*"
],
"version": "independent",
"command": {
"init": {
"exact": true
},
"bootstrap": {
"hoist": [
"tap",
"eslin*",
"husky",
"prettier",
"pretty-quick",
"babel-eslint"
]
},
"publish": {
"allowBranch": "master"
"allowBranch": [
"master",
"dev"
],
"conventionalCommits": true,
"gitReset": true,
"includeMergedTags": true,
"noCommitHooks": true,
"verifyAccess": true
},
"changed": {
"includeMergedTags": true
}
},
"ignoreChanges": [
"**/__fixtures__/**",
"**/__tests__/**",
"**/*.md",
"**/__snapshots__/**"
],
"npmClient": "yarn",
"npmClientArgs": [
"--ignore-optional",
"--registry=https://registry.npmjs.org/"
]
],
"useWorkspaces": true
}
12 changes: 11 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
{
"workspaces": {
"packages": [
"packages/*"
],
"nohoist": [
"@pattern-lab/engine-*",
"**/@pattern-lab/engine-*",
"**/@pattern-lab/uikit-workshop"
]
},
"dependencies": {
"@babel/plugin-proposal-decorators": "^7.4.4",
"@babel/plugin-syntax-jsx": "^7.2.0",
Expand All @@ -8,8 +18,8 @@
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.0",
"lerna": "3.11.0",
"prettier": "^1.14.3",
"lerna": "3.17.0",
"pretty-quick": "^1.11.1",
"auto": "^7.8.0"
},
Expand Down
Loading

0 comments on commit f4c4ec3

Please sign in to comment.