Merge branch 'master' into master

docs/.vuepress/config.js

@@ -49,25 +49,39 @@ module.exports = {
     docsDir: 'docs',
     editLinks: true,
     editLinkText: 'Improve this page',
-    // base: '/',
-    // host: 'localhost',
     serviceWorker: true,
     sidebar: {
       '/3.x.x/': [
         {
           collapsable: false,
-          title: 'UsefulLinks',
+          title: 'Getting started',
           children: [
-            ['/3.x.x/', 'Introduction'],
+            '/3.x.x/getting-started/installation',
-            ['https://strapi.io', 'Strapi Website'],
+            '/3.x.x/getting-started/quick-start',
-            ['https://github.com/strapi/strapi', 'GitHub Repository'],
+            '/3.x.x/concepts/concepts',
-            ['https://github.com/strapi/strapi/blob/master/CONTRIBUTING.md', 'Contribution Guide'],
           ],
         },
         {
           collapsable: false,
-          title: 'Getting started',
+          title: 'Guides',
-          children: ['/3.x.x/getting-started/installation', '/3.x.x/getting-started/quick-start'],
+          children: [
+            '/3.x.x/guides/authentication.md',
+            '/3.x.x/configurations/configurations.md',
+            '/3.x.x/guides/controllers.md',
+            '/3.x.x/guides/deployment.md',
+            '/3.x.x/guides/email.md',
+            '/3.x.x/guides/upload.md',
+            '/3.x.x/guides/filters.md',
+            '/3.x.x/guides/graphql.md',
+            '/3.x.x/guides/i18n.md',
+            '/3.x.x/guides/models.md',
+            '/3.x.x/guides/policies.md',
+            '/3.x.x/guides/public-assets.md',
+            '/3.x.x/guides/requests.md',
+            '/3.x.x/guides/responses.md',
+            '/3.x.x/guides/routing.md',
+            '/3.x.x/guides/services.md',
+          ],
         },
         {
           collapsable: false,
@@ -75,27 +89,9 @@ module.exports = {
           children: [
             '/3.x.x/api-reference/reference',
             '/3.x.x/cli/CLI',
-            '/3.x.x/concepts/concepts',
             '/3.x.x/configurations/configurations',
           ],
         },
-        {
-          collapsable: false,
-          title: 'Guides',
-          children: [
-            '/3.x.x/guides/authentication',
-            '/3.x.x/guides/controllers',
-            '/3.x.x/guides/deployment',
-            '/3.x.x/guides/email',
-            '/3.x.x/guides/filters',
-            '/3.x.x/guides/graphql',
-            '/3.x.x/guides/i18n',
-            '/3.x.x/guides/models',
-            '/3.x.x/guides/policies',
-            '/3.x.x/guides/public-assets',
-            '/3.x.x/guides/requests',
-          ],
-        },
         {
           collapsable: false,
           title: 'Advanced',
@@ -109,8 +105,9 @@ module.exports = {
         },
         {
           collapsable: false,
-          title: 'Help',
+          title: 'Resources',
           children: [
+            ['https://github.com/strapi/strapi/blob/master/CONTRIBUTING.md', 'Contributing guide'],
             ['https://github.com/strapi/strapi/wiki', 'Migration guides'],
             '/3.x.x/tutorials/',
           ],

docs/3.x.x/README.md

@@ -11,28 +11,3 @@ The most advanced open-source Content Management Framework to build powerful API
 [![Heroku Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/strapi/strapi-heroku-app)<!-- {height=20} -->
 <!-- {p:.flex.justify-around} -->
 :::
-
-## v3@alpha.14.2 is available!
-We've been working on a major update for Strapi during the past months, rewriting the core framework and the dashboard.
-
-This documentation is only related to Strapi v3@alpha.14.2 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
-
-**[Get Started](getting-started/installation.md)**<br />
-Learn how to install Strapi and start developing your API.
-
-**[Command Line Interface](cli/CLI.md)**<br />
-Get to know our CLI to make features the hacker way!
-
-**[Concepts](concepts/concepts.md)**<br />
-Get to know more about Strapi and how it works.
-
-**[Guides](configurations/configurations.md)**<br />
-Get familiar with Strapi. Discover concrete examples on how to develop the features you need.
-
-**[Plugin Development](plugin-development/quick-start.md)**<br />
-Understand how to develop your own plugin.
-
-**[API Reference](api-reference/reference.md)**<br />
-Learn about Strapi's API, the `strapi` object that is available in your backend.
-
-**[Migration guide](migration/migration-guide.md)**<br />

docs/3.x.x/guides/deployment.md

@@ -1,6 +1,6 @@
 # Deployment
 
-#### #1 - Configurate
+#### #1 - Configure
 
 Update the `production` settings with the IP and domain name where the project will be running.
 

docs/3.x.x/styles/website.css

@@ -1,25 +0,0 @@
-li.header{
-  color: #101622 !important;
-  font-weight: 600;
-  letter-spacing: 0.07rem;
-  -webkit-font-smoothing: subpixel-antialiased;
-}
-
-li.chapter > a{
-  transition: background-color 0.15s ease;
-  -webkit-transition: background-color 0.15s ease;
-}
-
-li.chapter:hover > a{
-  background: #eee !important;
-  text-decoration: none !important;
-}
-
-.versions-select select{
-  height: 36px;
-  border: 1px solid #ccc;
-}
-
-.book-summary{
-  background-color: #f7f7f7 !important;
-}

package.json

@@ -11,13 +11,11 @@
     "eslint-plugin-babel": "^4.0.0",
     "eslint-plugin-react": "^6.8.0",
     "eslint-plugin-redux-saga": "^0.3.0",
-    "gitbook-cli": "^2.3.2",
     "istanbul": "~0.4.2",
     "jest": "^22.4.3",
     "jest-cli": "^22.4.4",
     "lerna": "^2.0.0",
     "lodash": "^4.17.5",
-    "mocha": "~2.4.5",
     "pre-commit": "~1.1.2",
     "redux-saga": "^0.14.3",
     "request": "^2.87.0",

packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json

@@ -1,114 +0,0 @@
-{
-  "parser": "babel-eslint",
-  "extends": [
-    "airbnb",
-    "prettier",
-    "eslint:recommended"
-  ],
-  "env": {
-    "browser": true,
-    "node": true,
-    "mocha": true,
-    "es6": true
-  },
-  "plugins": [
-    "redux-saga",
-    "react",
-    "jsx-a11y"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 7,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "impliedStrict": true,
-      "jsx": true
-    }
-  },
-  "rules": {
-    "comma-dangle": [
-      2,
-      "always-multiline"
-    ],
-    "import/newline-after-import": 0,
-    "import/no-dynamic-require": 0,
-    "import/no-extraneous-dependencies": 0,
-    "import/no-named-as-default": 0,
-    "import/no-unresolved": 2,
-    "import/prefer-default-export": 0,
-    "import/order": [
-      "error",
-      {
-        "groups": [
-          "builtin",
-          "external",
-          "internal",
-          "parent",
-          "sibling",
-          "index"
-        ]
-      }
-    ],
-    "import/imports-first": 2,
-    "indent": [
-      2,
-      2,
-      {
-        "SwitchCase": 1
-      }
-    ],
-    "jsx-a11y/aria-props": 2,
-    "jsx-a11y/no-static-element-interactions": 0,
-    "jsx-a11y/heading-has-content": 0,
-    "jsx-a11y/interactive-supports-focus": 0,
-    "jsx-a11y/label-has-for": 2,
-    "jsx-a11y/mouse-events-have-key-events": 2,
-    "jsx-a11y/role-has-required-aria-props": 2,
-    "jsx-a11y/role-supports-aria-props": 2,
-    "jsx-a11y/href-no-hash": "off",
-    "jsx-a11y/anchor-is-valid": ["warn", { "aspects": ["invalidHref"] }],
-    "jsx-a11y/no-noninteractive-element-interactions": 0,
-    "max-len": 0,
-    "newline-per-chained-call": 0,
-    "no-console": 1,
-    "no-use-before-define": 0,
-    "prefer-template": 2,
-    "class-methods-use-this": 0,
-    "react/react-in-jsx-scope": 0,
-    "react/forbid-prop-types": 0,
-    "react/jsx-first-prop-new-line": [
-      2,
-      "multiline"
-    ],
-    "react/jsx-filename-extension": 0,
-    "react/jsx-no-target-blank": 0,
-    "react/no-did-mount-set-state": 0,
-    "react/require-extension": 0,
-    "react/self-closing-comp": 0,
-    "redux-saga/no-yield-in-race": 2,
-    "redux-saga/yield-effects": 2,
-    "require-yield": 0,
-    "react/forbid-prop-types": 0,
-    "react/no-unescaped-entities": 0,
-    "react/prefer-stateless-function": 0,
-    "react/sort-prop-types": 2,
-    "react/require-default-props": 2,
-    "no-undef": 0,
-    "react/no-array-index-key": 0,
-    "react/sort-comp": 0,
-    "react/jsx-handler-names": [
-      2,
-      {
-        "eventHandlerPrefix": "handle",
-        "eventHandlerPropPrefix": "on"
-      }
-    ],
-    "semi": 2
-  },
-  "settings": {
-    "import/resolver": {
-      "webpack": {
-        "config": "node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.test.babel.js"
-      }
-    }
-  }
-}

packages/strapi-helper-plugin/lib/internals/eslint/eslint-config.js

@@ -1,8 +0,0 @@
-const config = require('./.eslintrc.json');
-
-// Update the eslint configuration for `strapi-helper-plugin` module
-if (process.env.IS_HELPER) {
-  config.settings['import/resolver'].webpack.config = './lib/internals/webpack/webpack.test.babel.js';
-}
-
-module.exports = config;

packages/strapi-helper-plugin/package.json

@@ -30,7 +30,6 @@
     "add-asset-html-webpack-plugin": "^2.1.2",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^7.2.3",
     "babel-loader": "^7.1.1",
     "babel-plugin-istanbul": "^4.1.5",
     "babel-plugin-styled-components": "^1.5.1",
@@ -39,7 +38,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-react-constant-elements": "^6.23.0",
     "babel-plugin-transform-react-inline-elements": "^6.22.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.18",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
@@ -51,15 +50,6 @@
     "copy-webpack-plugin": "^4.3.1",
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.5",
-    "eslint": "4.4.1",
-    "eslint-config-airbnb": "15.1.0",
-    "eslint-config-airbnb-base": "11.3.1",
-    "eslint-config-prettier": "2.3.0",
-    "eslint-import-resolver-webpack": "0.8.3",
-    "eslint-plugin-import": "2.8.0",
-    "eslint-plugin-jsx-a11y": "6.0.2",
-    "eslint-plugin-react": "7.2.1",
-    "eslint-plugin-redux-saga": "0.4.0",
     "exports-loader": "^0.6.4",
     "express": "^4.15.4",
     "extract-text-webpack-plugin": "^3.0.0",
@@ -67,15 +57,14 @@
     "history": "^4.6.3",
     "html-loader": "^0.5.1",
     "html-webpack-plugin": "^2.30.1",
-    "image-webpack-loader": "^3.3.1",
+    "image-webpack-loader": "^4.3.1",
-    "immutable": "^3.8.1",
+    "immutable": "^3.8.2",
     "imports-loader": "^0.7.1",
     "intl": "^1.2.5",
     "invariant": "2.2.1",
     "json-loader": "^0.5.7",
     "lodash": "^4.17.5",
     "lodash-webpack-plugin": "^0.11.4",
-    "mocha": "3.1.2",
     "moment": "^2.16.0",
     "node-sass": "^4.5.3",
     "null-loader": "^0.1.1",
@@ -88,29 +77,29 @@
     "precss": "^2.0.0",
     "prettier": "^1.5.3",
     "prop-types": "^15.5.10",
-    "react": "^16.0.0",
+    "react": "^16.5.2",
-    "react-datetime": "^2.8.6",
+    "react-datetime": "^2.15.0",
     "react-dnd": "^5.0.0",
     "react-dnd-html5-backend": "^5.0.1",
-    "react-dom": "^16.0.0",
+    "react-dom": "^16.5.2",
     "react-helmet": "^5.1.3",
-    "react-intl": "^2.3.0",
+    "react-intl": "^2.7.0",
-    "react-loadable": "^5.3.1",
+    "react-loadable": "^5.5.0",
-    "react-redux": "^5.0.6",
+    "react-redux": "^5.0.7",
-    "react-router-dom": "^4.1.2",
+    "react-router-dom": "^4.3.1",
-    "react-router-redux": "^5.0.0-alpha.6",
+    "react-router-redux": "^5.0.0-alpha.9",
-    "react-transition-group": "^2.2.0",
+    "react-transition-group": "^2.5.0",
-    "reactstrap": "^5.0.0-alpha.3",
+    "reactstrap": "^5.0.0",
-    "redux": "^3.7.2",
+    "redux": "^4.0.0",
     "redux-immutable": "^4.0.0",
-    "redux-saga": "^0.15.6",
+    "redux-saga": "^0.16.0",
     "reselect": "^3.0.1",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.6",
     "shelljs": "^0.7.8",
     "style-loader": "^0.18.2",
-    "styled-components": "3.2.6",
+    "styled-components": "^3.2.6",
-    "url-loader": "^0.5.9",
+    "url-loader": "^1.1.1",
     "webpack": "^3.5.5",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-middleware": "^1.12.0",

packages/strapi-hook-mongoose/package.json

@@ -16,7 +16,7 @@
   "main": "./lib",
   "dependencies": {
     "lodash": "^4.17.5",
-    "mongoose": "^5.0.16",
+    "mongoose": "^5.2.17",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
     "rimraf": "^2.6.2",

packages/strapi-plugin-content-manager/admin/src/translations/pl.json

@@ -49,7 +49,15 @@
   "containers.SettingPage.addField": "Dodaj nowy atrybut",
   "containers.SettingPage.editSettings.description": "Przeciągnij i upuś pola by zbudować układ",
   "containers.SettingPage.editSettings.title": "Edycja - Ustawienia",
-  "containers.SettingPage.relations": "Relational fields",
+  "containers.SettingPage.relations": "Pola relacyjne",
+  "containers.SettingPage.addRelationalField": "Dodaj nowe pola relacyjne",
+  "containers.SettingPage.attributes": "Pola atrybutów",
+  "containers.SettingPage.listSettings.description": "Skonfiguruj opcje dla tego typu zawartości",
+  "containers.SettingPage.pluginHeaderDescription": "Skonfiguruj specificzne ustawienia tego Typu Zawartości",
+  "containers.SettingsPage.Block.contentType.description": "Skonfiguruj specyficzne ustawienia",
+  "containers.SettingsPage.Block.contentType.title": "Typy zawartości",
+  "containers.SettingsPage.Block.generalSettings.description": "Skonfiguruj domyślne opcje twoich Typów Zawartości",
+  "containers.SettingsPage.pluginHeaderDescription": "Skonfiguruj domyślne opcje wszystkich twoich Typów Zawartości",
   "emptyAttributes.button": "Przejdź do konstruktora modeli",
   "emptyAttributes.description": "Dodaj swoje pierwszy atrybut do modelu",
   "emptyAttributes.title": "Nie ma jeszcze żadnych atrybutów",
@@ -84,6 +92,7 @@
   "form.Input.filters": "Włącz filtry",
   "form.Input.label.inputDescription": "Ta wartość nadpisuje etykietę wyświetlaną w nagłówku tabeli",
   "form.Input.pageEntries": "Wpisy per strona",
+  "form.Input.pageEntries.inputDescription": "Uwaga: Możesz zmienić tę wartość na stronie ustawień Typów Zawartości.",
   "form.Input.search": "Włącz wyszukiwanie",
   "form.Input.search.field": "Włącz wyszukiwanie po tym polu",
   "form.Input.sort.field": "Włącz sortowanie po tym polu",

packages/strapi-plugin-upload/admin/src/components/Li/index.js

@@ -56,7 +56,7 @@ class Li extends React.Component {
 
   handleClick = (e) => {
     e.preventDefault();
-    const aTag = document.getElementById('aTag');
+    const aTag = document.getElementById(this.props.item.hash);
     aTag.click();
   }
 
@@ -103,7 +103,7 @@ class Li extends React.Component {
     return (
       <CopyToClipboard text={item.url} onCopy={() => this.setState({copied: true})}>
         <li className={styles.liWrapper}>
-          <a href={item.url} target="_blank" style={{ display: 'none' }} id="aTag">nothing</a>
+          <a href={item.url} target="_blank" style={{ display: 'none' }} id={item.hash}>nothing</a>
           <div className={styles.liContainer}>
             <div>
               <div />

packages/strapi/bin/strapi-install.js

@@ -15,6 +15,9 @@ const shell = require('shelljs');
 // Logger.
 const { cli, logger, packageManager } = require('strapi-utils');
 
+// Local Strapi dependencies.
+const packageJSON = require('../package.json');
+
 /**
  * `$ strapi install`
  *
@@ -66,7 +69,7 @@ module.exports = function (plugin, cliArguments) {
       fs.writeFileSync(`${pluginPath}/package.json`, JSON.stringify({}), 'utf8');
     }
 
-    const cmd = isStrapiInstalledWithNPM ? `npm install ${pluginID}@alpha --ignore-scripts --no-save --prefix ${pluginPath}` : `yarn --cwd ${pluginPath} add ${pluginID}@alpha --ignore-scripts --no-save`;
+    const cmd = isStrapiInstalledWithNPM ? `npm install ${pluginID}@${packageJSON.version} --ignore-scripts --no-save --prefix ${pluginPath}` : `yarn --cwd ${pluginPath} add ${pluginID}@${packageJSON.version} --ignore-scripts --no-save`;
     exec(cmd, (err) => {
       if (err) {
         logger.error(`An error occurred during plugin installation. \nPlease make sure this plugin is available on npm: https://www.npmjs.com/package/${pluginID}`);

scripts/test.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ -z "$TEST_GREP" ]; then
-   TEST_GREP=""
-fi
-
-node node_modules/mocha/bin/_mocha `scripts/_get-test-directories.sh` --opts test/mocha.opts --grep "$TEST_GREP"