柳香萍 5 gadus atpakaļ
vecāks
revīzija
3a563c05f4
3 mainītis faili ar 28 papildinājumiem un 76 dzēšanām
  1. 1 1
      config/dev.env.js
  2. 26 74
      package-lock.json
  3. 1 1
      package.json

+ 1 - 1
config/dev.env.js Parādīt failu

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
4 4
 
5 5
 module.exports = merge(prodEnv, {
6 6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
7
+  BASE_API: '"http://api.xt.kuyicloud.com"',
8 8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9 9
   // BASE_API: '"http://localhost:9529"'
10 10
 })

+ 26 - 74
package-lock.json Parādīt failu

@@ -8306,9 +8306,9 @@
8306 8306
       }
8307 8307
     },
8308 8308
     "fstream": {
8309
-      "version": "1.0.11",
8310
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
8311
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
8309
+      "version": "1.0.12",
8310
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
8311
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
8312 8312
       "dev": true,
8313 8313
       "requires": {
8314 8314
         "graceful-fs": "^4.1.2",
@@ -10529,12 +10529,6 @@
10529 10529
       "integrity": "sha1-dRqnbBuWSwR+dtFPxyoJP8teLdA=",
10530 10530
       "dev": true
10531 10531
     },
10532
-    "lodash.assign": {
10533
-      "version": "4.2.0",
10534
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
10535
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
10536
-      "dev": true
10537
-    },
10538 10532
     "lodash.camelcase": {
10539 10533
       "version": "4.3.0",
10540 10534
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -11178,7 +11172,8 @@
11178 11172
     "nan": {
11179 11173
       "version": "2.11.0",
11180 11174
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
11181
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
11175
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
11176
+      "optional": true
11182 11177
     },
11183 11178
     "nanomatch": {
11184 11179
       "version": "1.2.13",
@@ -11418,9 +11413,9 @@
11418 11413
       }
11419 11414
     },
11420 11415
     "node-sass": {
11421
-      "version": "4.9.3",
11422
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
11423
-      "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
11416
+      "version": "4.12.0",
11417
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
11418
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
11424 11419
       "dev": true,
11425 11420
       "requires": {
11426 11421
         "async-foreach": "^0.1.3",
@@ -11430,15 +11425,13 @@
11430 11425
         "get-stdin": "^4.0.1",
11431 11426
         "glob": "^7.0.3",
11432 11427
         "in-publish": "^2.0.0",
11433
-        "lodash.assign": "^4.2.0",
11434
-        "lodash.clonedeep": "^4.3.2",
11435
-        "lodash.mergewith": "^4.6.0",
11428
+        "lodash": "^4.17.11",
11436 11429
         "meow": "^3.7.0",
11437 11430
         "mkdirp": "^0.5.1",
11438
-        "nan": "^2.10.0",
11431
+        "nan": "^2.13.2",
11439 11432
         "node-gyp": "^3.8.0",
11440 11433
         "npmlog": "^4.0.0",
11441
-        "request": "2.87.0",
11434
+        "request": "^2.88.0",
11442 11435
         "sass-graph": "^2.2.4",
11443 11436
         "stdout-stream": "^1.4.0",
11444 11437
         "true-case-path": "^1.0.2"
@@ -11452,7 +11445,7 @@
11452 11445
         },
11453 11446
         "chalk": {
11454 11447
           "version": "1.1.3",
11455
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
11448
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
11456 11449
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
11457 11450
           "dev": true,
11458 11451
           "requires": {
@@ -11473,64 +11466,23 @@
11473 11466
             "which": "^1.2.9"
11474 11467
           }
11475 11468
         },
11476
-        "har-validator": {
11477
-          "version": "5.0.3",
11478
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
11479
-          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
11480
-          "dev": true,
11481
-          "requires": {
11482
-            "ajv": "^5.1.0",
11483
-            "har-schema": "^2.0.0"
11484
-          }
11485
-        },
11486
-        "oauth-sign": {
11487
-          "version": "0.8.2",
11488
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
11489
-          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
11469
+        "lodash": {
11470
+          "version": "4.17.11",
11471
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
11472
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
11490 11473
           "dev": true
11491 11474
         },
11492
-        "request": {
11493
-          "version": "2.87.0",
11494
-          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
11495
-          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
11496
-          "dev": true,
11497
-          "requires": {
11498
-            "aws-sign2": "~0.7.0",
11499
-            "aws4": "^1.6.0",
11500
-            "caseless": "~0.12.0",
11501
-            "combined-stream": "~1.0.5",
11502
-            "extend": "~3.0.1",
11503
-            "forever-agent": "~0.6.1",
11504
-            "form-data": "~2.3.1",
11505
-            "har-validator": "~5.0.3",
11506
-            "http-signature": "~1.2.0",
11507
-            "is-typedarray": "~1.0.0",
11508
-            "isstream": "~0.1.2",
11509
-            "json-stringify-safe": "~5.0.1",
11510
-            "mime-types": "~2.1.17",
11511
-            "oauth-sign": "~0.8.2",
11512
-            "performance-now": "^2.1.0",
11513
-            "qs": "~6.5.1",
11514
-            "safe-buffer": "^5.1.1",
11515
-            "tough-cookie": "~2.3.3",
11516
-            "tunnel-agent": "^0.6.0",
11517
-            "uuid": "^3.1.0"
11518
-          }
11475
+        "nan": {
11476
+          "version": "2.14.0",
11477
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
11478
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
11479
+          "dev": true
11519 11480
         },
11520 11481
         "supports-color": {
11521 11482
           "version": "2.0.0",
11522 11483
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
11523 11484
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
11524 11485
           "dev": true
11525
-        },
11526
-        "tough-cookie": {
11527
-          "version": "2.3.4",
11528
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
11529
-          "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
11530
-          "dev": true,
11531
-          "requires": {
11532
-            "punycode": "^1.4.1"
11533
-          }
11534 11486
         }
11535 11487
       }
11536 11488
     },
@@ -15455,7 +15407,7 @@
15455 15407
         },
15456 15408
         "os-locale": {
15457 15409
           "version": "1.4.0",
15458
-          "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
15410
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
15459 15411
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
15460 15412
           "dev": true,
15461 15413
           "requires": {
@@ -16511,13 +16463,13 @@
16511 16463
       "dev": true
16512 16464
     },
16513 16465
     "tar": {
16514
-      "version": "2.2.1",
16515
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
16516
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
16466
+      "version": "2.2.2",
16467
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
16468
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
16517 16469
       "dev": true,
16518 16470
       "requires": {
16519 16471
         "block-stream": "*",
16520
-        "fstream": "^1.0.2",
16472
+        "fstream": "^1.0.12",
16521 16473
         "inherits": "2"
16522 16474
       }
16523 16475
     },

+ 1 - 1
package.json Parādīt failu

@@ -74,7 +74,7 @@
74 74
     "less-loader": "^4.1.0",
75 75
     "nightwatch": "^0.9.12",
76 76
     "node-notifier": "^5.1.2",
77
-    "node-sass": "^4.9.3",
77
+    "node-sass": "^4.12.0",
78 78
     "optimize-css-assets-webpack-plugin": "^3.2.0",
79 79
     "ora": "^1.2.0",
80 80
     "portfinder": "^1.0.13",