Merge 075aca0 into c73fcd0

lerna.json

@@ -6,9 +6,9 @@
     "version": {
       "message": "chore: publish %s",
       "conventionalCommits": true,
-      "private": true,
+      "private": false,
       "changelog": false,
-      "exact": true
+      "exact": false
     },
     "publish": {
       "registry": "https://registry.npmjs.org"

package.json

@@ -28,10 +28,10 @@
     "build-website": "lerna run build --stream --scope=l7plot-website",
     "bundle": "lerna run build:umd --stream --scope=@antv/l7plot",
     "deploy-website": "lerna run deploy --stream --scope=l7plot-website",
-    "version": "lerna version",
-    "postversion": "node ./scripts/sync-version",
-    "prepublish-package": "yarn build && yarn bundle",
-    "publish-package": "lerna publish from-package"
+    "version": "node scripts/sync-version",
+    "prepublishOnly": "yarn build && yarn bundle",
+    "package-version": "lerna version",
+    "package-publish": "lerna publish from-package"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",

packages/component/tsconfig.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+    "outDir": "dist/lib",
+    "rootDir": "src",
+    "composite": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "references": []
 }

packages/composite-layers/tsconfig.json

@@ -1,9 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
+    "outDir": "dist/lib",
+    "rootDir": "src",
+    "composite": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "references": []
 }

packages/l7plot/package.json

@@ -9,7 +9,7 @@
     "dist"
   ],
   "scripts": {
-    "dev": "yarn run clean && yarn run dev:cjs",
+    "dev": "yarn run dev:cjs",
     "dev:cjs": "tsc -p tsconfig.json --target ES6 --module CommonJS --outDir dist/lib --watch",
     "lint": "eslint src __tests__ --ext .js,.ts",
     "lint-fix": "eslint src __tests__ --ext .js,.ts --fix",

packages/l7plot/tsconfig.json

@@ -2,12 +2,14 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "composite": true
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "typedocOptions": {
     "entryPoints": ["src/index.ts"],
     "out": "type-docs"
-  }
+  },
+  "references": [{ "path": "../component" }, { "path": "../composite-layers" }]
 }

storybook/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@antv/l7": "^2.7.22",
-    "@antv/l7plot": "0.0.11",
+    "@antv/l7plot": "link:../packages/l7plot",
     "antd": "^4.16.13",
     "react": "^16.14.0",
     "react-dom": "^16.14.0"

tsconfig.json

@@ -40,7 +40,11 @@
     /* Module Resolution Options */
     "moduleResolution": "node",
     "baseUrl": ".",
-    "paths": {},
+    "paths": {
+      "@antv/l7plot": ["packages/l7plot/src"],
+      "@antv/l7plot-component": ["packages/component/src"],
+      "@antv/l7-composite-layers": ["packages/composite-layers/src"]
+    },
     "rootDirs": [],
     // "types": [],
     "allowSyntheticDefaultImports": true,
@@ -59,5 +63,7 @@
     /* Advanced Options */
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true
-  }
+  },
+  "include": ["packages", "storybook", "website"],
+  "exclude": ["packages/*/dist/**", "coverage"]
 }

website/package.json

@@ -14,7 +14,7 @@
     "prettier": "prettier -c -w docs examples"
   },
   "dependencies": {
-    "@antv/l7plot": "0.0.11",
+    "@antv/l7plot": "link:../packages/l7plot",
     "antd": "^4.16.13",
     "react": "^16.14.0",
     "react-dom": "^16.14.0"