yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Jim Laurie 2017-07-24 16:02:14 +02:00
commit 51fb73c7a2
38 changed files with 24830 additions and 2311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -5,22 +5,20 @@ git:
language: node_js language: node_js
cache: node_js:
yarn: true - "7"
directories: - "8"
- node_modules
before_install: before_install:
- export CHROME_BIN=chromium-browser - export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
- npm i -g npm@latest
- npm -v
- sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}
install: install:
- npm install --unsafe-perm - npm install
node_js:
- "7"
- "8"
script: script:
- npm run test - npm run test

4
README.md
View File

@ -10,11 +10,11 @@
## v3.0.0 coming soon... ## v3.0.0 coming soon...
We've been working on a major update to Strapi for several months now, rewriting the core framework and the dashboard. Some parts of this work have been merged into our master branch. Currently, this is not stable and ready. We've been working on a major update to Strapi for several months now, rewriting the core framework and the dashboard. Some parts of this work have been merged into our master branch. Currently, this is not stable and ready.
**Please DON'T use the `master` branch in production. To run and start your current project, we strongly recommend to use the v1.5.4.** **Please DON'T use the `master` branch in production. To run and start your current project, we strongly recommend to use the v1.5.6.**
For more information on the upcoming version, please take a look to our [ROADMAP](ROADMAP.md). For more information on the upcoming version, please take a look to our [ROADMAP](ROADMAP.md).
![Content Manager Plugin - Screenshot](http://blog.strapi.io/content/images/2016/10/export_cm.png) ![Content Manager Plugin - Screenshot](http://blog.strapi.io/content/images/2017/07/preview-readme-9.png)
## Why Strapi ? ## Why Strapi ?

4
lerna.json
View File

@ -1,7 +1,9 @@
{ {
"lerna": "2.0.0", "lerna": "2.0.0",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"packages": ["packages/*"], "packages": [
"packages/*"
],
"commands": { "commands": {
"bootstrap": { "bootstrap": {
"ignore": "strapi-plugin-*" "ignore": "strapi-plugin-*"

39
package-lock.json generated
View File

@ -3,16 +3,6 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"JSONStream": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
"dev": true,
"requires": {
"jsonparse": "1.3.1",
"through": "2.3.8"
}
},
"abbrev": { "abbrev": {
"version": "1.0.9", "version": "1.0.9",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
@ -878,8 +868,13 @@
"integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=", "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
"dev": true, "dev": true,
"requires": { "requires": {
<<<<<<< HEAD
"JSONStream": "1.3.1", "JSONStream": "1.3.1",
"is-text-path": "1.0.1", "is-text-path": "1.0.1",
=======
"is-text-path": "1.0.1",
"JSONStream": "1.3.1",
>>>>>>> bec935a8be6da28262276a312ab550df936cb990
"lodash": "4.17.4", "lodash": "4.17.4",
"meow": "3.7.0", "meow": "3.7.0",
"split2": "2.1.1", "split2": "2.1.1",
@ -2595,6 +2590,19 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true "dev": true
}, },
<<<<<<< HEAD
=======
"JSONStream": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
"dev": true,
"requires": {
"jsonparse": "1.3.1",
"through": "2.3.8"
}
},
>>>>>>> bec935a8be6da28262276a312ab550df936cb990
"jsprim": { "jsprim": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
@ -4321,6 +4329,14 @@
"winston": "2.3.1" "winston": "2.3.1"
} }
}, },
<<<<<<< HEAD
=======
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
>>>>>>> bec935a8be6da28262276a312ab550df936cb990
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@ -4332,11 +4348,14 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
<<<<<<< HEAD
"string_decoder": { "string_decoder": {
"version": "0.10.31", "version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
}, },
=======
>>>>>>> bec935a8be6da28262276a312ab550df936cb990
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",

2
package.json
View File

@ -23,7 +23,7 @@
"scripts": { "scripts": {
"test": "make test", "test": "make test",
"removefiledependencies": "node ./scripts/removefiledependencies.js", "removefiledependencies": "node ./scripts/removefiledependencies.js",
"postinstall": "lerna bootstrap --stream --hoist && node ./scripts/setup.js && node ./scripts/removefiledependencies.js" "postinstall": "rm -rf packages/*/node_modules && node ./scripts/setup.js"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",

81
packages/strapi-admin/files/public/package-lock.json generated
View File

@ -4,16 +4,6 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"JSONStream": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
"integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
"dev": true,
"requires": {
"jsonparse": "0.0.5",
"through": "2.3.8"
}
},
"abab": { "abab": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@ -6165,6 +6155,15 @@
} }
} }
}, },
"string_decoder": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@ -6176,15 +6175,6 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@ -8623,6 +8613,16 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true "dev": true
}, },
"JSONStream": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
"integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
"dev": true,
"requires": {
"jsonparse": "0.0.5",
"through": "2.3.8"
}
},
"jsprim": { "jsprim": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
@ -9276,6 +9276,12 @@
"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
"dev": true "dev": true
}, },
"lodash.mergewith": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
"integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
"dev": true
},
"lodash.noop": { "lodash.noop": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz", "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
@ -9941,9 +9947,9 @@
} }
}, },
"node-sass": { "node-sass": {
"version": "3.13.1", "version": "4.5.3",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.13.1.tgz", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
"integrity": "sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I=", "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",
"dev": true, "dev": true,
"requires": { "requires": {
"async-foreach": "0.1.3", "async-foreach": "0.1.3",
@ -9955,13 +9961,15 @@
"in-publish": "2.0.0", "in-publish": "2.0.0",
"lodash.assign": "4.2.0", "lodash.assign": "4.2.0",
"lodash.clonedeep": "4.5.0", "lodash.clonedeep": "4.5.0",
"lodash.mergewith": "4.6.0",
"meow": "3.7.0", "meow": "3.7.0",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"nan": "2.6.2", "nan": "2.6.2",
"node-gyp": "3.6.2", "node-gyp": "3.6.2",
"npmlog": "4.1.2", "npmlog": "4.1.2",
"request": "2.81.0", "request": "2.81.0",
"sass-graph": "2.2.4" "sass-graph": "2.2.4",
"stdout-stream": "1.4.0"
} }
}, },
"node-status-codes": { "node-status-codes": {
@ -13625,6 +13633,15 @@
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
}, },
"stdout-stream": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
"integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
"dev": true,
"requires": {
"readable-stream": "2.3.3"
}
},
"stream-browserify": { "stream-browserify": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@ -13679,6 +13696,15 @@
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
}, },
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"string-template": { "string-template": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz", "resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz",
@ -13696,15 +13722,6 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"stringify-object": { "stringify-object": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-2.4.0.tgz", "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-2.4.0.tgz",

2
packages/strapi-admin/files/public/package.json
View File

@ -258,7 +258,7 @@
"minimist": "1.2.0", "minimist": "1.2.0",
"mocha": "3.0.2", "mocha": "3.0.2",
"ngrok": "2.2.2", "ngrok": "2.2.2",
"node-sass": "^3.8.0", "node-sass": "^4.5.3",
"null-loader": "0.1.1", "null-loader": "0.1.1",
"offline-plugin": "3.4.2", "offline-plugin": "3.4.2",
"plop": "1.5.0", "plop": "1.5.0",

6
packages/strapi-admin/package.json
View File

@ -14,7 +14,7 @@
"dependencies": { "dependencies": {
"fs-extra": "^0.30.0", "fs-extra": "^0.30.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"strapi-utils": "^3.0.0-alpha.4" "strapi-utils": "file:../strapi-utils"
}, },
"scripts": { "scripts": {
"test": "cd files/public && npm run test", "test": "cd files/public && npm run test",
@ -40,8 +40,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

4
packages/strapi-bookshelf/package.json
View File

@ -50,8 +50,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

4
packages/strapi-ejs/package.json
View File

@ -42,8 +42,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

6
packages/strapi-generate-admin/package.json
View File

@ -15,7 +15,7 @@
"dependencies": { "dependencies": {
"fs-extra": "^0.30.0", "fs-extra": "^0.30.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"strapi-admin": "^3.0.0-alpha.4" "strapi-admin": "file:../strapi-admin"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
@ -37,8 +37,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

1
packages/strapi-generate-api/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-api", "name": "strapi-generate-api",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",

4
packages/strapi-generate-api/package.json
View File

@ -39,8 +39,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

1
packages/strapi-generate-controller/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-controller", "name": "strapi-generate-controller",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",

4
packages/strapi-generate-controller/package.json
View File

@ -39,8 +39,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

4
packages/strapi-generate-migrations/package.json
View File

@ -49,8 +49,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

1
packages/strapi-generate-model/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-model", "name": "strapi-generate-model",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",

4
packages/strapi-generate-model/package.json
View File

@ -39,8 +39,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

2
packages/strapi-generate-new/json/package.json.js
View File

@ -35,7 +35,7 @@ module.exports = scope => {
}, },
'main': './server.js', 'main': './server.js',
'scripts': { 'scripts': {
'start': 'node --harmony-async-await server.js', 'start': 'node server.js',
'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI, 'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI,
'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js' 'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js'
}, },

6
packages/strapi-generate-new/package.json
View File

@ -16,7 +16,7 @@
"enpeem": "^2.2.0", "enpeem": "^2.2.0",
"fs-extra": "^1.0.0", "fs-extra": "^1.0.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"strapi-utils": "^3.0.0-alpha.4" "strapi-utils": "file:../strapi-utils"
}, },
"scripts": { "scripts": {
"prepublish": "npm prune" "prepublish": "npm prune"
@ -41,8 +41,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

57
packages/strapi-generate-plugin/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-plugin", "name": "strapi-generate-plugin",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
@ -12,11 +11,7 @@
"brace-expansion": { "brace-expansion": {
"version": "1.1.8", "version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI="
"requires": {
"balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
@ -26,14 +21,7 @@
"fs-extra": { "fs-extra": {
"version": "0.30.0", "version": "0.30.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A="
"requires": {
"graceful-fs": "4.1.11",
"jsonfile": "2.4.0",
"klaw": "1.3.1",
"path-is-absolute": "1.0.1",
"rimraf": "2.6.1"
}
}, },
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
@ -43,15 +31,7 @@
"glob": { "glob": {
"version": "7.1.2", "version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
"requires": {
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
}
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.11", "version": "4.1.11",
@ -61,11 +41,7 @@
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
}
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
@ -75,18 +51,12 @@
"jsonfile": { "jsonfile": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug="
"requires": {
"graceful-fs": "4.1.11"
}
}, },
"klaw": { "klaw": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk="
"requires": {
"graceful-fs": "4.1.11"
}
}, },
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",
@ -96,18 +66,12 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
"requires": {
"brace-expansion": "1.1.8"
}
}, },
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
"requires": {
"wrappy": "1.0.2"
}
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
@ -122,10 +86,7 @@
"rimraf": { "rimraf": {
"version": "2.6.1", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0="
"requires": {
"glob": "7.1.2"
}
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",

4
packages/strapi-generate-plugin/package.json
View File

@ -40,8 +40,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

1
packages/strapi-generate-policy/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-policy", "name": "strapi-generate-policy",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",

4
packages/strapi-generate-policy/package.json
View File

@ -39,8 +39,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

1
packages/strapi-generate-service/package-lock.json generated
View File

@ -2,7 +2,6 @@
"name": "strapi-generate-service", "name": "strapi-generate-service",
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",

4
packages/strapi-generate-service/package.json
View File

@ -39,8 +39,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

6
packages/strapi-generate/package.json
View File

@ -17,7 +17,7 @@
"fs-extra": "^1.0.0", "fs-extra": "^1.0.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"reportback": "^2.0.1", "reportback": "^2.0.1",
"strapi-utils": "^3.0.0-alpha.4" "strapi-utils": "file:../strapi-utils"
}, },
"scripts": { "scripts": {
"prepublish": "npm prune" "prepublish": "npm prune"
@ -42,8 +42,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

15697
packages/strapi-helper-plugin/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
packages/strapi-helper-plugin/package.json
View File

@ -3,8 +3,8 @@
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"description": "Helper for Strapi plugins development", "description": "Helper for Strapi plugins development",
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
@ -99,7 +99,7 @@
"json-loader": "0.5.4", "json-loader": "0.5.4",
"lint-staged": "3.2.0", "lint-staged": "3.2.0",
"mocha": "3.1.2", "mocha": "3.1.2",
"node-sass": "3.13.1", "node-sass": "4.5.3",
"null-loader": "0.1.1", "null-loader": "0.1.1",
"plop": "1.5.0", "plop": "1.5.0",
"postcss-cssnext": "2.11.0", "postcss-cssnext": "2.11.0",

4
packages/strapi-knex/package.json
View File

@ -46,8 +46,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.0.0"
}, },
"license": "MIT" "license": "MIT"
} }

6
packages/strapi-mongoose/package.json
View File

@ -20,7 +20,7 @@
"mongoose-double": "0.0.1", "mongoose-double": "0.0.1",
"mongoose-float": "^1.0.2", "mongoose-float": "^1.0.2",
"pluralize": "^3.1.0", "pluralize": "^3.1.0",
"strapi-utils": "^3.0.0-alpha.4" "strapi-utils": "file:../strapi-utils"
}, },
"strapi": { "strapi": {
"isHook": true "isHook": true
@ -48,8 +48,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

11068
packages/strapi-plugin-content-manager/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

6
packages/strapi-plugin-content-manager/package.json
View File

@ -3,8 +3,8 @@
"version": "3.0.0-alpha.4", "version": "3.0.0-alpha.4",
"description": "A powerful UI to easily manage your data.", "description": "A powerful UI to easily manage your data.",
"engines": { "engines": {
"npm": ">=3", "node": ">= 8.0.0",
"node": ">=5" "npm": ">= 5.3.0"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
@ -48,6 +48,6 @@
"react-select": "^1.0.0-rc.5" "react-select": "^1.0.0-rc.5"
}, },
"devDependencies": { "devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.4" "strapi-helper-plugin": "^3.0.0-alpha.4"
} }
} }

4
packages/strapi-redis/package.json
View File

@ -46,8 +46,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

4
packages/strapi-utils/package.json
View File

@ -46,8 +46,8 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"license": "MIT" "license": "MIT"
} }

16
packages/strapi/package-lock.json generated
View File

@ -1580,6 +1580,14 @@
} }
} }
}, },
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
@ -1590,14 +1598,6 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"bundled": true, "bundled": true,

28
packages/strapi/package.json
View File

@ -63,14 +63,17 @@
"node-schedule": "^1.2.3", "node-schedule": "^1.2.3",
"semver": "^5.3.0", "semver": "^5.3.0",
"socket.io": "^1.7.4", "socket.io": "^1.7.4",
"strapi-generate": "^3.0.0-alpha.4", "strapi-generate": "file:../strapi-generate",
"strapi-generate-admin": "^3.0.0-alpha.4", "strapi-generate-admin": "file:../strapi-generate-admin",
"strapi-generate-api": "^3.0.0-alpha.4", "strapi-generate-api": "file:../strapi-generate-api",
"strapi-generate-new": "^3.0.0-alpha.4", "strapi-generate-new": "file:../strapi-generate-new",
"strapi-generate-policy": "^3.0.0-alpha.4", "strapi-generate-policy": "file:../strapi-generate-policy",
"strapi-generate-service": "^3.0.0-alpha.4", "strapi-generate-service": "file:../strapi-generate-service",
"strapi-mongoose": "^3.0.0-alpha.4", "strapi-mongoose": "file:../strapi-mongoose",
"strapi-utils": "^3.0.0-alpha.4" "strapi-utils": "file:../strapi-utils"
},
"devDependencies": {
"forever-monitor": "^1.7.1"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
@ -92,12 +95,9 @@
"url": "https://github.com/strapi/strapi/issues" "url": "https://github.com/strapi/strapi/issues"
}, },
"engines": { "engines": {
"node": ">= 7.0.0", "node": ">= 8.0.0",
"npm": ">= 3.0.0" "npm": ">= 5.3.0"
}, },
"preferGlobal": true, "preferGlobal": true,
"license": "MIT", "license": "MIT"
"devDependencies": {
"forever-monitor": "^1.7.1"
}
} }

8
scripts/setup.js
View File

@ -6,10 +6,6 @@ shell.rm('-f', '/usr/local/bin/strapi.js');
shell.echo('Linking Strapi CLI...'); shell.echo('Linking Strapi CLI...');
shell.cd('packages/strapi-utils'); shell.cd('packages/strapi-utils');
shell.exec('npm link'); shell.exec('npm link');
shell.cd('../strapi-knex');
shell.exec('npm link');
shell.cd('../strapi-ejs');
shell.exec('npm link');
shell.cd('../strapi-generate'); shell.cd('../strapi-generate');
shell.exec('npm install ../strapi-utils && npm link'); shell.exec('npm install ../strapi-utils && npm link');
shell.cd('../strapi-admin'); shell.cd('../strapi-admin');
@ -20,9 +16,5 @@ shell.cd('../strapi-generate-new');
shell.exec('npm install ../strapi-utils && npm link'); shell.exec('npm install ../strapi-utils && npm link');
shell.cd('../strapi-mongoose'); shell.cd('../strapi-mongoose');
shell.exec('npm install ../strapi-utils && npm link'); shell.exec('npm install ../strapi-utils && npm link');
shell.cd('../strapi-bookshelf');
shell.exec('npm install ../strapi-utils && npm link');
shell.cd('../strapi-redis');
shell.exec('npm install ../strapi-utils && npm link');
shell.cd('../strapi'); shell.cd('../strapi');
shell.exec('npm install ../strapi-generate ../strapi-generate-admin ../strapi-generate-api ../strapi-generate-new ../strapi-generate-policy ../strapi-generate-service ../strapi-mongoose ../strapi-utils && npm link'); shell.exec('npm install ../strapi-generate ../strapi-generate-admin ../strapi-generate-api ../strapi-generate-new ../strapi-generate-policy ../strapi-generate-service ../strapi-mongoose ../strapi-utils && npm link');