TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert package-lock changes

Browse Source
feature/default_network_editable
bitpshr 6 years ago
parent a319c8ce42
commit d85fc246c5
3 changed files with 32881 additions and 28378 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      .circleci/config.yml
  2. 61229
      package-lock.json
  3. 2
      package.json

26
.circleci/config.yml
Unescape View File

@ -102,15 +102,15 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- v1-dependency-cache-{{ checksum "package-lock.json" }} - dependency-cache-{{ checksum "package-lock.json" }}
# fallback to using the latest cache if no exact match is found # fallback to using the latest cache if no exact match is found
- v1-dependency-cache- - dependency-cache-
- run: - run:
name: Install npm 6 + deps via npm name: Install npm 6 + deps via npm
command: | command: |
sudo npm install -g npm@6.1.0 && npm install sudo npm install -g npm@6.1.0 && npm install
- save_cache: - save_cache:
key: v1-dependency-cache-{{ checksum "package-lock.json" }} key: dependency-cache-{{ checksum "package-lock.json" }}
paths: paths:
- node_modules - node_modules
@ -120,12 +120,12 @@ jobs:
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
key: v1-dependency-cache-firefox- key: dependency-cache-firefox-
- run: - run:
name: Download Firefox If needed name: Download Firefox If needed
command: ./.circleci/scripts/firefox-download.sh command: ./.circleci/scripts/firefox-download.sh
- save_cache: - save_cache:
key: v1-dependency-cache-firefox- key: dependency-cache-firefox-
paths: paths:
- firefox - firefox
@ -135,7 +135,7 @@ jobs:
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
key: v1-dependency-cache-{{ checksum "package-lock.json" }} key: dependency-cache-{{ checksum "package-lock.json" }}
- run: - run:
name: build:dist name: build:dist
command: npm run dist command: npm run dist
@ -143,7 +143,7 @@ jobs:
name: build:debug name: build:debug
command: find dist/ -type f -exec md5sum {} \; | sort -k 2 command: find dist/ -type f -exec md5sum {} \; | sort -k 2
- save_cache: - save_cache:
key: v1-build-cache-{{ .Revision }} key: build-cache-{{ .Revision }}
paths: paths:
- dist - dist
- builds - builds
@ -154,12 +154,12 @@ jobs:
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
key: v1-dependency-cache-{{ checksum "package-lock.json" }} key: dependency-cache-{{ checksum "package-lock.json" }}
- run: - run:
name: build:dist name: build:dist
command: npm run doc command: npm run doc
- save_cache: - save_cache:
key: v1-docs-cache-{{ .Revision }} key: docs-cache-{{ .Revision }}
paths: paths:
- docs/jsdoc - docs/jsdoc
@ -169,7 +169,7 @@ jobs:
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
key: v1-dependency-cache-{{ checksum "package-lock.json" }} key: dependency-cache-{{ checksum "package-lock.json" }}
- run: - run:
name: Get Scss Cache key name: Get Scss Cache key
# this allows us to checksum against a whole directory # this allows us to checksum against a whole directory
@ -178,7 +178,7 @@ jobs:
name: Build for integration tests name: Build for integration tests
command: npm run test:integration:build command: npm run test:integration:build
- save_cache: - save_cache:
key: v1-scss-cache-{{ checksum "scss_checksum" }} key: scss-cache-{{ checksum "scss_checksum" }}
paths: paths:
- ui/app/css/output - ui/app/css/output
@ -286,12 +286,12 @@ jobs:
- restore_cache: - restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }} key: dependency-cache-{{ checksum "package-lock.json" }}
- restore_cache: - restore_cache:
key: v1-build-cache-{{ .Revision }} key: build-cache-{{ .Revision }}
- run: - run:
name: Test name: Test
command: npm run test:screens command: npm run test:screens
- save_cache: - save_cache:
key: v1-job-screens-{{ .Revision }} key: job-screens-{{ .Revision }}
paths: paths:
- test-artifacts - test-artifacts

61229
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
Unescape View File

@ -64,7 +64,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@material-ui/core": "1.2.0", "@material-ui/core": "^1.0.0",
"abi-decoder": "^1.0.9", "abi-decoder": "^1.0.9",
"asmcrypto.js": "0.22.0", "asmcrypto.js": "0.22.0",
"async": "^2.5.0", "async": "^2.5.0",

Write Preview
Loading…
Cancel
Save