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

[WIP] Upgrade to Lerna v3 #567

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1a5f832
init
Aug 3, 2018
f3c9882
"Add !important for [hidden] cause attribute/UA style should take pre…
muan Aug 8, 2018
d012d50
Merge pull request #557 from muan/muan/hidden
jonrohan Aug 9, 2018
1312222
run node 8 to match .nvmrc
shawnbot Aug 24, 2018
114ae99
update to lerna@3
shawnbot Sep 12, 2018
ea5ebfa
update tool deps to file: urls
shawnbot Sep 12, 2018
76f5d18
remove per-package lockfiles
shawnbot Sep 12, 2018
99d20fa
update root package-lock.json
shawnbot Sep 12, 2018
15eaf98
set up lerna.json for v3
shawnbot Sep 12, 2018
e422ac4
install json utils
shawnbot Sep 12, 2018
8cecd59
tidy up script/get-packages
shawnbot Sep 12, 2018
ebcdd38
add script to migrate to file: urls
shawnbot Sep 12, 2018
3da63ca
run script/relative-versions :crossed_fingers:
shawnbot Sep 12, 2018
705c5b5
file: versions are a-okay
shawnbot Sep 12, 2018
fe02ac7
tidy script/relative-versions
shawnbot Sep 12, 2018
af334b7
sort .gitignore, add **/package-lock.json
shawnbot Sep 12, 2018
2aa1b1d
rebuild package-lock.json
shawnbot Sep 12, 2018
715204c
don't call npm with --no-package-lock
shawnbot Sep 12, 2018
6234fa1
run check-versions before testing
shawnbot Sep 12, 2018
6c367eb
always run lerna bootstrap with --no-ci
shawnbot Sep 12, 2018
c137be7
run npm audit fix
shawnbot Sep 12, 2018
14b1e79
run Node 10 on Travis
shawnbot Sep 12, 2018
9655d11
update .nmvrc to Node 10
shawnbot Sep 12, 2018
51002a1
run npm install explicitly
shawnbot Sep 12, 2018
3a1dbf2
hoist the whole primer tree
shawnbot Sep 12, 2018
18d9c9e
bring back --no-package-lock
shawnbot Sep 12, 2018
c52af23
bump chalk to more common version
shawnbot Sep 12, 2018
0583215
don't ignore package-lock.json; we should know if they exist
shawnbot Sep 12, 2018
82fc2fe
nix root node-sass
shawnbot Sep 12, 2018
530fd7f
bump to node-sass@^4.9.3 in primer-module-build
shawnbot Sep 12, 2018
e3e8aaa
rebuild package-lock.json
shawnbot Sep 12, 2018
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
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
*.lerna_backup
*.log
.DS_Store
.changelog
.sass-cache
node_modules
*.log
build
_site
*.lerna_backup
.changelog
node_modules
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
10
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 7
- 10

env:
global:
Expand All @@ -9,9 +9,13 @@ env:
# github changelog
- secure: "KcGydAqL7ryDh2rTJJB4wU8NE5BRtnrRXDEcPBScSscO3zFsHXHBDvvO04B/9hFVatXzGYXmkn+FZ0P9QikhvebzdwwyqUG2SKFiHhMvbX0m0WtAhn5NqDuKU1r5qy5YQ18r/tiLfC9GSAlEpfLAH58pwpcn8srV3Mn/yKvlrfs="

install:
# by default, Travis runs npm ci, which... fails
- npm install

script:
- npm test
- script/check-versions
- npm test

after_success:
# this will short-circuit the publish step if it fails to interpolate $NPM_API_KEY
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#10.9.0

# 10.8.1
#### :bug: Bug Fix
* [#554](https://github.com/primer/primer/pull/554) Fixes peer dependency issues ([@emplums](https://github.com/emplums))
Expand Down
13 changes: 10 additions & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
{
"lerna": "2.4.0",
"version": "independent",
"packages": [
"modules/*",
"tools/*"
],
"command": {
"bootstrap": {
"npmClientArgs": ["--no-package-lock"]
},
"publish": {
"ignoreChanges": []
}
},
"changelog": {
"repo": "primer/primer",
"labels": {
Expand All @@ -15,6 +23,5 @@
"Tag: Internal": ":house: Internal"
},
"cacheDir": ".changelog"
},
"version": "independent"
}
}
11 changes: 0 additions & 11 deletions modules/primer-alerts/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-alerts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"alerts",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-avatars/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-avatars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"avatars",
Expand Down
2 changes: 1 addition & 1 deletion modules/primer-base/lib/normalize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ progress {

template, /* 1 */
[hidden] {
display: none;
display: none !important;
}

/* Links
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-base/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"primer",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-blankslate/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-blankslate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"primer",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-box/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-box/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"primer",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-branch-name/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-branch-name/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"github",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-breadcrumb/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-breadcrumb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"breadcrumb",
Expand Down
11 changes: 0 additions & 11 deletions modules/primer-buttons/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion modules/primer-buttons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"publish": "../../script/notify success"
},
"dependencies": {
"primer-support": "4.6.0"
"primer-support": "file:../primer-support"
},
"keywords": [
"primer",
Expand Down
Loading