Skip to content

Commit f4c4ec3

Browse files
committed
feat: switch to Yarn + Yarn workspaces
1 parent b5dd553 commit f4c4ec3

File tree

5 files changed

+15576
-24
lines changed

5 files changed

+15576
-24
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ packages/*/public
1212
!packages/core/test/patterns/testDependencyGraph.json
1313
lerna-debug.log
1414
packages/edition-node-gulp/dependencyGraph.json
15+
packages/uikit-workshop/dist

Diff for: .travis.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ addons:
44
chrome: stable
55

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

912
before_script:
10-
- npm install -g [email protected]
11-
- npm run setup
12-
- lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
13-
- lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
14-
- lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
15-
- lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
16-
- lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
17-
- lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
13+
- yarn run setup
14+
- npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
15+
- npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
16+
- npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
17+
- npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
18+
- npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
19+
- npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
1820

19-
script: travis_wait npm run test
21+
script: travis_wait yarn run test
2022

2123
branches:
2224
only:

Diff for: lerna.json

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
{
22
"lerna": "3.11.0",
3+
"version": "0.0.0",
34
"packages": [
45
"packages/*"
56
],
6-
"version": "independent",
77
"command": {
88
"init": {
99
"exact": true
1010
},
11-
"bootstrap": {
12-
"hoist": [
13-
"tap",
14-
"eslin*",
15-
"husky",
16-
"prettier",
17-
"pretty-quick",
18-
"babel-eslint"
19-
]
20-
},
2111
"publish": {
22-
"allowBranch": "master"
12+
"allowBranch": [
13+
"master",
14+
"dev"
15+
],
16+
"conventionalCommits": true,
17+
"gitReset": true,
18+
"includeMergedTags": true,
19+
"noCommitHooks": true,
20+
"verifyAccess": true
21+
},
22+
"changed": {
23+
"includeMergedTags": true
2324
}
2425
},
26+
"ignoreChanges": [
27+
"**/__fixtures__/**",
28+
"**/__tests__/**",
29+
"**/*.md",
30+
"**/__snapshots__/**"
31+
],
32+
"npmClient": "yarn",
2533
"npmClientArgs": [
34+
"--ignore-optional",
2635
"--registry=https://registry.npmjs.org/"
27-
]
36+
],
37+
"useWorkspaces": true
2838
}

Diff for: package.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
{
2+
"workspaces": {
3+
"packages": [
4+
"packages/*"
5+
],
6+
"nohoist": [
7+
"@pattern-lab/engine-*",
8+
"**/@pattern-lab/engine-*",
9+
"**/@pattern-lab/uikit-workshop"
10+
]
11+
},
212
"dependencies": {
313
"@babel/plugin-proposal-decorators": "^7.4.4",
414
"@babel/plugin-syntax-jsx": "^7.2.0",
@@ -8,8 +18,8 @@
818
"eslint-config-prettier": "^6.0.0",
919
"eslint-plugin-import": "^2.18.2",
1020
"eslint-plugin-prettier": "^3.1.0",
11-
"lerna": "3.11.0",
1221
"prettier": "^1.14.3",
22+
"lerna": "3.17.0",
1323
"pretty-quick": "^1.11.1",
1424
"auto": "^7.8.0"
1525
},

0 commit comments

Comments
 (0)