Skip to content

Commit fac67ca

Browse files
authored
Merge pull request #111 from raxjs/fix/loading-wechat
fix(loading): can't export Loading in wechat
2 parents 793311f + 3997d19 commit fac67ca

File tree

4 files changed

+42
-13
lines changed

4 files changed

+42
-13
lines changed

packages/loading/.gitignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
*~
4+
*.swp
5+
*.log
6+
7+
.DS_Store
8+
.idea/
9+
.temp/
10+
11+
build/
12+
dist/
13+
lib/
14+
coverage/
15+
es/
16+
types/
17+
node_modules/
18+
19+
demo/miniapp/components/
20+
_miniapp/

packages/loading/build.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"plugins": [
33
[
4-
"rax-plugin-api"
4+
"build-plugin-rax-component",
5+
{
6+
"type": "rax",
7+
"targets": ["web"]
8+
}
59
]
610
]
711
}

packages/loading/package.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "universal-loading",
33
"author": "rax",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"description": "",
66
"main": "lib/index.js",
77
"files": [
@@ -10,26 +10,31 @@
1010
"dist"
1111
],
1212
"scripts": {
13-
"start": "rax-scripts start",
14-
"build": "rax-scripts build"
13+
"start": "build-scripts start",
14+
"build": "build-scripts build"
1515
},
1616
"pre-commit": [
1717
"lint"
1818
],
1919
"keywords": [
20-
"Rax"
20+
"Rax",
21+
"rax-component"
2122
],
2223
"engines": {
2324
"npm": ">=3.0.0"
2425
},
26+
"peerDependencies": {
27+
"rax": "^1.1.0"
28+
},
2529
"dependencies": {
26-
"universal-env": "^2.0.0"
30+
"universal-env": "^3.1.0"
2731
},
2832
"devDependencies": {
29-
"rax": "^1.0.8",
30-
"rax-plugin-api": "^0.2.0",
31-
"rax-scripts": "^2.0.0",
32-
"@types/eslint-visitor-keys": "^1.0.0",
33-
"@types/json-schema": "^7.0.3"
33+
"@alib/build-scripts": "^0.1.0",
34+
"@types/rax": "^1.0.1",
35+
"build-plugin-rax-component": "^0.2.0",
36+
"rax": "^1.1.0",
37+
"rax-test-renderer": "^1.0.0",
38+
"typescript": "^3.7.5"
3439
}
3540
}

packages/loading/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isMiniApp, isWeChatMiniprogram } from 'universal-env';
1+
import { isMiniApp, isWeChatMiniProgram } from 'universal-env';
22
import * as miniAppModule from './miniapp/ali';
33
import * as weChatModule from './miniapp/wechat';
44

@@ -8,7 +8,7 @@ let Loading: Loading;
88
if (isMiniApp) {
99
Loading = miniAppModule;
1010
}
11-
if (isWeChatMiniprogram) {
11+
if (isWeChatMiniProgram) {
1212
Loading = weChatModule;
1313
}
1414

0 commit comments

Comments
 (0)