Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebodin committed Apr 26, 2019
1 parent 6bac0c9 commit bd0cc2c
Show file tree
Hide file tree
Showing 63 changed files with 211 additions and 481 deletions.
5 changes: 0 additions & 5 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.12.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
shelljs:
- '*':
reason: testing
expires: 2019-01-04T14:31:33.160Z
patch: {}
41 changes: 20 additions & 21 deletions examples/getstarted/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"name": "getstarted",
"private": true,
"version": "0.1.0",
"version": "3.0.0-beta.0",
"description": "A Strapi application.",
"main": "./server.js",
"scripts": {
"setup": "cd admin && npm run setup",
"start": "node server.js",
"dev": "strapi dev",
"start": "strapi start",
"build": "strapi build",
"strapi": "node_modules/strapi/bin/strapi.js",
"lint": "node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js"
"lint": "eslint api/**/*.js config/**/*.js plugins/**/*.js"
},
"devDependencies": {
"babel-eslint": "^7.1.1",
Expand All @@ -23,22 +22,22 @@
"lodash": "^4.17.5",
"pg": "^7.10.0",
"sqlite3": "^4.0.6",
"strapi": "3.0.0-alpha.26",
"strapi-admin": "3.0.0-alpha.26",
"strapi-hook-bookshelf": "3.0.0-alpha.26",
"strapi-hook-knex": "3.0.0-alpha.26",
"strapi-middleware-views": "3.0.0-alpha.26",
"strapi-plugin-content-manager": "3.0.0-alpha.26",
"strapi-plugin-content-type-builder": "3.0.0-alpha.26",
"strapi-plugin-documentation": "^3.0.0-alpha.17",
"strapi-plugin-email": "3.0.0-alpha.26",
"strapi-plugin-graphql": "3.0.0-alpha.26",
"strapi-plugin-settings-manager": "3.0.0-alpha.26",
"strapi-plugin-upload": "3.0.0-alpha.26",
"strapi-plugin-users-permissions": "3.0.0-alpha.26",
"strapi-provider-email-mailgun": "^3.0.0-alpha.15",
"strapi-provider-upload-aws-s3": "^3.0.0-alpha.15",
"strapi-utils": "3.0.0-alpha.26"
"strapi": "^3.0.0-beta.0",
"strapi-admin": "^3.0.0-beta.0",
"strapi-hook-bookshelf": "^3.0.0-beta.0",
"strapi-hook-knex": "^3.0.0-beta.0",
"strapi-middleware-views": "^3.0.0-beta.0",
"strapi-plugin-content-manager": "^3.0.0-beta.0",
"strapi-plugin-content-type-builder": "^3.0.0-beta.0",
"strapi-plugin-documentation": "^3.0.0-beta.0",
"strapi-plugin-email": "^3.0.0-beta.0",
"strapi-plugin-graphql": "^3.0.0-beta.0",
"strapi-plugin-settings-manager": "^3.0.0-beta.0",
"strapi-plugin-upload": "^3.0.0-beta.0",
"strapi-plugin-users-permissions": "^3.0.0-beta.0",
"strapi-provider-email-mailgun": "^3.0.0-beta.0",
"strapi-provider-upload-aws-s3": "^3.0.0-beta.0",
"strapi-utils": "^3.0.0-beta.0"
},
"author": {
"name": "alex",
Expand Down
7 changes: 5 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"version": "0.0.0",
"packages": ["packages/*", "examples/*"],
"version": "3.0.0-beta.0",
"packages": [
"packages/*",
"examples/*"
],
"npmClient": "yarn",
"useWorkspaces": true
}
10 changes: 4 additions & 6 deletions packages/strapi-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Strapi Admin",
"repository": {
"type": "git",
Expand Down Expand Up @@ -42,11 +42,9 @@
"redux-saga": "^0.16.0",
"remove-markdown": "^0.2.2",
"reselect": "^3.0.1",
"strapi-helper-plugin": "3.0.0-alpha.26",
"strapi-helper-plugin": "^3.0.0-beta.0",
"styled-components": "^4.2.0",
"video-react": "^0.13.2"
},
"devDependencies": {
"video-react": "^0.13.2",
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-async-generator-functions": "^7.2.0",
"@babel/plugin-proposal-class-properties": "^7.4.0",
Expand Down Expand Up @@ -74,7 +72,7 @@
"sass-loader": "^7.1.0",
"shelljs": "^0.7.8",
"simple-progress-webpack-plugin": "^1.1.2",
"strapi-utils": "3.0.0-alpha.26",
"strapi-utils": "^3.0.0-beta.0",
"style-loader": "^0.23.1",
"url-loader": "^1.1.2",
"webpack": "^4.29.6",
Expand Down
3 changes: 0 additions & 3 deletions packages/strapi-admin/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const WebpackDashboard = require('webpack-dashboard/plugin');
const OpenBrowserWebpackPlugin = require('open-browser-webpack-plugin');
const DuplicatePckgChecker = require('duplicate-package-checker-webpack-plugin');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
.BundleAnalyzerPlugin;
const alias = require('./webpack.alias.js');

const URLs = {
Expand Down
8 changes: 4 additions & 4 deletions packages/strapi-generate-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -19,8 +19,8 @@
"fs-extra": "^4.0.1",
"lodash": "^4.17.5",
"shelljs": "^0.7.8",
"strapi-admin": "3.0.0-alpha.26",
"strapi-utils": "3.0.0-alpha.26"
"strapi-admin": "^3.0.0-beta.0",
"strapi-utils": "^3.0.0-beta.0"
},
"author": {
"email": "[email protected]",
Expand All @@ -46,4 +46,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
7 changes: 3 additions & 4 deletions packages/strapi-generate-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -17,8 +17,7 @@
"pluralize": "^6.0.0"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublishOnly": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -44,4 +43,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
7 changes: 3 additions & 4 deletions packages/strapi-generate-controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -17,8 +17,7 @@
"lodash": "^4.17.5"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublish": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -44,4 +43,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
10 changes: 5 additions & 5 deletions packages/strapi-generate-model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,11 +14,11 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.5"
"lodash": "^4.17.5",
"pluralize": "^7.0.0"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublish": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -44,4 +44,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
3 changes: 1 addition & 2 deletions packages/strapi-generate-new/json/package.json.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ module.exports = scope => {
'description': 'A Strapi application.',
'main': './server.js',
'scripts': {
'setup': 'cd admin && npm run setup', // Ready to deploy setup
'build': 'strapi build',
'start': 'node server.js',
'start': 'strapi start',
'strapi': 'strapi', // Allow to use `npm run strapi` CLI,
'lint': 'eslint api/**/*.js config/**/*.js plugins/**/*.js'
},
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-generate-new/lib/after.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const runInstall = () => {
if (packageManager.isStrapiInstalledWithNPM()) {
return new Promise((resolve, reject) => {
shell.exec(
'npm install --production',
'npm install',
{ silent: true },
(code, _, stderr) => {
if (stderr && code !== 0) return reject(new Error(stderr));
Expand All @@ -32,7 +32,7 @@ const runInstall = () => {

return new Promise((resolve, reject) => {
shell.exec(
'yarn install --production',
'yarn install',
{ silent: true },
(code, _, stderr) => {
if (stderr && code !== 0) return reject(new Error(stderr));
Expand Down
9 changes: 4 additions & 5 deletions packages/strapi-generate-new/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -21,12 +21,11 @@
"ora": "^2.1.0",
"request": "^2.88.0",
"shelljs": "^0.7.8",
"strapi-utils": "3.0.0-alpha.26",
"strapi-utils": "^3.0.0-beta.0",
"uuid": "^3.1.0"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublishOnly": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -52,4 +51,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
10 changes: 4 additions & 6 deletions packages/strapi-generate-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,12 +14,10 @@
},
"dependencies": {
"fs-extra": "^4.0.0",
"lodash": "^4.17.5",
"pluralize": "^6.0.0"
"lodash": "^4.17.5"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublishOnly": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -45,4 +43,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
7 changes: 3 additions & 4 deletions packages/strapi-generate-policy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -17,8 +17,7 @@
"lodash": "^4.17.5"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublishOnly": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -44,4 +43,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
7 changes: 3 additions & 4 deletions packages/strapi-generate-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -17,8 +17,7 @@
"lodash": "^4.17.5"
},
"scripts": {
"test": "echo \"no tests yet\"",
"prepublishOnly": "npm prune"
"test": "echo \"no tests yet\""
},
"author": {
"email": "[email protected]",
Expand All @@ -44,4 +43,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
6 changes: 3 additions & 3 deletions packages/strapi-generate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"fs-extra": "^4.0.0",
"lodash": "^4.17.5",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-alpha.26"
"strapi-utils": "^3.0.0-beta.0"
},
"author": {
"name": "Strapi team",
Expand All @@ -46,4 +46,4 @@
"npm": ">= 6.0.0"
},
"license": "MIT"
}
}
2 changes: 1 addition & 1 deletion packages/strapi-helper-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-alpha.26",
"version": "3.0.0-beta.0",
"description": "Helper for Strapi plugins development",
"files": [
"dist"
Expand Down
Loading

0 comments on commit bd0cc2c

Please sign in to comment.