aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix mac nightly build (#2198)

Browse source 
* Update mmjstool

* REVERT ME

* Now try this

* Upgrade node properly

* More package fixes

* Re-revert
This commit is contained in:
Devin Binnie 2022-07-15 12:21:48 -04:00 committed by GitHub
parent 2618abe822
commit d4c99c27c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.circleci/config.yml
View file

@ -281,7 +281,7 @@ jobs:
- run: brew install yq - run: brew install yq
- run: - run:
name: Update node to v16 name: Update node to v16
command: brew upgrade node || true command: nvm install --lts && nvm use --lts
- run: - run:
name: Installing npm dependencies name: Installing npm dependencies
command: npm ci command: npm ci
@ -330,7 +330,7 @@ jobs:
at: ./build at: ./build
- run: - run:
name: Update node to v16 name: Update node to v16
command: brew upgrade node || true command: nvm install --lts && nvm use --lts
- run: - run:
name: Install yq name: Install yq
command: brew install yq command: brew install yq
@ -365,7 +365,7 @@ jobs:
at: ./build at: ./build
- run: - run:
name: Update node to v16 name: Update node to v16
command: brew upgrade node || true command: nvm install --lts && nvm use --lts
- run: - run:
name: Install yq name: Install yq
command: brew install yq command: brew install yq

167
package-lock.json generated
View file

@ -84,7 +84,7 @@
"jest": "27.5.1", "jest": "27.5.1",
"jest-junit": "13.1.0", "jest-junit": "13.1.0",
"mini-css-extract-plugin": "2.6.0", "mini-css-extract-plugin": "2.6.0",
"mmjstool": "github:mattermost/mattermost-utilities#d849d3819112bd828f08caf0155bd7ed62f18950", "mmjstool": "github:mattermost/mattermost-utilities#3b4506b0f6b14fbb402f9f8ef932370e459e3773",
"mocha-circleci-reporter": "0.0.3", "mocha-circleci-reporter": "0.0.3",
"node-gyp": "9.0.0", "node-gyp": "9.0.0",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
@ -8014,9 +8014,9 @@
"dev": true "dev": true
}, },
"node_modules/@storybook/react/node_modules/type-fest": { "node_modules/@storybook/react/node_modules/type-fest": {
"version": "2.12.2", "version": "2.16.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.2.tgz", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.16.0.tgz",
"integrity": "sha512-qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ==", "integrity": "sha512-qpaThT2HQkFb83gMOrdKVsfCN7LKxP26Yq+smPzY1FqoHRjqmjqHXA7n5Gkxi8efirtbeEUxzfEdePthQWCuHw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"peer": true, "peer": true,
@ -17640,20 +17640,6 @@
"node": ">=0.8.x" "node": ">=0.8.x"
} }
}, },
"node_modules/eventsource": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
"integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"original": "^1.0.0"
},
"engines": {
"node": ">=0.12.0"
}
},
"node_modules/evp_bytestokey": { "node_modules/evp_bytestokey": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@ -24107,7 +24093,7 @@
}, },
"node_modules/mmjstool": { "node_modules/mmjstool": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#d849d3819112bd828f08caf0155bd7ed62f18950", "resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#3b4506b0f6b14fbb402f9f8ef932370e459e3773",
"integrity": "sha512-BGAxhpL3jZai7EZJKu1xcgeMPzvRUYRUWRmezw89iw6uEkYlEK4AiV0eM47O7ABS0n9aUH5QvuuiPccMtV+Yfg==", "integrity": "sha512-BGAxhpL3jZai7EZJKu1xcgeMPzvRUYRUWRmezw89iw6uEkYlEK4AiV0eM47O7ABS0n9aUH5QvuuiPccMtV+Yfg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
@ -25525,17 +25511,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/original": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
"integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"url-parse": "^1.4.3"
}
},
"node_modules/os-browserify": { "node_modules/os-browserify": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@ -26840,14 +26815,6 @@
"node": ">=0.4.x" "node": ">=0.4.x"
} }
}, },
"node_modules/querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"dev": true,
"optional": true,
"peer": true
},
"node_modules/quick-lru": { "node_modules/quick-lru": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@ -28911,38 +28878,6 @@
"websocket-driver": "^0.7.4" "websocket-driver": "^0.7.4"
} }
}, },
"node_modules/sockjs-client": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz",
"integrity": "sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"debug": "^3.2.7",
"eventsource": "^1.1.0",
"faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
"url-parse": "^1.5.10"
},
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://tidelift.com/funding/github/npm/sockjs-client"
}
},
"node_modules/sockjs-client/node_modules/debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"ms": "^2.1.1"
}
},
"node_modules/sockjs/node_modules/uuid": { "node_modules/sockjs/node_modules/uuid": {
"version": "8.3.2", "version": "8.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@ -31068,18 +31003,6 @@
"url": "https://opencollective.com/webpack" "url": "https://opencollective.com/webpack"
} }
}, },
"node_modules/url-parse": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"querystringify": "^2.1.1",
"requires-port": "^1.0.0"
}
},
"node_modules/url-parse-lax": { "node_modules/url-parse-lax": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
@ -38325,9 +38248,9 @@
"dev": true "dev": true
}, },
"type-fest": { "type-fest": {
"version": "2.12.2", "version": "2.16.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.2.tgz", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.16.0.tgz",
"integrity": "sha512-qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ==", "integrity": "sha512-qpaThT2HQkFb83gMOrdKVsfCN7LKxP26Yq+smPzY1FqoHRjqmjqHXA7n5Gkxi8efirtbeEUxzfEdePthQWCuHw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"peer": true "peer": true
@ -46017,17 +45940,6 @@
"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
"dev": true "dev": true
}, },
"eventsource": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
"integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"original": "^1.0.0"
}
},
"evp_bytestokey": { "evp_bytestokey": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@ -51047,10 +50959,10 @@
"dev": true "dev": true
}, },
"mmjstool": { "mmjstool": {
"version": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#d849d3819112bd828f08caf0155bd7ed62f18950", "version": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#3b4506b0f6b14fbb402f9f8ef932370e459e3773",
"integrity": "sha512-BGAxhpL3jZai7EZJKu1xcgeMPzvRUYRUWRmezw89iw6uEkYlEK4AiV0eM47O7ABS0n9aUH5QvuuiPccMtV+Yfg==", "integrity": "sha512-BGAxhpL3jZai7EZJKu1xcgeMPzvRUYRUWRmezw89iw6uEkYlEK4AiV0eM47O7ABS0n9aUH5QvuuiPccMtV+Yfg==",
"dev": true, "dev": true,
"from": "mmjstool@github:mattermost/mattermost-utilities#d849d3819112bd828f08caf0155bd7ed62f18950", "from": "mmjstool@github:mattermost/mattermost-utilities#3b4506b0f6b14fbb402f9f8ef932370e459e3773",
"requires": { "requires": {
"@typescript-eslint/typescript-estree": "5.8.1", "@typescript-eslint/typescript-estree": "5.8.1",
"estree-walk": "2.2.0", "estree-walk": "2.2.0",
@ -52155,17 +52067,6 @@
} }
} }
}, },
"original": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
"integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"url-parse": "^1.4.3"
}
},
"os-browserify": { "os-browserify": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@ -53182,14 +53083,6 @@
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
"dev": true "dev": true
}, },
"querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"dev": true,
"optional": true,
"peer": true
},
"quick-lru": { "quick-lru": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@ -54862,34 +54755,6 @@
} }
} }
}, },
"sockjs-client": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz",
"integrity": "sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"debug": "^3.2.7",
"eventsource": "^1.1.0",
"faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
"url-parse": "^1.5.10"
},
"dependencies": {
"debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"ms": "^2.1.1"
}
}
}
},
"socks": { "socks": {
"version": "2.6.2", "version": "2.6.2",
"resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz", "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
@ -56548,18 +56413,6 @@
} }
} }
}, },
"url-parse": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"querystringify": "^2.1.1",
"requires-port": "^1.0.0"
}
},
"url-parse-lax": { "url-parse-lax": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",

2
package.json
View file

@ -162,7 +162,7 @@
"jest": "27.5.1", "jest": "27.5.1",
"jest-junit": "13.1.0", "jest-junit": "13.1.0",
"mini-css-extract-plugin": "2.6.0", "mini-css-extract-plugin": "2.6.0",
"mmjstool": "github:mattermost/mattermost-utilities#d849d3819112bd828f08caf0155bd7ed62f18950", "mmjstool": "github:mattermost/mattermost-utilities#3b4506b0f6b14fbb402f9f8ef932370e459e3773",
"mocha-circleci-reporter": "0.0.3", "mocha-circleci-reporter": "0.0.3",
"node-gyp": "9.0.0", "node-gyp": "9.0.0",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",