diff --git a/package.json b/package.json index 85abef815f..415a8600eb 100755 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "shelljs": "^0.7.7" }, "scripts": { - "clean": "npm run removesymlinkdependencies && rm -rf package-lock.json && rm -rf packages/*/package-lock.json", + "clean": "npm run removesymlinkdependencies && node ./scripts/clean.js", "clean:all": "npm run removesymlinkdependencies && rm -rf package-lock.json && rm -rf packages/*/package-lock.json && rm -rf packages/*/node_modules", "doc": "node ./scripts/documentation.js", "release": "npm run clean:all && npm install && npm run createsymlinkdependencies && lerna exec --concurrency 1 -- npm install && npm run removesymlinkdependencies && node ./scripts/publish.js $TAG", diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json index 8449298482..9c0864a3f1 100644 --- a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json +++ b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json @@ -1 +1 @@ -{"name":"vendor_lib","content":{"../strapi-helper-plugin/node_modules/react/index.js":{"id":0,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/index.js":{"id":1,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyFunction.js":{"id":2,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/index.js":{"id":3,"meta":{}},"../strapi-helper-plugin/node_modules/object-assign/index.js":{"id":4,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyObject.js":{"id":5,"meta":{}},"../strapi-helper-plugin/node_modules/intl-messageformat/src/main.js":{"id":6,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/utils.js":{"id":7,"meta":{"harmonyModule":true},"exports":["hop","extend"]},"../strapi-helper-plugin/node_modules/webpack/buildin/global.js":{"id":8,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/Transition.js":{"id":9,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/PropTypes.js":{"id":10,"meta":{}},"../strapi-helper-plugin/node_modules/react/cjs/react.production.min.js":{"id":12,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/cjs/react-dom.production.min.js":{"id":13,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/ExecutionEnvironment.js":{"id":14,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/EventListener.js":{"id":15,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/getActiveElement.js":{"id":16,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/shallowEqual.js":{"id":17,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/containsNode.js":{"id":18,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isTextNode.js":{"id":19,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isNode.js":{"id":20,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/focusNode.js":{"id":21,"meta":{}},"../strapi-helper-plugin/node_modules/react-intl/lib/index.es.js":{"id":22,"meta":{"harmonyModule":true},"exports":["addLocaleData","intlShape","injectIntl","defineMessages","IntlProvider","FormattedDate","FormattedTime","FormattedRelative","FormattedNumber","FormattedPlural","FormattedMessage","FormattedHTMLMessage"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/core.js":{"id":24,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/es5.js":{"id":25,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/compiler.js":{"id":26,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat-parser/src/parser.js":{"id":27,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/en.js":{"id":28,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/main.js":{"id":29,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/core.js":{"id":30,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/diff.js":{"id":31,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/es5.js":{"id":32,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate","arrIndexOf","isArray","dateNow"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/en.js":{"id":33,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/prop-types/factoryWithThrowingShims.js":{"id":34,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/invariant.js":{"id":35,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":36,"meta":{}},"../strapi-helper-plugin/node_modules/invariant/browser.js":{"id":37,"meta":{}},"../strapi-helper-plugin/node_modules/intl-format-cache/src/memoizer.js":{"id":38,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-format-cache/src/es5.js":{"id":39,"meta":{"harmonyModule":true},"exports":["bind","defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/reactstrap/dist/reactstrap.es.js":{"id":40,"meta":{"harmonyModule":true},"exports":["Alert","Container","Row","Col","Navbar","NavbarBrand","NavbarToggler","Nav","NavItem","NavDropdown","NavLink","Breadcrumb","BreadcrumbItem","Button","ButtonDropdown","ButtonGroup","ButtonToolbar","Dropdown","DropdownItem","DropdownMenu","DropdownToggle","Fade","Badge","Card","CardLink","CardGroup","CardDeck","CardColumns","CardBody","CardBlock","CardFooter","CardHeader","CardImg","CardImgOverlay","Carousel","UncontrolledCarousel","CarouselControl","CarouselItem","CarouselIndicators","CarouselCaption","CardSubtitle","CardText","CardTitle","Popover","PopoverContent","PopoverBody","PopoverTitle","PopoverHeader","Progress","Modal","ModalHeader","ModalBody","ModalFooter","PopperContent","PopperTargetHelper","Tooltip","Table","ListGroup","Form","FormFeedback","FormGroup","FormText","Input","InputGroup","InputGroupAddon","InputGroupButton","Label","Media","Pagination","PaginationItem","PaginationLink","TabContent","TabPane","Jumbotron","Collapse","ListGroupItem","ListGroupItemText","ListGroupItemHeading","UncontrolledAlert","UncontrolledButtonDropdown","UncontrolledDropdown","UncontrolledNavDropdown","UncontrolledTooltip"]},"../strapi-helper-plugin/node_modules/classnames/index.js":{"id":41,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isfunction/index.js":{"id":42,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isobject/index.js":{"id":43,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/react-popper.js":{"id":44,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Manager.js":{"id":45,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Target.js":{"id":46,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Popper.js":{"id":47,"meta":{}},"../strapi-helper-plugin/node_modules/popper.js/dist/umd/popper.js":{"id":48,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Arrow.js":{"id":49,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.tonumber/index.js":{"id":50,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/index.js":{"id":51,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/CSSTransition.js":{"id":52,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/addClass.js":{"id":53,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/hasClass.js":{"id":54,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/removeClass.js":{"id":55,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/TransitionGroup.js":{"id":56,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/ChildMapping.js":{"id":57,"meta":{}},"../strapi-helper-plugin/node_modules/immutable/dist/immutable.js":{"id":58,"meta":{}},"../strapi-helper-plugin/node_modules/lodash/lodash.js":{"id":59,"meta":{}},"../strapi-helper-plugin/node_modules/webpack/buildin/module.js":{"id":60,"meta":{}}}} +{"name":"vendor_lib","content":{"../strapi-helper-plugin/node_modules/react/index.js":{"id":0,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/index.js":{"id":1,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyFunction.js":{"id":2,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/index.js":{"id":3,"meta":{}},"../strapi-helper-plugin/node_modules/object-assign/index.js":{"id":4,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyObject.js":{"id":5,"meta":{}},"../strapi-helper-plugin/node_modules/intl-messageformat/src/main.js":{"id":6,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/utils.js":{"id":7,"meta":{"harmonyModule":true},"exports":["hop","extend"]},"../strapi-helper-plugin/node_modules/webpack/buildin/global.js":{"id":8,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/Transition.js":{"id":9,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/PropTypes.js":{"id":10,"meta":{}},"../strapi-helper-plugin/node_modules/react/cjs/react.production.min.js":{"id":12,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/cjs/react-dom.production.min.js":{"id":13,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/ExecutionEnvironment.js":{"id":14,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/EventListener.js":{"id":15,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/getActiveElement.js":{"id":16,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/shallowEqual.js":{"id":17,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/containsNode.js":{"id":18,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isTextNode.js":{"id":19,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isNode.js":{"id":20,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/focusNode.js":{"id":21,"meta":{}},"../strapi-helper-plugin/node_modules/react-intl/lib/index.es.js":{"id":22,"meta":{"harmonyModule":true},"exports":["addLocaleData","intlShape","injectIntl","defineMessages","IntlProvider","FormattedDate","FormattedTime","FormattedRelative","FormattedNumber","FormattedPlural","FormattedMessage","FormattedHTMLMessage"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/core.js":{"id":24,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/es5.js":{"id":25,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/compiler.js":{"id":26,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat-parser/src/parser.js":{"id":27,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/en.js":{"id":28,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/main.js":{"id":29,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/core.js":{"id":30,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/diff.js":{"id":31,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/es5.js":{"id":32,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate","arrIndexOf","isArray","dateNow"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/en.js":{"id":33,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/prop-types/factoryWithThrowingShims.js":{"id":34,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/invariant.js":{"id":35,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":36,"meta":{}},"../strapi-helper-plugin/node_modules/invariant/browser.js":{"id":37,"meta":{}},"../strapi-helper-plugin/node_modules/intl-format-cache/src/memoizer.js":{"id":38,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-format-cache/src/es5.js":{"id":39,"meta":{"harmonyModule":true},"exports":["bind","defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/reactstrap/dist/reactstrap.es.js":{"id":40,"meta":{"harmonyModule":true},"exports":["Alert","Container","Row","Col","Navbar","NavbarBrand","NavbarToggler","Nav","NavItem","NavDropdown","NavLink","Breadcrumb","BreadcrumbItem","Button","ButtonDropdown","ButtonGroup","ButtonToolbar","Dropdown","DropdownItem","DropdownMenu","DropdownToggle","Fade","Badge","Card","CardLink","CardGroup","CardDeck","CardColumns","CardBody","CardBlock","CardFooter","CardHeader","CardImg","CardImgOverlay","Carousel","UncontrolledCarousel","CarouselControl","CarouselItem","CarouselIndicators","CarouselCaption","CardSubtitle","CardText","CardTitle","Popover","PopoverContent","PopoverBody","PopoverTitle","PopoverHeader","Progress","Modal","ModalHeader","ModalBody","ModalFooter","PopperContent","PopperTargetHelper","Tooltip","Table","ListGroup","Form","FormFeedback","FormGroup","FormText","Input","InputGroup","InputGroupAddon","InputGroupButton","Label","Media","Pagination","PaginationItem","PaginationLink","TabContent","TabPane","Jumbotron","Collapse","ListGroupItem","ListGroupItemText","ListGroupItemHeading","UncontrolledAlert","UncontrolledButtonDropdown","UncontrolledDropdown","UncontrolledNavDropdown","UncontrolledTooltip"]},"../strapi-helper-plugin/node_modules/classnames/index.js":{"id":41,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isfunction/index.js":{"id":42,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isobject/index.js":{"id":43,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/react-popper.js":{"id":44,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Manager.js":{"id":45,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Target.js":{"id":46,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Popper.js":{"id":47,"meta":{}},"../strapi-helper-plugin/node_modules/popper.js/dist/umd/popper.js":{"id":48,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Arrow.js":{"id":49,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.tonumber/index.js":{"id":50,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/index.js":{"id":51,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/CSSTransition.js":{"id":52,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/addClass.js":{"id":53,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/hasClass.js":{"id":54,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/removeClass.js":{"id":55,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/TransitionGroup.js":{"id":56,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/ChildMapping.js":{"id":57,"meta":{}},"../strapi-helper-plugin/node_modules/immutable/dist/immutable.js":{"id":58,"meta":{}},"../strapi-helper-plugin/node_modules/lodash/lodash.js":{"id":59,"meta":{}},"../strapi-helper-plugin/node_modules/webpack/buildin/module.js":{"id":60,"meta":{}}}} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index d90d9724bc..bce3d6e387 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -32,12 +32,12 @@ "eslint": "^4.11.0", "eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb-base": "^11.3.2", - "eslint-config-prettier": "^2.7.0", + "eslint-config-prettier": "^2.8.0", "eslint-import-resolver-webpack": "^0.8.3", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-import": "^2.8.0", "eslint-plugin-jsx-a11y": "^6.0.2", - "eslint-plugin-react": "^7.4.0", + "eslint-plugin-react": "^7.5.1", "eslint-plugin-redux-saga": "^0.4.0", "plop": "^1.9.0", "prettier": "^1.8.2", diff --git a/scripts/clean.js b/scripts/clean.js new file mode 100644 index 0000000000..74683036fe --- /dev/null +++ b/scripts/clean.js @@ -0,0 +1,13 @@ +const exec = require('child_process').execSync; + +try { + exec('rm -rf package-lock.json && rm -rf packages/*/package-lock.json'); +} catch (error) { + console.error('Delete package-lock.json files'); +} + +try { + exec('git reset ./packages/strapi-admin/.gitignore && git checkout -- ./packages/strapi-admin/.gitignore'); +} catch (error) { + console.error('Reset admin .gitignore'); +}