yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update branch

Browse Source 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
This commit is contained in:
cyril lopez 2017-11-20 14:23:06 +01:00
commit 659f3a52c8
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

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-users-permissions/package.json
View File

@ -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",

13
scripts/clean.js Normal file
View File

@ -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');
}