diff --git a/packages/strapi-cli/.editorconfig b/packages/strapi-cli/.editorconfig deleted file mode 100755 index 473e45184b..0000000000 --- a/packages/strapi-cli/.editorconfig +++ /dev/null @@ -1,16 +0,0 @@ -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[{package.json,*.yml}] -indent_style = space -indent_size = 2 - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/strapi-cli/.gitignore b/packages/strapi-cli/.gitignore deleted file mode 100755 index f559e162ab..0000000000 --- a/packages/strapi-cli/.gitignore +++ /dev/null @@ -1,102 +0,0 @@ -############################ -# OS X -############################ - -.DS_Store -.AppleDouble -.LSOverride -Icon -.Spotlight-V100 -.Trashes -._* - - -############################ -# Linux -############################ - -*~ - - -############################ -# Windows -############################ - -Thumbs.db -ehthumbs.db -Desktop.ini -$RECYCLE.BIN/ -*.cab -*.msi -*.msm -*.msp - - -############################ -# Packages -############################ - -*.7z -*.csv -*.dat -*.dmg -*.gz -*.iso -*.jar -*.rar -*.tar -*.zip -*.com -*.class -*.dll -*.exe -*.o -*.seed -*.so -*.swo -*.swp -*.swn -*.swm -*.out -*.pid - - -############################ -# Logs and databases -############################ - -.tmp -*.log -*.sql -*.sqlite - - -############################ -# Misc. -############################ - -*# -.idea -nbproject - - -############################ -# Node.js -############################ - -lib-cov -lcov.info -pids -logs -results -build -node_modules -.node_history - - -############################ -# Tests -############################ - -testApp -coverage diff --git a/packages/strapi-cli/.npmignore b/packages/strapi-cli/.npmignore deleted file mode 100755 index ac36b23907..0000000000 --- a/packages/strapi-cli/.npmignore +++ /dev/null @@ -1,103 +0,0 @@ -############################ -# OS X -############################ - -.DS_Store -.AppleDouble -.LSOverride -Icon -.Spotlight-V100 -.Trashes -._* - - -############################ -# Linux -############################ - -*~ - - -############################ -# Windows -############################ - -Thumbs.db -ehthumbs.db -Desktop.ini -$RECYCLE.BIN/ -*.cab -*.msi -*.msm -*.msp - - -############################ -# Packages -############################ - -*.7z -*.csv -*.dat -*.dmg -*.gz -*.iso -*.jar -*.rar -*.tar -*.zip -*.com -*.class -*.dll -*.exe -*.o -*.seed -*.so -*.swo -*.swp -*.swn -*.swm -*.out -*.pid - - -############################ -# Logs and databases -############################ - -.tmp -*.log -*.sql -*.sqlite - - -############################ -# Misc. -############################ - -*# -.idea -nbproject - - -############################ -# Node.js -############################ - -lib-cov -lcov.info -pids -logs -results -build -node_modules -.node_history - - -############################ -# Tests -############################ - -test -testApp -coverage diff --git a/packages/strapi-cli/LICENSE.md b/packages/strapi-cli/LICENSE.md deleted file mode 100755 index db7152d350..0000000000 --- a/packages/strapi-cli/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -# MIT License - -Copyright © 2015-2016 Wistity. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/strapi-cli/README.md b/packages/strapi-cli/README.md deleted file mode 100755 index ccb804b048..0000000000 --- a/packages/strapi-cli/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# strapi-cli - -[![npm version](https://img.shields.io/npm/v/strapi-cli.svg)](https://www.npmjs.org/package/strapi-cli) -[![npm downloads](https://img.shields.io/npm/dm/strapi-cli.svg)](https://www.npmjs.org/package/strapi-cli) -[![npm dependencies](https://david-dm.org/wistityhq/strapi-cli.svg)](https://david-dm.org/wistityhq/strapi-cli) -[![Build status](https://travis-ci.org/wistityhq/strapi-cli.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-cli) -[![Slack status](http://strapi-slack.herokuapp.com/badge.svg)](http://slack.strapi.io) - -This global node module is a useful Command-Line Interface (CLI) to help you on Strapi applications. - -It contains command-lines to create applications, generate APIs, generate and run migrations, etc. - -## Resources - -- [MIT License](LICENSE.md) - -## Links - -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) -- [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-cli/package.json b/packages/strapi-cli/package.json deleted file mode 100755 index 6a7b6f2c96..0000000000 --- a/packages/strapi-cli/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "strapi-cli", - "version": "2.0.0", - "description": "The Strapi CLI", - "homepage": "http://strapi.io", - "keywords": [ - "cli", - "framework", - "migrations", - "strapi" - ], - "directories": { - "bin": "./bin" - }, - "bin": { - "strapi": "./bin/strapi.js" - }, - "dependencies": { - "lodash": "~4.6.1", - "strapi": "~2.0.0", - "strapi-bookshelf": "~2.0.0", - "strapi-generate": "~2.0.0", - "strapi-generate-api": "~2.0.0", - "strapi-generate-migrations": "~2.0.0", - "strapi-generate-new": "~2.0.0", - "strapi-generate-policy": "~2.0.0", - "strapi-generate-service": "~2.0.0", - "strapi-knex": "~2.0.0", - "strapi-utils": "~2.0.0" - }, - "scripts": { - "prepublish": "npm prune" - }, - "author": { - "email": "hack@wistity.co", - "name": "Wistity team", - "url": "http://wistity.co" - }, - "maintainers": [ - { - "name": "Wistity team", - "email": "hack@wistity.co", - "url": "http://wistity.co" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/wistityhq/strapi.git" - }, - "bugs": { - "url": "https://github.com/wistityhq/strapi/issues" - }, - "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" - }, - "preferGlobal": true, - "license": "MIT" -} diff --git a/packages/strapi-cli/bin/strapi-config.js b/packages/strapi/bin/strapi-config.js similarity index 100% rename from packages/strapi-cli/bin/strapi-config.js rename to packages/strapi/bin/strapi-config.js diff --git a/packages/strapi-cli/bin/strapi-console.js b/packages/strapi/bin/strapi-console.js similarity index 97% rename from packages/strapi-cli/bin/strapi-console.js rename to packages/strapi/bin/strapi-console.js index 9d9f5e54c0..73abc825c2 100755 --- a/packages/strapi-cli/bin/strapi-console.js +++ b/packages/strapi/bin/strapi-console.js @@ -14,7 +14,7 @@ const cluster = require('cluster'); const _ = require('lodash'); // Local Strapi dependencies. -const server = require('strapi/lib/server'); +const server = require('../lib/server'); // Logger. const logger = require('strapi-utils').logger; diff --git a/packages/strapi-cli/bin/strapi-generate.js b/packages/strapi/bin/strapi-generate.js similarity index 100% rename from packages/strapi-cli/bin/strapi-generate.js rename to packages/strapi/bin/strapi-generate.js diff --git a/packages/strapi-cli/bin/strapi-migrate-make.js b/packages/strapi/bin/strapi-migrate-make.js similarity index 100% rename from packages/strapi-cli/bin/strapi-migrate-make.js rename to packages/strapi/bin/strapi-migrate-make.js diff --git a/packages/strapi-cli/bin/strapi-migrate-rollback.js b/packages/strapi/bin/strapi-migrate-rollback.js similarity index 100% rename from packages/strapi-cli/bin/strapi-migrate-rollback.js rename to packages/strapi/bin/strapi-migrate-rollback.js diff --git a/packages/strapi-cli/bin/strapi-migrate-run.js b/packages/strapi/bin/strapi-migrate-run.js similarity index 100% rename from packages/strapi-cli/bin/strapi-migrate-run.js rename to packages/strapi/bin/strapi-migrate-run.js diff --git a/packages/strapi-cli/bin/strapi-new.js b/packages/strapi/bin/strapi-new.js similarity index 100% rename from packages/strapi-cli/bin/strapi-new.js rename to packages/strapi/bin/strapi-new.js diff --git a/packages/strapi-cli/bin/strapi-start.js b/packages/strapi/bin/strapi-start.js similarity index 100% rename from packages/strapi-cli/bin/strapi-start.js rename to packages/strapi/bin/strapi-start.js diff --git a/packages/strapi-cli/bin/strapi-update.js b/packages/strapi/bin/strapi-update.js similarity index 100% rename from packages/strapi-cli/bin/strapi-update.js rename to packages/strapi/bin/strapi-update.js diff --git a/packages/strapi-cli/bin/strapi.js b/packages/strapi/bin/strapi.js similarity index 100% rename from packages/strapi-cli/bin/strapi.js rename to packages/strapi/bin/strapi.js diff --git a/packages/strapi/package.json b/packages/strapi/package.json index d13a2f617d..eec229eb5c 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -28,7 +28,8 @@ "websockets" ], "directories": { - "lib": "./lib" + "lib": "./lib", + "bin": "./bin/strapi.js" }, "main": "./lib", "dependencies": { @@ -61,6 +62,14 @@ "lodash": "~4.6.1", "node-schedule": "~1.1.0", "socket.io": "~1.4.5", + "strapi-bookshelf": "~2.0.0", + "strapi-generate": "~2.0.0", + "strapi-generate-api": "~2.0.0", + "strapi-generate-migrations": "~2.0.0", + "strapi-generate-new": "~2.0.0", + "strapi-generate-policy": "~2.0.0", + "strapi-generate-service": "~2.0.0", + "strapi-knex": "~2.0.0", "strapi-utils": "~2.0.0" }, "scripts": { @@ -89,5 +98,6 @@ "node": ">= 4.0.0", "npm": ">= 3.0.0" }, + "preferGlobal": true, "license": "MIT" }