Compare commits

...

1 Commits

Author SHA1 Message Date
jiannibang e7866b85f0 feat: 更新依赖与drone 3 years ago
  1. 5
      .drone.yml
  2. 3
      .gitmodules
  3. 33378
      package-lock.json
  4. 1
      package.json
  5. 1
      src/base_mobile_map_sdk
  6. 2
      src/pages/Index/Index.js

5
.drone.yml

@ -69,8 +69,6 @@ steps:
- echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials
- cat ~/.git-credentials - cat ~/.git-credentials
- git fetch --tags - git fetch --tags
- git submodule init
- git submodule update --recursive --remote
# - git submodule add -b master https://git.1000my.com/project_runteng/server_iot-common.git # - git submodule add -b master https://git.1000my.com/project_runteng/server_iot-common.git
# - git mv server_iot-common iot-common # - git mv server_iot-common iot-common
# - git submodule sync # - git submodule sync
@ -96,9 +94,6 @@ steps:
- python --version - python --version
- npm config set registry https://registry.npm.taobao.org - npm config set registry https://registry.npm.taobao.org
- npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/ - npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/
- cd ./src/base_mobile_map_sdk
- npm install
- cd ../../
- npm install - npm install
- unset CI - unset CI
- npm run build - npm run build

3
.gitmodules

@ -1,3 +0,0 @@
[submodule "src/base_mobile_map_sdk"]
path = src/base_mobile_map_sdk
url = https://git.1000my.com/common/base_mobile_map_sdk.git

33378
package-lock.json

File diff suppressed because it is too large

1
package.json

@ -11,6 +11,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"graphql": "^15.5.0", "graphql": "^15.5.0",
"node-sass": "^8.0.0", "node-sass": "^8.0.0",
"qmmap": "git+ssh://git@git.1000my.com:common/base_mobile_map_sdk.git",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",

1
src/base_mobile_map_sdk

@ -1 +0,0 @@
Subproject commit 18e320fd065f17a50e754795638b4148c5fd87a9

2
src/pages/Index/Index.js

@ -1,5 +1,5 @@
import React, { useState, useEffect, useReducer, useRef } from "react"; import React, { useState, useEffect, useReducer, useRef } from "react";
import Qmmap from "../../base_mobile_map_sdk/index";
import Qmmap from "qmmap";
import { useHistory, useLocation } from "react-router-dom"; import { useHistory, useLocation } from "react-router-dom";
import { getMallInfo } from "../../js/helpers/data-helper"; import { getMallInfo } from "../../js/helpers/data-helper";
import "./Index.scss"; import "./Index.scss";

Loading…
Cancel
Save