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.

Sign up for GitHub

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

Fix/cleanup yarn lock #41847

Merged
merged 9 commits into from
May 12, 2020
Merged

Fix/cleanup yarn lock #41847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
148aa24
Refresh yarn.lock
scinos May 6, 2020
7d566d6
Add CI job to prevent dirty yarn.lock
scinos May 6, 2020
e5359f7
Update error message
scinos May 6, 2020
a8525f7
Restore broken yarn.lock to verify new CI job
scinos May 6, 2020
0105189
Do not use `--frozen-lockfile`, it doesn't do what we think it does
scinos May 6, 2020
e18ce4a
Fix bad merge in yarn.lock
scinos May 11, 2020
6fb03ad
Undo change in yarn.lock
scinos May 11, 2020
b78bd48
Add missing entries to yarn.lock
scinos May 12, 2020
2cb8cc6
Restore --frozen-lockfile
scinos May 12, 2020
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
11 changes: 11 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,17 @@ jobs:
name: Lint Config Keys
when: always
command: yarn run lint:config-defaults
- run:
name: Lint yarn.lock
when: always
command: |
DIRTY_FILES=$(git status --porcelain 2>/dev/null)
if [[ ! -z "$DIRTY_FILES" ]]; then
echo "Repository contains uncommitted changes: "
echo "$DIRTY_FILES"
echo "You need to checkout the branch, run 'yarn' and commit those files."
exit 1
fi
- run:
name: Lint Client and Server
when: always
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4872,6 +4872,15 @@
sprintf-js "^1.1.1"
tannin "^1.2.0"

"@wordpress/icons@*":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@wordpress/icons/-/icons-1.4.0.tgz#805732a5527eb2178bd97b53decac67451b2b1b3"
integrity sha512-YNW1ocZddZ6c40QHiR/Q3yIPYzh4Fdcq/J4sJIkegwqEXltVknYa90RNaDG9xr+qMvXN5/wotYaLA+AP6pUfHA==
dependencies:
"@babel/runtime" "^7.9.2"
"@wordpress/element" "^2.13.1"
"@wordpress/primitives" "^1.4.0"

"@wordpress/[email protected]", "@wordpress/icons@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@wordpress/icons/-/icons-1.2.0.tgz#734c8d684c8a02d688e8d96e5ce57de574d5c388"
Expand Down Expand Up @@ -5016,6 +5025,15 @@
"@wordpress/element" "^2.12.0"
classnames "^2.2.5"

"@wordpress/primitives@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@wordpress/primitives/-/primitives-1.4.0.tgz#ea236061d65d6e0ab960a7f6670c655451576c94"
integrity sha512-mlP7ikqBw761VK37RL7q5+tnjJujGFuDfJhjhxCXacM/06CpddPSfX+XctWTTn0Oaw1XI/nzK1wlqlIj7uwlrg==
dependencies:
"@babel/runtime" "^7.9.2"
"@wordpress/element" "^2.13.1"
classnames "^2.2.5"

"@wordpress/[email protected]", "@wordpress/priority-queue@^1.5.1":
version "1.5.1"
resolved "https://registry.yarnpkg.com/@wordpress/priority-queue/-/priority-queue-1.5.1.tgz#de07b2bc2567f50b451aa99cf3369cb97d5018b4"
Expand Down