chore: 支持 cjs 和 mjs 形形式输出

open-mmlab · Nov 17, 2021 · ed2e1af · ed2e1af
1 parent e8a2f57
commit ed2e1af
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 .DS_Store
 .vscode
 /dist
+/es
 
 # lock file
 package-lock.json

diff --git a/packages/lb-annotation/.gitignore b/packages/lb-annotation/.gitignore
@@ -14,4 +14,5 @@ pnpm-lock.yaml
 
 # build
 /lib
-/dist
+/dist
+/es
diff --git a/packages/lb-annotation/package.json b/packages/lb-annotation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sensetime/annotation",
-  "version": "1.5.0-alpha.2",
+  "version": "1.5.0-alpha.3",
   "description": "Annotation tool collection",
   "keywords": [
     "annotation",
@@ -18,9 +18,11 @@
   },
   "license": "Apache-2.0",
   "files": [
-    "dist"
+    "dist",
+    "es"
   ],
   "main": "./dist/index.js",
+  "module": "./es/index.js",
   "types": "./dist/types/index.d.ts",
   "author": "luozefeng",
   "email": "luozefeng@sensetime.com",
@@ -92,4 +94,4 @@
     "color-rgba": "^2.3.0",
     "lodash": "^4.17.20"
   }
-}
+}
diff --git a/packages/lb-annotation/rollup.config.js b/packages/lb-annotation/rollup.config.js
@@ -59,9 +59,14 @@ export default {
   ],
   output: [
     {
-      format: 'es',
+      format: 'cjs',
       file: './dist/index.js',
       banner,
     },
+    {
+      format: 'es',
+      file: './es/index.js',
+      banner,
+    },
   ],
 };
diff --git a/packages/lb-components/.gitignore b/packages/lb-components/.gitignore
@@ -2,6 +2,7 @@
 .DS_Store
 .vscode
 /dist
+/es
 
 # lock file
 package-lock.json

diff --git a/packages/lb-components/package.json b/packages/lb-components/package.json
@@ -1,18 +1,20 @@
 {
   "name": "@sensetime/label-bee",
-  "version": "1.2.0-alpha.8",
+  "version": "1.2.0-alpha.9",
   "description": "Provide a complete library of annotation components",
   "main": "./dist/index.js",
+  "es": "./es/index.js",
   "types": "./dist/types/index.d.ts",
   "files": [
     "dist",
-    "lib"
+    "lib",
+    "es"
   ],
   "scripts": {
     "dev": "npm run build && cross-env NODE_ENV=developemnt rollup -m -c rollup.config.js -w ",
     "start": "npm run dev",
     "dev:style": "node-sass src/index.scss dist/index.css -w",
-    "build:style": "node-sass src/index.scss dist/index.css && cp -R ./src/assets/cssIcon/.  ./dist/assets/cssIcon",
+    "build:style": "node-sass src/index.scss dist/index.css && cp -R ./src/assets/cssIcon/.  ./dist/assets/cssIcon && cp -R ./src/assets/cssIcon/.  ./es/assets/cssIcon",
     "build": "rm -fr dist && cross-env NODE_ENV=production rollup -c rollup.config.js && npm run build:style && npm run build:type",
     "build:type": "tsc --emitDeclarationOnly",
     "commit": "git-cz",
@@ -40,9 +42,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.6.2",
-    "@sensetime/annotation": "1.5.0-alpha.2",
+    "@sensetime/annotation": "1.5.0-alpha.3",
     "classnames": "^2.3.0",
-    "@sensetime/lb-utils": "^1.0.0",
+    "@sensetime/lb-utils": "^1.0.1",
     "lodash": "^4.17.21",
     "react-i18next": "^11.12.0",
     "react-redux": "^7.2.3",

diff --git a/packages/lb-components/rollup.config.js b/packages/lb-components/rollup.config.js
@@ -11,15 +11,22 @@ const customResolver = resolve({
 
 const projectRootDir = path.resolve(__dirname);
 
-const OUTPUT_DIR = 'dist';
+const CJS_OUTPUT_DIR = 'dist';
+const ES_OUTPUT_DIR = 'es';
 const isProd = process.env.NODE_ENV === 'production';
 
 export default {
   input: 'src/index.tsx',
   output: [
     {
       format: 'es',
-      dir: OUTPUT_DIR,
+      dir: ES_OUTPUT_DIR,
+      preserveModules: true,
+      preserveModulesRoot: 'src',
+    },
+    {
+      format: 'cjs',
+      dir: CJS_OUTPUT_DIR,
       preserveModules: true,
       preserveModulesRoot: 'src',
     },

diff --git a/packages/lb-demo/package.json b/packages/lb-demo/package.json
@@ -3,11 +3,11 @@
   "version": "1.1.0",
   "private": true,
   "dependencies": {
-    "@sensetime/label-bee": "^1.2.0-alpha.8",
+    "@sensetime/label-bee": "^1.2.0-alpha.9",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
-    "@sensetime/lb-utils": "^1.0.0",
+    "@sensetime/lb-utils": "^1.0.1",
     "qs": "^6.10.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/packages/lb-utils/lib/index-module.js b/packages/lb-utils/lib/index-module.js
@@ -0,0 +1,3 @@
+import i18n from "./i18n";
+
+export { i18n };
diff --git a/packages/lb-utils/lib/index.js b/packages/lb-utils/lib/index.js
@@ -1,3 +1,17 @@
-import i18n from "./i18n";
+const i18n = require("i18next");
+const { initReactI18next } = require("react-i18next");
+const resources = require("./i18n/resources.json");
 
-export { i18n };
+i18n
+  .use(initReactI18next) // passes i18n down to react-i18next
+  .init({
+    resources,
+    lng: "cn",
+    interpolation: {
+      escapeValue: false,
+    },
+  });
+
+module.exports = {
+  i18n,
+};
diff --git a/packages/lb-utils/package.json b/packages/lb-utils/package.json
@@ -1,14 +1,16 @@
 {
   "name": "@sensetime/lb-utils",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "utils for label-bee",
   "author": "lijingchi <lijingchi1@sensetime.com>",
   "types": "./lib/index.d.ts",
   "homepage": "",
   "license": "ISC",
   "main": "lib/index.js",
+  "module": "lib/index-module.js",
   "files": [
-    "lib"
+    "lib",
+    "es"
   ],
   "repository": {
     "type": "git",