Move load-test to resources (#8560)
* fix: Move load-test to resources. * squash: Updates load-test dependencies. * squash: Fix load-test build.
This commit is contained in:
parent
7a64bf006e
commit
67a01364d3
2
Makefile
2
Makefile
|
@ -20,7 +20,7 @@ compile: compile-load-test
|
||||||
$(WEBPACK) -p
|
$(WEBPACK) -p
|
||||||
|
|
||||||
compile-load-test:
|
compile-load-test:
|
||||||
${NPM} install --prefix load-test && ${NPM} run build --prefix load-test
|
${NPM} install --prefix resources/load-test && ${NPM} run build --prefix resources/load-test
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -fr $(BUILD_DIR)
|
rm -fr $(BUILD_DIR)
|
||||||
|
|
|
@ -15,5 +15,5 @@ resources/robots.txt /usr/share/jitsi-meet/
|
||||||
resources/*.sh /usr/share/jitsi-meet/scripts/
|
resources/*.sh /usr/share/jitsi-meet/scripts/
|
||||||
pwa-worker.js /usr/share/jitsi-meet/
|
pwa-worker.js /usr/share/jitsi-meet/
|
||||||
manifest.json /usr/share/jitsi-meet/
|
manifest.json /usr/share/jitsi-meet/
|
||||||
load-test/*.html /usr/share/jitsi-meet/load-test/
|
resources/load-test/*.html /usr/share/jitsi-meet/load-test/
|
||||||
load-test/libs /usr/share/jitsi-meet/load-test/
|
resources/load-test/libs /usr/share/jitsi-meet/load-test/
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* global $, config, JitsiMeetJS */
|
/* global $, config, JitsiMeetJS */
|
||||||
import 'jquery';
|
import 'jquery';
|
||||||
import { parseURLParams } from '../react/features/base/util/parseURLParams';
|
import { parseURLParams } from '../../react/features/base/util/parseURLParams';
|
||||||
import { parseURIString } from '../react/features/base/util/uri';
|
import { parseURIString } from '../../react/features/base/util/uri';
|
||||||
|
|
||||||
const params = parseURLParams(window.location, false, 'hash');
|
const params = parseURLParams(window.location, false, 'hash');
|
||||||
const { isHuman = false } = params;
|
const { isHuman = false } = params;
|
File diff suppressed because it is too large
Load Diff
|
@ -15,7 +15,7 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"readmeFilename": "../README.md",
|
"readmeFilename": "../README.md",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jquery": "3.4.0"
|
"jquery": "3.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "7.5.5",
|
"@babel/core": "7.5.5",
|
||||||
|
@ -31,18 +31,19 @@
|
||||||
"babel-eslint": "10.0.1",
|
"babel-eslint": "10.0.1",
|
||||||
"babel-loader": "8.0.4",
|
"babel-loader": "8.0.4",
|
||||||
"eslint": "5.6.1",
|
"eslint": "5.6.1",
|
||||||
"eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#1.0.1",
|
"eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#1.0.3",
|
||||||
"eslint-plugin-flowtype": "2.50.3",
|
"eslint-plugin-flowtype": "2.50.3",
|
||||||
"eslint-plugin-import": "2.14.0",
|
"eslint-plugin-import": "2.20.2",
|
||||||
"eslint-plugin-jsdoc": "3.8.0",
|
"eslint-plugin-jsdoc": "3.8.0",
|
||||||
"expose-loader": "0.7.5",
|
"expose-loader": "0.7.5",
|
||||||
"flow-bin": "0.104.0",
|
"flow-bin": "0.104.0",
|
||||||
"imports-loader": "0.7.1",
|
"imports-loader": "0.7.1",
|
||||||
|
"lodash": "4.17.20",
|
||||||
"string-replace-loader": "2.1.1",
|
"string-replace-loader": "2.1.1",
|
||||||
"style-loader": "0.19.0",
|
"style-loader": "0.19.0",
|
||||||
"webpack": "4.27.1",
|
"webpack": "4.43.0",
|
||||||
"webpack-bundle-analyzer": "3.4.1",
|
"webpack-bundle-analyzer": "3.4.1",
|
||||||
"webpack-cli": "3.1.2"
|
"webpack-cli": "3.3.11"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.0.0",
|
"node": ">=8.0.0",
|
Loading…
Reference in New Issue