chore: update npm packages

docker-compose.yml

@@ -8,14 +8,10 @@ services:
     networks:
       - node-network
     environment:
-      - VERDACCIO_PORT=${VERDACCIO_PORT}
+      VERDACCIO_PORT: ${VERDACCIO_PORT}
     restart: always
     ports:
-      - "${VERDACCIO_PORT}:4873"
+      - "${VERDACCIO_PORT}:${VERDACCIO_PORT}"
-    # volumes:
-      # - "./verdaccio/storage:/verdaccio/storage"
-      # - "./verdaccio/config:/verdaccio/conf"
-      # - "./verdaccio/plugins:/verdaccio/plugins"
   mysql:
     image: mysql:5.7
     environment:

nodemon.json

@@ -0,0 +1,6 @@
+{
+  "watch": ["packages/"],
+  "ignore": ["packages/app"],
+  "ext": "ts",
+  "exec": "ts-node ./packages/api/src/dev.ts"
+}

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "start": "cd packages/app && npm start",
-    "start-server": "cd packages/api && npm start",
+    "start-server": "nodemon",
     "start-client": "cd packages/app && npx umi dev",
     "pm2-start": "npx pm2 start packages/api/lib/index.js",
     "build-app": "cd packages/app && npm run build",
@@ -15,7 +15,9 @@
     "lint": "eslint --ext .ts,.tsx,.js \"packages/*/src/**.@(ts|tsx|js)\" --fix",
     "test": "npm run lint && jest",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "release": "npm run build && lerna publish --yes --registry https://npm.pkg.github.com"
+    "version:alpha": "lerna version prerelease --preid alpha --force-publish=* --no-git-tag-version -m \"chore(versions): publish packages %s\"",
+    "release:force": "lerna publish from-package --yes",
+    "release": "lerna publish"
   },
   "devDependencies": {
     "@koa/router": "^9.3.1",

packages/actions/.npmignore

@@ -0,0 +1,8 @@
+node_modules
+*.log
+docs
+__tests__
+jest.config.js
+tsconfig.json
+src
+.fatherrc.ts

packages/actions/package.json

@@ -2,11 +2,11 @@
   "name": "@nocobase/actions",
   "version": "0.4.0-alpha.0",
   "description": "",
+  "license": "MIT",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
   },
-  "license": "MIT",
   "dependencies": {
     "@nocobase/database": "^0.4.0-alpha.0",
     "@nocobase/resourcer": "^0.4.0-alpha.0"

packages/api/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/api/nodemon.json

@@ -1,6 +0,0 @@
-{
-  "watch": ["src", "../"],
-  "ignore": ["../app"],
-  "ext": "ts",
-  "exec": "ts-node ./src/index.ts"
-}

packages/api/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@nocobase/api",
   "version": "0.4.0-alpha.0",
-  "main": "lib/index.js",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "license": "MIT",
   "scripts": {
     "start": "nodemon",
     "db-migrate": "ts-node ./src/migrate.ts"
@@ -20,9 +22,5 @@
     "@nocobase/plugin-users": "^0.4.0-alpha.0",
     "@nocobase/server": "^0.4.0-alpha.0",
     "koa-static": "^5.0.0"
-  },
-  "devDependencies": {
-    "nodemon": "^2.0.6",
-    "typescript": "^3.9.6"
   }
 }

packages/api/src/app.ts

@@ -1,5 +1,3 @@
-import path from 'path';
-import dotenv from 'dotenv';
 import Api from '@nocobase/server';
 
 // @ts-ignore
@@ -12,11 +10,6 @@ const sync = global.sync || {
 
 console.log('process.env.NOCOBASE_ENV', process.env.NOCOBASE_ENV);
 
-// TODO: env 需要换种方式加载
-dotenv.config({
-  path: path.resolve(__dirname, '../../../.env'),
-});
-
 const api = Api.create({
   database: {
     username: process.env.DB_USER,

packages/api/src/dev.ts

@@ -0,0 +1,8 @@
+import path from 'path';
+import dotenv from 'dotenv';
+
+dotenv.config({
+  path: path.resolve(__dirname, '../../../.env'),
+});
+
+import './index';

packages/app/.env.example

@@ -1,19 +0,0 @@
-DB_DIALECT=postgres
-DB_HOST=localhost
-DB_PORT=5432
-DB_DATABASE=nocobase
-DB_USER=test
-DB_PASSWORD=test
-
-# DB_DIALECT=mysql
-# DB_PORT=3306
-
-DB_MYSQL_PORT=3306
-DB_POSTGRES_PORT=5432
-
-API_PORT=23000
-
-VERDACCIO_PORT=4873
-
-LOCAL_STORAGE_BASE_URL=http://localhost:23000/uploads
-USE_STATIC_SERVER=true

packages/app/.npmignore

@@ -0,0 +1,12 @@
+lib
+mock
+node_modules
+*.log
+docs
+__tests__
+jest.config.js
+tsconfig.json
+src
+.fatherrc.ts
+.umirc.ts
+nodemon.json

packages/app/nodemon.json

@@ -2,5 +2,5 @@
   "watch": ["../"],
   "ignore": ["../app"],
   "ext": "ts",
-  "exec": "ts-node ../api/src/index.ts"
+  "exec": "ts-node ../api/src/dev.ts"
 }

packages/app/package.json

@@ -20,7 +20,7 @@
       "prettier --parser=typescript --write"
     ]
   },
-  "dependencies": {
+  "devDependencies": {
     "@ant-design/pro-layout": "^5.0.12",
     "@formily/antd-components": "^1.3.6",
     "@lourenci/react-kanban": "^2.1.0",

packages/client/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/database/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/database/package.json

@@ -4,17 +4,14 @@
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "scripts": {},
   "license": "MIT",
+  "scripts": {},
   "dependencies": {
     "bcrypt": "^5.0.0",
     "deepmerge": "^4.2.2",
     "glob": "^7.1.6",
     "sequelize": "^6.3.3"
   },
-  "devDependencies": {
-    "typescript": "^3.9.6"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",

packages/plugin-action-logs/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-automations/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-china-region/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-collections/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-file-manager/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-full-collections/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-full-collections/package.json

@@ -3,6 +3,7 @@
   "version": "0.4.0-alpha.0",
   "main": "lib/index.js",
   "license": "MIT",
+  "private": false,
   "dependencies": {
     "@nocobase/server": "^0.4.0-alpha.0",
     "crypto-random-string": "^3.3.1",

packages/plugin-pages/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-permissions/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-users/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/plugin-users/package.json

@@ -5,11 +5,11 @@
   "license": "MIT",
   "devDependencies": {
     "@nocobase/actions": "^0.4.0-alpha.0",
-    "@nocobase/server": "^0.4.0-alpha.0",
+    "@nocobase/server": "^0.4.0-alpha.0"
-    "crypto-random-string": "^3.3.0"
   },
   "dependencies": {
     "@nocobase/database": "^0.4.0-alpha.0",
-    "@nocobase/resourcer": "^0.4.0-alpha.0"
+    "@nocobase/resourcer": "^0.4.0-alpha.0",
+    "crypto-random-string": "^3.3.0"
   }
 }

packages/resourcer/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/resourcer/package.json

@@ -4,8 +4,8 @@
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "scripts": {},
   "license": "MIT",
+  "scripts": {},
   "dependencies": {
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
@@ -13,9 +13,6 @@
     "path-to-regexp": "^6.1.0",
     "qs": "^6.9.4"
   },
-  "devDependencies": {
-    "typescript": "^3.9.6"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",

packages/server/.npmignore

@@ -0,0 +1,7 @@
+node_modules
+*.log
+docs
+__tests__
+tsconfig.json
+src
+.fatherrc.ts

packages/server/package.json

@@ -11,14 +11,12 @@
     "@nocobase/actions": "^0.4.0-alpha.0",
     "@nocobase/database": "^0.4.0-alpha.0",
     "@nocobase/resourcer": "^0.4.0-alpha.0",
-    "@types/koa": "^2.11.6",
     "dotenv": "^8.2.0",
     "koa": "^2.13.0",
     "koa-bodyparser": "^4.3.0",
     "mockjs": "^1.1.0",
     "mysql2": "^2.1.0",
     "pg": "^8.3.3",
-    "pg-hstore": "^2.3.3",
+    "pg-hstore": "^2.3.3"
-    "typescript": "^4.0.2"
   }
 }