diff --git a/packages/strapi-generate-plugin/json/package.json.js b/packages/strapi-generate-plugin/json/package.json.js index b3dac1dfa8..82eb92b5f1 100755 --- a/packages/strapi-generate-plugin/json/package.json.js +++ b/packages/strapi-generate-plugin/json/package.json.js @@ -26,21 +26,20 @@ module.exports = scope => { 'description': `Description of ${scope.id} plugin.` }, 'scripts': { - 'analyze:clean': 'rimraf stats.json', + 'analyze:clean': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/rimraf stats.json', 'preanalyze': 'npm run analyze:clean', - 'analyze': 'node node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js', + 'analyze': 'node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js', 'prebuild': 'npm run build:clean && npm run test', - 'build:dev': 'cross-env NODE_ENV=development webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress', - 'build': 'cross-env NODE_ENV=production webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress', - 'build:clean': 'rimraf admin/build', - 'start': 'cross-env NODE_ENV=development node node_modules/strapi-helper-plugin/lib/server', - 'generate': 'plop --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js', - 'lint': 'eslint --ignore-path .gitignore --config node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin', + 'build:dev': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=development node ./node_modules/strapi-helper-plugin/node_modules/.bin/webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress', + 'build': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=production node node_modules/strapi-helper-plugin/node_modules/.bin/webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress', + 'build:clean': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/rimraf admin/build', + 'start': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=development node ./node_modules/strapi-helper-plugin/lib/server', + 'generate': 'node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js', + 'lint': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/eslint --ignore-path .gitignore --config ./node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin', 'pretest': 'npm run lint', - 'prettier': 'prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"', + 'prettier': 'node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write "{admin,__{tests,mocks}__}/**/*.js"', 'test': 'echo Tests are not implemented.', - 'prepublish': 'npm run build', - 'postinstall': 'node node_modules/strapi-helper-plugin/lib/internals/scripts/postinstall.js' + 'prepublishOnly': 'npm run build' }, 'dependencies': {}, 'devDependencies': { diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json index b21d43ffb6..53fe304f08 100644 --- a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json +++ b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"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":{}}}} ->>>>>>> 1f29fde51ae8a03fa3d0303557552c0d6c060229 +{"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-helper-plugin/lib/internals/webpack/webpack.prod.babel.js b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js index ab6086757c..ed82312324 100755 --- a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js +++ b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js @@ -39,9 +39,13 @@ const plugins = [ // Minify and optimize the JavaScript new webpack.optimize.UglifyJsPlugin({ sourceMap: true, + parallel: true, compress: { warnings: false }, + uglifyOptions: { + ecma: 8, + }, }), new webpack.LoaderOptionsPlugin({ minimize: true diff --git a/packages/strapi-helper-plugin/lib/src/app.js b/packages/strapi-helper-plugin/lib/src/app.js index dccf9d8d6d..8ef11811a5 100755 --- a/packages/strapi-helper-plugin/lib/src/app.js +++ b/packages/strapi-helper-plugin/lib/src/app.js @@ -22,17 +22,16 @@ const tryRequireRoot = (source) => { } }; -const tryRequireConfig = (source) => { +const bootstrap = tryRequireRoot('bootstrap'); +const pluginRequirements = tryRequireRoot('requirements'); + +const layout = (() => { try { - return require('../../../../config/' + source + '.js'); + return require('../../../../config/layout.js'); } catch(err) { return null; } -}; - -const bootstrap = tryRequireRoot('bootstrap'); -const pluginRequirements = tryRequireRoot('requirements'); -const layout = tryRequireConfig('layout'); +})(); const injectedComponents = (() => { try { diff --git a/packages/strapi-plugin-users-permissions/config/roles.json b/packages/strapi-plugin-users-permissions/config/roles.json index 0a82683b3a..873db6dbe1 100644 --- a/packages/strapi-plugin-users-permissions/config/roles.json +++ b/packages/strapi-plugin-users-permissions/config/roles.json @@ -256,268 +256,34 @@ } }, "application": { - "controllers": {} - } - } - }, - "1": { - "name": "Guest", - "description": "", - "permissions": { - "content-manager": { "controllers": { - "contentmanager": { - "models": { - "enabled": false, - "policy": "" - }, + "product": { "find": { - "enabled": false, - "policy": "" - }, - "count": { - "enabled": false, - "policy": "" - }, - "findOne": { - "enabled": false, - "policy": "" - }, - "create": { - "enabled": false, - "policy": "" - }, - "update": { - "enabled": false, - "policy": "" - }, - "delete": { - "enabled": false, - "policy": "" - }, - "identity": { - "enabled": false, - "policy": "" - } - } - } - }, - "content-type-builder": { - "controllers": { - "contenttypebuilder": { - "getModels": { - "enabled": false, - "policy": "" - }, - "updateModel": { - "enabled": false, - "policy": "" - }, - "checkTableExists": { - "enabled": false, - "policy": "" - }, - "autoReload": { - "enabled": false, - "policy": "" - }, - "createModel": { - "enabled": false, - "policy": "" - }, - "getModel": { - "enabled": false, - "policy": "" - }, - "deleteModel": { - "enabled": false, - "policy": "" - }, - "identity": { - "enabled": false, - "policy": "" - }, - "getConnections": { - "enabled": false, - "policy": "" - } - } - } - }, - "settings-manager": { - "controllers": { - "settingsmanager": { - "environments": { - "enabled": false, - "policy": "" - }, - "deleteLanguage": { - "enabled": false, - "policy": "" - }, - "updateDatabase": { - "enabled": false, - "policy": "" - }, - "deleteDatabase": { - "enabled": false, - "policy": "" - }, - "autoReload": { - "enabled": false, - "policy": "" - }, - "update": { - "enabled": false, - "policy": "" - }, - "databaseModel": { - "enabled": false, - "policy": "" - }, - "createLanguage": { - "enabled": false, - "policy": "" - }, - "get": { - "enabled": false, - "policy": "" - }, - "createDatabase": { - "enabled": false, - "policy": "" - }, - "databases": { - "enabled": false, - "policy": "" - }, - "languages": { - "enabled": false, - "policy": "" - }, - "database": { - "enabled": false, - "policy": "" - }, - "identity": { - "enabled": false, - "policy": "" - }, - "menu": { - "enabled": false, - "policy": "" - } - } - } - }, - "users-permissions": { - "controllers": { - "auth": { - "callback": { "enabled": true, "policy": "" }, - "register": { + "findOne": { "enabled": true, "policy": "" }, - "forgotPassword": { - "enabled": false, - "policy": "" - }, - "changePassword": { - "enabled": false, - "policy": "" - }, - "identity": { - "enabled": false, - "policy": "" - } - }, - "user": { - "find": { - "enabled": false, - "policy": "" - }, - "findOne": { - "enabled": false, - "policy": "" - }, "create": { - "enabled": false, + "enabled": true, "policy": "" }, "update": { - "enabled": false, + "enabled": true, "policy": "" }, "destroy": { - "enabled": false, - "policy": "" - }, - "identity": { - "enabled": false, - "policy": "" - } - }, - "userspermissions": { - "searchUsers": { - "enabled": false, - "policy": "" - }, - "getRoutes": { - "enabled": false, - "policy": "" - }, - "deleteRole": { - "enabled": false, - "policy": "" - }, - "getPolicies": { - "enabled": false, - "policy": "" - }, - "getRoles": { - "enabled": false, - "policy": "" - }, - "getRole": { - "enabled": false, - "policy": "" - }, - "getPermissions": { - "enabled": false, - "policy": "" - }, - "init": { "enabled": true, "policy": "" }, - "index": { - "enabled": false, - "policy": "" - }, - "createRole": { - "enabled": false, - "policy": "" - }, - "deleteProvider": { - "enabled": false, - "policy": "" - }, "identity": { - "enabled": false, - "policy": "" - }, - "updateRole": { - "enabled": false, + "enabled": true, "policy": "" } } } - }, - "application": { - "controllers": {} } } } diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 32422cdce6..b6b55084c2 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -8,36 +8,38 @@ "description": "users-permissions.plugin.description" }, "scripts": { - "analyze:clean": "rimraf stats.json", + "analyze:clean": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/rimraf stats.json", "preanalyze": "npm run analyze:clean", - "analyze": "node node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js", + "analyze": "node ./node_modules/strapi-helper-plugin/lib/internals/scripts/analyze.js", "prebuild": "npm run build:clean && npm run test", - "build": "cross-env NODE_ENV=production webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress", - "build:clean": "rimraf admin/build", - "start": "cross-env NODE_ENV=development node node_modules/strapi-helper-plugin/lib/server", - "generate": "plop --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js", - "lint": "eslint --ignore-path .gitignore --config node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin", + "build:dev": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=development node ./node_modules/strapi-helper-plugin/node_modules/.bin/webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress", + "build": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=production node node_modules/strapi-helper-plugin/node_modules/.bin/webpack --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress", + "build:clean": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/rimraf admin/build", + "start": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/cross-env NODE_ENV=development node ./node_modules/strapi-helper-plugin/lib/server", + "generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js", + "lint": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/eslint --ignore-path .gitignore --config ./node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin", "pretest": "npm run lint", - "prettier": "prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"", + "prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"", "test": "echo Tests are not implemented.", - "prepublish": "npm run build", - "postinstall": "node node_modules/strapi-helper-plugin/lib/internals/scripts/postinstall.js" + "prepublishOnly": "npm run build" }, "dependencies": { "bcryptjs": "^2.4.3", - "jsonwebtoken": "^8.1.0", + "jsonwebtoken": "^8.1.0" + }, + "devDependencies": { "strapi-helper-plugin": "3.0.0-alpha.6.7" }, "author": { - "name": "A Strapi developer", - "email": "", - "url": "" + "name": "Strapi team", + "email": "hi@strapi.io", + "url": "http://strapi.io" }, "maintainers": [ { - "name": "A Strapi developer", - "email": "", - "url": "" + "name": "Strapi team", + "email": "hi@strapi.io", + "url": "http://strapi.io" } ], "engines": { @@ -61,4 +63,4 @@ "rimraf": "^2.6.2", "webpack": "^3.9.1" } -} \ No newline at end of file +} diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js index 6005c36f91..a7d4aa119b 100644 --- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js +++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js @@ -48,7 +48,6 @@ module.exports = { }, getActions: () => { - console.log(strapi); const generateActions = (data) => ( Object.keys(data).reduce((acc, key) => { acc[key] = { enabled: false, policy: '' };