yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from strapi/alpha.4.8

Browse Source 
alpha.4.8
This commit is contained in:
Aurélien GEORGET 2017-07-21 16:13:15 +02:00 committed by GitHub
commit c8718b9035
26 changed files with 87 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,7 +17,7 @@ before_install:
- rm -rf node_modules/ - rm -rf node_modules/
install: install:
- npm install - npm run setup
script: script:
- npm run test - npm run test

2
lerna.json
View File

@ -1,6 +1,6 @@
{ {
"lerna": "2.0.0", "lerna": "2.0.0",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"packages": [ "packages": [
"packages/*" "packages/*"
], ],

18
package.json
View File

@ -1,6 +1,6 @@
{ {
"private": true, "private": true,
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"devDependencies": { "devDependencies": {
"assert": "~1.3.0", "assert": "~1.3.0",
"babel-eslint": "^6.1.2", "babel-eslint": "^6.1.2",
@ -21,10 +21,13 @@
"shelljs": "^0.7.7" "shelljs": "^0.7.7"
}, },
"scripts": { "scripts": {
"test": "make test", "clean": "npm run removesymlinkdependencies && rm -rf package-lock.json && rm -rf packages/*/package-lock.json",
"clean": "node ./scripts/removefiledependencies.js && rm -rf package-lock.json && rm -rf packages/*/package-lock.json", "clean:all": "npm run removesymlinkdependencies && rm -rf package-lock.json && rm -rf packages/*/package-lock.json && rm -rf packages/*/node_modules",
"removefiledependencies": "node ./scripts/removefiledependencies.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",
"postinstall": "rm -rf packages/*/node_modules && node ./scripts/setup.js" "createsymlinkdependencies": "node ./scripts/createSymlinkDependencies.js",
"removesymlinkdependencies": "node ./scripts/removeSymlinkDependencies.js",
"setup": "npm run clean:all && npm install && node ./scripts/setup.js",
"test": "make test"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
@ -53,8 +56,5 @@
"node": ">= 7.0.0", "node": ">= 7.0.0",
"npm": ">= 3.0.0" "npm": ">= 3.0.0"
}, },
"license": "MIT", "license": "MIT"
"dependencies": {
"strapi-utils": "file:packages/strapi-utils"
}
} }

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-admin", "name": "strapi-admin",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Strapi Admin", "description": "Strapi Admin",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -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.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"scripts": { "scripts": {
"test": "cd files/public && npm run test", "test": "cd files/public && npm run test",

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-bookshelf", "name": "strapi-bookshelf",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Bookshelf hook for the Strapi framework", "description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -19,7 +19,7 @@
"bookshelf": "^0.10.3", "bookshelf": "^0.10.3",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"pluralize": "^3.1.0", "pluralize": "^3.1.0",
"strapi-utils": "^3.0.0-alpha.4.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"strapi": { "strapi": {
"isHook": true, "isHook": true,

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-ejs", "name": "strapi-ejs",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "EJS hook for the Strapi framework", "description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-admin", "name": "strapi-generate-admin",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate the default admin panel for a Strapi application.", "description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -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.3" "strapi-admin": "^3.0.0-alpha.4.8"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-api", "name": "strapi-generate-api",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate an API for a Strapi application.", "description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-controller", "name": "strapi-generate-controller",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate a controller for a Strapi API.", "description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-migrations", "name": "strapi-generate-migrations",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate migration files for a Strapi application.", "description": "Generate migration files for a Strapi application.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -23,8 +23,8 @@
"knex": "^0.12.9", "knex": "^0.12.9",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"pluralize": "^3.1.0", "pluralize": "^3.1.0",
"strapi-bookshelf": "^3.0.0-alpha.4.3", "strapi-bookshelf": "^3.0.0-alpha.4.8",
"strapi-utils": "^3.0.0-alpha.4.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"scripts": { "scripts": {
"prepublish": "npm prune" "prepublish": "npm prune"

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-model", "name": "strapi-generate-model",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate a model for a Strapi API.", "description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-new", "name": "strapi-generate-new",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate a new Strapi application.", "description": "Generate a new Strapi application.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -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.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"scripts": { "scripts": {
"prepublish": "npm prune" "prepublish": "npm prune"

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-plugin", "name": "strapi-generate-plugin",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate an plugin for a Strapi application.", "description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-policy", "name": "strapi-generate-policy",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate a policy for a Strapi API.", "description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate-service", "name": "strapi-generate-service",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Generate a service for a Strapi API.", "description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-generate", "name": "strapi-generate",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Master of ceremonies for the Strapi generators.", "description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -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.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"scripts": { "scripts": {
"prepublish": "npm prune" "prepublish": "npm prune"

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-helper-plugin", "name": "strapi-helper-plugin",
"version": "3.0.0-alpha.4.4", "version": "3.0.0-alpha.4.8",
"description": "Helper for Strapi plugins development", "description": "Helper for Strapi plugins development",
"engines": { "engines": {
"node": ">= 8.0.0", "node": ">= 8.0.0",

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-knex", "name": "strapi-knex",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Knex hook for the Strapi framework", "description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -23,9 +23,6 @@
"strapi": { "strapi": {
"isHook": true "isHook": true
}, },
"scripts": {
"prepublish": "npm prune"
},
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",
"name": "Strapi team", "name": "Strapi team",

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-mongoose", "name": "strapi-mongoose",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Mongoose hook for the Strapi framework", "description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -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.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"strapi": { "strapi": {
"isHook": true "isHook": true

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-plugin-content-manager", "name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "A powerful UI to easily manage your data.", "description": "A powerful UI to easily manage your data.",
"engines": { "engines": {
"node": ">= 8.0.0", "node": ">= 8.0.0",
@ -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.4" "strapi-helper-plugin": "^3.0.0-alpha.4.5"
} }
} }

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-redis", "name": "strapi-redis",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Redis hook for the Strapi framework", "description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -18,7 +18,7 @@
"ioredis": "^2.5.0", "ioredis": "^2.5.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"stack-trace": "0.0.9", "stack-trace": "0.0.9",
"strapi-utils": "^3.0.0-alpha.4.3" "strapi-utils": "^3.0.0-alpha.4.8"
}, },
"strapi": { "strapi": {
"isHook": true "isHook": true

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

@ -1,6 +1,6 @@
{ {
"name": "strapi-utils", "name": "strapi-utils",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "Shared utilities for the Strapi packages", "description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [

22
packages/strapi/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi", "name": "strapi",
"version": "3.0.0-alpha.4.3", "version": "3.0.0-alpha.4.8",
"description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.", "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
"homepage": "http://strapi.io", "homepage": "http://strapi.io",
"keywords": [ "keywords": [
@ -38,6 +38,7 @@
"boom": "^4.3.1", "boom": "^4.3.1",
"consolidate": "^0.14.5", "consolidate": "^0.14.5",
"delegates": "^1.0.0", "delegates": "^1.0.0",
"forever-monitor": "^1.7.1",
"kcors": "^2.2.1", "kcors": "^2.2.1",
"koa": "^2.3.0", "koa": "^2.3.0",
"koa-better-static": "^1.0.5", "koa-better-static": "^1.0.5",
@ -63,17 +64,14 @@
"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.3", "strapi-generate": "^3.0.0-alpha.4.8",
"strapi-generate-admin": "^3.0.0-alpha.4.3", "strapi-generate-admin": "^3.0.0-alpha.4.8",
"strapi-generate-api": "^3.0.0-alpha.4.3", "strapi-generate-api": "^3.0.0-alpha.4.8",
"strapi-generate-new": "^3.0.0-alpha.4.3", "strapi-generate-new": "^3.0.0-alpha.4.8",
"strapi-generate-policy": "^3.0.0-alpha.4.3", "strapi-generate-policy": "^3.0.0-alpha.4.8",
"strapi-generate-service": "^3.0.0-alpha.4.3", "strapi-generate-service": "^3.0.0-alpha.4.8",
"strapi-mongoose": "^3.0.0-alpha.4.3", "strapi-mongoose": "^3.0.0-alpha.4.8",
"strapi-utils": "^3.0.0-alpha.4.3" "strapi-utils": "^3.0.0-alpha.4.8"
},
"devDependencies": {
"forever-monitor": "^1.7.1"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",

18
scripts/createSymlinkDependencies.js Normal file
View File

@ -0,0 +1,18 @@
const fs = require('fs');
const path = require('path');
try {
const packages = fs.readdirSync(path.resolve(process.cwd(),'packages'), 'utf8');
packages.filter(pkg => pkg.indexOf('strapi') !== -1).forEach(pkg => {
const packageJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), 'packages', pkg, 'package.json'), 'utf8'));
Object.keys(packageJSON.dependencies).filter(dependency => dependency.indexOf('strapi-') !== -1).forEach(dependency => {
packageJSON.dependencies[dependency] = 'file:../' + dependency;
});
fs.writeFileSync(path.resolve(process.cwd(), 'packages', pkg, 'package.json'), JSON.stringify(packageJSON, null, 2), 'utf8');
});
} catch (error) {
console.error(error);
}

17
scripts/publish.js Normal file
View File

@ -0,0 +1,17 @@
const fs = require('fs');
const path = require('path');
const shell = require('shelljs');
try {
const packages = fs.readdirSync(path.resolve(process.cwd(),'packages'), 'utf8');
shell.cd('packages/strapi');
packages.filter(pkg => pkg.indexOf('strapi') !== -1).forEach(pkg => {
shell.cd('../' + pkg);
shell.echo(pkg + ': npm publish --tag ' + process.argv[2]);
shell.exec('npm publish --tag ' + process.argv[2]);
});
} catch (error) {
console.error(error);
}

2
scripts/removefiledependencies.js → scripts/removeSymlinkDependencies.js
View File

@ -8,6 +8,8 @@ try {
packages.filter(pkg => pkg.indexOf('strapi') !== -1).forEach(pkg => { packages.filter(pkg => pkg.indexOf('strapi') !== -1).forEach(pkg => {
const packageJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), 'packages', pkg, 'package.json'), 'utf8')); const packageJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), 'packages', pkg, 'package.json'), 'utf8'));
packageJSON.version = pkgJSON.version;
Object.keys(packageJSON.dependencies).filter(dependency => dependency.indexOf('strapi-') !== -1).forEach(dependency => { Object.keys(packageJSON.dependencies).filter(dependency => dependency.indexOf('strapi-') !== -1).forEach(dependency => {
if (packageJSON.dependencies[dependency].indexOf('file:') !== -1) { if (packageJSON.dependencies[dependency].indexOf('file:') !== -1) {
packageJSON.dependencies[dependency] = '^' + pkgJSON.version; packageJSON.dependencies[dependency] = '^' + pkgJSON.version;