yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change variable name

Browse Source
This commit is contained in:
Aurelsicoko 2017-11-13 12:45:39 +01:00
parent d0c3f7f8b5
commit 87a083134a
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
},
"devDependencies": {
"cross-env": "^5.1.1",
"eslint": "^4.10.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0",
@ -46,7 +46,7 @@
"html-loader": "^0.4.3",
"html-webpack-plugin": "^2.22.0",
"plop": "^1.9.0",
"prettier": "^1.7.4",
"prettier": "^1.8.2",
"rimraf": "^2.6.2",
"webpack": "^3.8.1"
},

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

@ -52,7 +52,7 @@
},
"devDependencies": {
"cross-env": "^5.1.1",
"eslint": "^4.10.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0",
@ -63,7 +63,7 @@
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0",
"prettier": "^1.7.4",
"prettier": "^1.8.2",
"rimraf": "^2.6.2",
"webpack": "^3.8.1"
}

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

@ -39,7 +39,7 @@
},
"devDependencies": {
"cross-env": "^5.1.1",
"eslint": "^4.10.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0",
@ -50,7 +50,7 @@
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0",
"prettier": "^1.7.4",
"prettier": "^1.8.2",
"rimraf": "^2.6.2",
"webpack": "^3.8.1"
},

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

@ -36,7 +36,7 @@
},
"devDependencies": {
"cross-env": "^5.1.1",
"eslint": "^4.10.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-airbnb-base": "^11.3.2",
"eslint-config-prettier": "^2.7.0",
@ -47,7 +47,7 @@
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-redux-saga": "^0.4.0",
"plop": "^1.9.0",
"prettier": "^1.7.4",
"prettier": "^1.8.2",
"rimraf": "^2.6.2",
"webpack": "^3.8.1"
},

20
packages/strapi/lib/core/plugins.js
View File

@ -11,7 +11,7 @@ module.exports = function() {
url[0] === '/' ? url.substring(1) : url
)();
const configuratePlugin = (acc, current, source, x) => {
const configuratePlugin = (acc, current, source, name) => {
switch (source) {
case 'host': {
if (!_.get(this.config.environments[current].server, 'admin.build.host')) {
@ -23,20 +23,20 @@ module.exports = function() {
if (_.isString(folder)) {
const cleanFolder = folder[0] === '/' ? folder.substring(1) : folder;
return `${this.config.environments[current].server.admin.build.host}/${cleanFolder}/${x}/main.js`;
return `${this.config.environments[current].server.admin.build.host}/${cleanFolder}/${name}/main.js`;
}
return `${this.config.environments[current].server.admin.build.host}/${x}/main.js`;
return `${this.config.environments[current].server.admin.build.host}/${name}/main.js`;
}
case 'custom':
if (!_.isEmpty(_.get(this.plugins[x].config, `sources.${current}`, {}))) {
return acc[current] = this.plugins[x].config.sources[current];
if (!_.isEmpty(_.get(this.plugins[name].config, `sources.${current}`, {}))) {
return acc[current] = this.plugins[name].config.sources[current];
}
throw new Error(`You have to define the source URL for each environment in \`./plugins/**/config/sources.json\``);
case 'origin':
default:
return `http://${this.config.environments[current].server.host}:${this.config.environments[current].server.port}/${folder}/${x}/main.js`;
return `http://${this.config.environments[current].server.host}:${this.config.environments[current].server.port}/${folder}/${name}/main.js`;
}
};
@ -85,15 +85,15 @@ module.exports = function() {
}
// Create `plugins.json` file.
const data = Object.keys(this.plugins).map(x => ({
id: x,
const data = Object.keys(this.plugins).map(name => ({
id: name,
source: Object.keys(this.config.environments).reduce((acc, current) => {
const source = _.get(this.config.environments[current].server, 'admin.build.plugins.source', 'origin');
if (_.isString(source)) {
acc[current] = configuratePlugin(acc, current, source, x);
acc[current] = configuratePlugin(acc, current, source, name);
} else if (_.isOject(source)) {
acc[current] = configuratePlugin(acc, current, source[current], x);
acc[current] = configuratePlugin(acc, current, source[current], name);
}
return acc;