Skip to content

Making linter add ^ to version when adding missing deps #1347

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

Merged
merged 10 commits into from
Jan 19, 2021
Merged

Making linter add ^ to version when adding missing deps #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a92f19c
making linter append a caret to missing deps
LFDanLu Dec 4, 2020
9d68321
adding carets to package json deps
LFDanLu Dec 4, 2020
d65cafd
Merge branch 'main' into fixing_lint_import
LFDanLu Dec 4, 2020
26b704b
updating lint imports with alpha/beta/rc logic
LFDanLu Dec 8, 2020
f69f25b
removing caret from alpha/beta/rc package deps
LFDanLu Dec 8, 2020
7607d10
updating plop template with ^3.0.0 version deps
LFDanLu Dec 8, 2020
fb579ec
Merge branch 'fixing_lint_import' of https://github.com/adobe/react-s…
LFDanLu Dec 8, 2020
0a2821e
addressing review comments and fixing build
LFDanLu Dec 8, 2020
79d1194
Merge branch 'main' of https://github.com/adobe/react-spectrum into f…
LFDanLu Jan 4, 2021
57090a5
Merge branch 'main' into fixing_lint_import
LFDanLu Jan 19, 2021
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
6 changes: 4 additions & 2 deletions bin/imports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const findUp = require('find-up');
const path = require('path');
const fs = require('fs');
const Module = require('module');
const substrings = ['-', '+'];

module.exports = function (context) {
let processNode = (node) => {
Expand Down Expand Up @@ -57,11 +58,12 @@ module.exports = function (context) {
}

let depPkg = JSON.parse(fs.readFileSync(depPath, 'utf8'));
let pkgVersion = substrings.some(v => depPkg.version.includes(v)) ? depPkg.version : `^${depPkg.version}`;

if (pkgName === '@react-spectrum/provider') {
pkg.peerDependencies = insertObject(pkg.peerDependencies, pkgName, depPkg.version);
pkg.peerDependencies = insertObject(pkg.peerDependencies, pkgName, pkgVersion);
} else {
pkg.dependencies = insertObject(pkg.dependencies, pkgName, depPkg.version);
pkg.dependencies = insertObject(pkg.dependencies, pkgName, pkgVersion);
}

fs.writeFileSync(pkgPath, JSON.stringify(pkg, false, 2) + '\n');
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@react-aria/interactions": "^3.1.0",
"@react-aria/live-announcer": "3.0.0-alpha.0",
"@react-aria/utils": "^3.1.0",
"@react-stately/calendar": "^3.0.0-alpha.1",
"@react-stately/calendar": "3.0.0-alpha.1",
"@react-types/button": "^3.1.0",
"@react-types/calendar": "^3.0.0-alpha.1",
"@react-types/calendar": "3.0.0-alpha.1",
"@react-types/shared": "^3.1.0",
"date-fns": "^1.30.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/color/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
},
"dependencies": {
"@babel/runtime": "^7.6.2",
"@react-aria/spinbutton": "^3.0.0-alpha.1",
"@react-aria/spinbutton": "3.0.0-alpha.1",
"@react-aria/textfield": "^3.1.0",
"@react-aria/i18n": "^3.1.2",
"@react-aria/interactions": "^3.2.0",
"@react-aria/slider": "^3.0.0",
"@react-aria/utils": "^3.2.1",
"@react-stately/color": "^3.0.0-alpha.1",
"@react-types/color": "^3.0.0-alpha.1",
"@react-stately/color": "3.0.0-alpha.1",
"@react-types/color": "3.0.0-alpha.1",
"@react-types/shared": "^3.2.1",
"@react-types/slider": "^3.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/datepicker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"@react-aria/focus": "^3.1.0",
"@react-aria/i18n": "^3.1.0",
"@react-aria/interactions": "^3.1.0",
"@react-aria/spinbutton": "^3.0.0-alpha.1",
"@react-aria/spinbutton": "3.0.0-alpha.1",
"@react-aria/utils": "^3.1.0",
"@react-stately/datepicker": "^3.0.0-alpha.1",
"@react-stately/datepicker": "3.0.0-alpha.1",
"@react-types/button": "^3.1.0",
"@react-types/datepicker": "^3.0.0-alpha.1",
"@react-types/datepicker": "3.0.0-alpha.1",
"@react-types/dialog": "^3.1.0",
"@react-types/shared": "^3.1.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/numberfield/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"@babel/runtime": "^7.6.2",
"@react-aria/i18n": "^3.0.2",
"@react-aria/interactions": "^3.0.2",
"@react-aria/spinbutton": "^3.0.0-alpha.1",
"@react-aria/spinbutton": "3.0.0-alpha.1",
"@react-aria/textfield": "^3.1.0",
"@react-aria/utils": "^3.1.0",
"@react-stately/numberfield": "^3.0.0-alpha.1",
"@react-stately/numberfield": "3.0.0-alpha.1",
"@react-types/button": "^3.1.0",
"@react-types/numberfield": "^3.0.0-alpha.1",
"@react-types/numberfield": "3.0.0-alpha.1",
"@react-types/textfield": "^3.1.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/pagination/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"dependencies": {
"@babel/runtime": "^7.6.2",
"@react-aria/i18n": "^3.1.0",
"@react-stately/pagination": "^3.0.0-alpha.1",
"@react-types/pagination": "^3.0.0-alpha.1"
"@react-stately/pagination": "3.0.0-alpha.1",
"@react-types/pagination": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/sidenav/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@react-stately/collections": "^3.1.0",
"@react-stately/tree": "^3.1.0",
"@react-types/shared": "^3.1.0",
"@react-types/sidenav": "^3.0.0-alpha.1"
"@react-types/sidenav": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/splitview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@babel/runtime": "^7.6.2",
"@react-aria/interactions": "^3.2.0",
"@react-aria/utils": "^3.1.0",
"@react-stately/splitview": "^3.0.0-alpha.1",
"@react-stately/splitview": "3.0.0-alpha.1",
"@react-types/shared": "^3.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/tag/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@react-aria/interactions": "^3.1.0",
"@react-aria/utils": "^3.1.0",
"@react-types/shared": "^3.1.0",
"@react-types/tag": "^3.0.0-alpha.1"
"@react-types/tag": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/toast/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@react-aria/interactions": "^3.1.0",
"@react-aria/utils": "^3.1.0",
"@react-types/shared": "^3.1.0",
"@react-types/toast": "^3.0.0-alpha.1",
"@react-stately/toast": "^3.0.0-alpha.1"
"@react-types/toast": "3.0.0-alpha.1",
"@react-stately/toast": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/actiongroup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/alert/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@babel/runtime": "^7.6.2",
"@react-aria/i18n": "^3.1.0",
"@react-spectrum/utils": "^3.1.0",
"@react-types/alert": "^3.0.0-alpha.1",
"@react-types/alert": "3.0.0-alpha.1",
"@spectrum-icons/ui": "^3.1.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/breadcrumbs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1",
"@react-spectrum/test-utils": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
"@react-spectrum/test-utils": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/buttongroup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@react-types/shared": "^3.2.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1",
"@spectrum-icons/workflow": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
"@spectrum-icons/workflow": "^3.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/@react-spectrum/calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@
},
"dependencies": {
"@babel/runtime": "^7.6.2",
"@react-aria/calendar": "^3.0.0-alpha.1",
"@react-aria/calendar": "3.0.0-alpha.1",
"@react-aria/focus": "^3.1.0",
"@react-aria/i18n": "^3.1.0",
"@react-aria/interactions": "^3.1.0",
"@react-aria/visually-hidden": "^3.1.0",
"@react-spectrum/button": "^3.1.0",
"@react-spectrum/utils": "^3.1.0",
"@react-stately/calendar": "^3.0.0-alpha.1",
"@react-types/calendar": "^3.0.0-alpha.1",
"@react-stately/calendar": "3.0.0-alpha.1",
"@react-types/calendar": "3.0.0-alpha.1",
"@react-types/shared": "^3.1.0",
"@spectrum-icons/ui": "^3.1.0",
"date-fns": "^1.30.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1",
"@react-spectrum/test-utils": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
"@react-spectrum/test-utils": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/checkbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/@react-spectrum/color/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@
},
"dependencies": {
"@babel/runtime": "^7.6.2",
"@react-aria/color": "^3.0.0-alpha.1",
"@react-aria/color": "3.0.0-alpha.1",
"@react-aria/focus": "^3.2.1",
"@react-aria/i18n": "^3.1.2",
"@react-aria/interactions": "^3.2.0",
"@react-aria/slider": "^3.0.0",
"@react-aria/utils": "^3.0.0-alpha.1",
"@react-aria/utils": "^3.0.0",
"@react-spectrum/label": "^3.2.1",
"@react-spectrum/layout": "^3.1.3",
"@react-spectrum/textfield": "^3.1.0",
"@react-spectrum/utils": "^3.0.0-alpha.1",
"@react-stately/color": "^3.0.0-alpha.1",
"@react-spectrum/utils": "^3.0.0",
"@react-stately/color": "3.0.0-alpha.1",
"@react-stately/slider": "^3.0.0",
"@react-stately/utils": "^3.1.0",
"@react-types/color": "^3.0.0-alpha.1",
"@react-types/color": "3.0.0-alpha.1",
"@react-types/shared": "^3.2.0",
"@react-types/slider": "^3.0.0",
"@react-types/textfield": "^3.1.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-spectrum/combobox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"@babel/runtime": "^7.6.2",
"@react-aria/button": "^3.3.0",
"@react-aria/combobox": "3.0.0-alpha.0",
"@react-aria/dialog": "3.1.2",
"@react-aria/dialog": "^3.1.2",
"@react-aria/focus": "^3.1.0",
"@react-aria/i18n": "^3.2.0",
"@react-aria/interactions": "^3.3.2",
"@react-aria/label": "3.1.1",
"@react-aria/label": "^3.1.1",
"@react-aria/overlays": "^3.6.0",
"@react-aria/utils": "^3.4.1",
"@react-spectrum/button": "^3.3.0",
Expand All @@ -57,7 +57,7 @@
"@spectrum-icons/ui": "^3.1.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/@react-spectrum/datepicker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
},
"dependencies": {
"@babel/runtime": "^7.6.2",
"@react-aria/datepicker": "^3.0.0-alpha.1",
"@react-aria/datepicker": "3.0.0-alpha.1",
"@react-aria/focus": "^3.1.0",
"@react-aria/i18n": "^3.1.0",
"@react-aria/interactions": "^3.1.0",
"@react-aria/utils": "^3.1.0",
"@react-spectrum/button": "^3.1.0",
"@react-spectrum/calendar": "^3.0.0-alpha.1",
"@react-spectrum/calendar": "3.0.0-alpha.1",
"@react-spectrum/dialog": "^3.1.0",
"@react-spectrum/utils": "^3.1.0",
"@react-stately/datepicker": "^3.0.0-alpha.1",
"@react-types/datepicker": "^3.0.0-alpha.1",
"@react-stately/datepicker": "3.0.0-alpha.1",
"@react-types/datepicker": "3.0.0-alpha.1",
"@spectrum-icons/ui": "^3.1.0",
"@spectrum-icons/workflow": "^3.1.0",
"date-fns": "^1.30.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1",
"@react-spectrum/test-utils": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
"@react-spectrum/test-utils": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/dialog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1",
"@react-spectrum/test-utils": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
"@react-spectrum/test-utils": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/divider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@react-types/shared": "^3.2.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/form/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@react-types/shared": "^3.2.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/icon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@react-types/shared": "^3.3.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/illustratedmessage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@react-types/shared": "^3.2.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/image/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@react-types/shared": "^3.2.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"@react-spectrum/provider": "^3.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/label/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@spectrum-icons/ui": "^3.2.0"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/layout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"clsx": "^1.1.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"@react-spectrum/provider": "^3.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/link/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@react-types/link": "^3.1.1"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "^3.0.0-alpha.1"
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0-rc.1",
Expand Down
Loading