merge qiniu/master

Author: yinxulai

.eslintignore

@@ -1,6 +1,10 @@
 /src/__mock__
 /src/__tests__
-/test/*
+/test/
+node_modules
 dist
-site
+esm
+umd
 *.js
+*.d.ts
+*.test.ts

.eslintrc.js

@@ -1,13 +1,8 @@
 module.exports = {
-  extends: [
-    '@qiniu'
-  ],
-  settings: {
-    "import/resolver": {
-      node: {
-        extensions: ['.js', '.ts'],
-        moduleDirectory: ['node_modules', 'src/']
-      }
-    }
+  root: true,
+  extends: ['@qiniu'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./packages/*/tsconfig.json'],
   }
 }

.github/workflows/dev-check.yml

@@ -10,8 +10,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'
-          node-version: 12
+          node-version: 16
       - run: npm install
+      - run: npm run boot
       - run: npm run lint
   test:
     runs-on: ubuntu-latest
@@ -20,8 +21,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'
-          node-version: 12
+          node-version: 16
       - run: npm install
+      - run: npm run boot
       - run: npm run test
   build:
     runs-on: ubuntu-latest
@@ -30,6 +32,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'
-          node-version: 12
+          node-version: 16
       - run: npm install
+      - run: npm run boot
       - run: npm run build

.github/workflows/npm-publish.yml

@@ -11,10 +11,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm install
+      - run: npm run boot
       - run: npm run build
+      - run: cd packages/qiniu-js/
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.gitignore

@@ -1,12 +1,4 @@
 .DS_Store
 .vscode
 node_modules
-bower_components
-demo/config.js
-deploy.sh
-npm-debug.log
-dist
-test/config.json
 coverage
-lib
-esm

.npmignore

@@ -463,25 +463,17 @@ qiniu.compressImage(file, options).then(data => {
 
 <a id="demo"></a>
 
-### 运行示例
-
-1. 进入 test 目录，按照目录下的 `config.json.example` 示例，创建 `config.json` 文件，其中，`Access Key` 和 `Secret Key` 按如下方式获取
-
-   * [开通七牛开发者帐号](https://portal.qiniu.com/signup)
-   * [登录七牛开发者自助平台，查看 AccessKey 和 SecretKey](https://portal.qiniu.com/user/key) 。
-
-   ```javascript
-   {
-     "AccessKey": "<Your Access Key>",
-     "SecretKey": "<Your Secret Key>",
-     "Bucket": "<Your Bucket Name>",
-     "Port": 9000,
-     "UptokenUrl": "<Your Uptoken_Url>", // demo 启动后会在本地 /uptoken 上提供获取 uptoken 的接口，所以这里可以填 'token'
-     "Domain": "<Your Bucket Domain>" // Bucket 的外链默认域名，在 Bucket 的内容管理里查看，如：'http://xxx.bkt.clouddn.com/'
-   }
-   ```
+### 本地开发
+
+```bash
+$ git clone [email protected]:qiniu/js-sdk.git
+$ cd js-sdk/
+$ npm install
+$ npm run boot
+$ npm run dev
+```
 
-2. 进入项目根目录，执行 `npm install` 安装依赖库，然后打开两个终端，一个执行 `npm run serve` 跑 server， 一个执行 `npm run dev` 运行服务；demo1：`http://0.0.0.0:8080/test/demo1`；demo3：`http://0.0.0.0:8080/test/demo3`；demo1为测试上传功能的示例，demo3为测试图片压缩功能的示例；demo2 为测试 es6 语法的示例，进入 demo2 目录，执行 `npm install`，然后 `npm start` 运行 demo2；demo1、demo2 和 demo3 都共用一个 server，请注意 server 文件里的 `region` 设置跟 `config` 里的`region` 设置要保持一致。
+打开您的浏览器并访问终端中提示的地址即可访问开发调试页面。
 
 <a id="note"></a>
 

README.md

@@ -1,12 +1,17 @@
+function getProjectConfig(name) {
+  return {
+    displayName: name,
+    testEnvironment: 'jsdom',
+    transform: {
+      ".ts": 'ts-jest'
+    },
+    testMatch: [`<rootDir>/packages/${name}/src/**/*.test.ts`],
+  }
+}
+
 module.exports = {
-  transform: {
-    ".ts": 'ts-jest'
-  },
-  testRegex: '.+\\.test\\.ts$',
-  testPathIgnorePatterns: [
-    "esm",
-    "lib",
-    "examples",
-    "node_modules"
+  projects: [
+    getProjectConfig('qiniu-js'),
+    getProjectConfig('doc-site')
   ]
-};
+}

jest.config.js

@@ -0,0 +1,28 @@
+{
+	"folders": [
+		{
+			"name": "✨ root",
+			"path": "."
+		},
+		{
+			"name": "📦 qiniu-js",
+			"path": "packages/qiniu-js"
+		},
+		{
+			"name": "📦 doc-site",
+			"path": "packages/doc-site"
+		},
+	],
+	"settings": {
+		"cSpell.words": [
+			"cacheable",
+			"dumi",
+			"exif",
+			"iife",
+			"Mogr",
+			"umijs",
+			"Uphost"
+		],
+		"typescript.tsdk": "✨ root/node_modules/typescript/lib"
+	}
+}

js-sdk.code-workspace

@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "useNx": false,
+  "npmClient": "npm",
+  "version": "independent"
+}