yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-04 11:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/strapi/strapi into improvement/database-port-sm

Browse Source
This commit is contained in:
Jim Laurie 2017-11-03 14:44:03 +01:00
commit b4c78489dc
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -28,7 +28,7 @@
"release": "npm run clean:all && npm install && npm run createsymlinkdependencies && lerna exec --concurrency 1 -- npm install && npm run removesymlinkdependencies && node ./scripts/publish.js $TAG", "release": "npm run clean:all && npm install && npm run createsymlinkdependencies && lerna exec --concurrency 1 -- npm install && npm run removesymlinkdependencies && node ./scripts/publish.js $TAG",
"createsymlinkdependencies": "node ./scripts/createSymlinkDependencies.js", "createsymlinkdependencies": "node ./scripts/createSymlinkDependencies.js",
"removesymlinkdependencies": "node ./scripts/removeSymlinkDependencies.js", "removesymlinkdependencies": "node ./scripts/removeSymlinkDependencies.js",
"setup": "npm run clean:all && npm install && node ./scripts/setup.js", "setup": "npm run clean:all && npm install && node ./scripts/setup.js && npm run clean",
"test": "make test" "test": "make test"
}, },
"author": { "author": {

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

@ -30,8 +30,8 @@
"strapi-utils": "3.0.0-alpha.6.4" "strapi-utils": "3.0.0-alpha.6.4"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.1.0", "cross-env": "^5.1.1",
"eslint": "^4.9.0", "eslint": "^4.10.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.6.0", "eslint-config-prettier": "^2.6.0",

2
packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
View File

File diff suppressed because one or more lines are too long

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

@ -49,8 +49,8 @@
"strapi-helper-plugin": "3.0.0-alpha.6.4" "strapi-helper-plugin": "3.0.0-alpha.6.4"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.1.0", "cross-env": "^5.1.1",
"eslint": "^4.9.0", "eslint": "^4.10.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.6.0", "eslint-config-prettier": "^2.6.0",

4
packages/strapi-plugin-content-type-builder/package.json
View File

@ -37,8 +37,8 @@
"strapi-helper-plugin": "3.0.0-alpha.6.4" "strapi-helper-plugin": "3.0.0-alpha.6.4"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.1.0", "cross-env": "^5.1.1",
"eslint": "^4.9.0", "eslint": "^4.10.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.6.0", "eslint-config-prettier": "^2.6.0",

4
packages/strapi-plugin-settings-manager/package.json
View File

@ -34,8 +34,8 @@
"strapi-helper-plugin": "3.0.0-alpha.6.4" "strapi-helper-plugin": "3.0.0-alpha.6.4"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.1.0", "cross-env": "^5.1.1",
"eslint": "^4.9.0", "eslint": "^4.10.0",
"eslint-config-airbnb": "^15.1.0", "eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2", "eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.6.0", "eslint-config-prettier": "^2.6.0",