diff --git a/.gitignore b/.gitignore index 1d400eb3..2464473b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .idea/ node_modules/ .sass-cache/ +.npm/ /auth/certs/ /auth/js/auth.js.map @@ -33,4 +34,4 @@ node_modules/ /webpack/*.js /webpack/*.js.map -/files_*.pem \ No newline at end of file +/files_*.pem diff --git a/babel.config.ts b/babel.config.ts index 952ab4b6..fd5da77f 100644 --- a/babel.config.ts +++ b/babel.config.ts @@ -4,14 +4,12 @@ export default api => { [ "@babel/preset-env", { - "corejs": {"version": 3}, + "corejs": {"version": '3.33', "proposals": false}, "useBuiltIns": "usage", "targets": { - "edge": "17", - "firefox": "60", - "chrome": "67", - "safari": "11.1", - "ie": "11" + "edge": "111", + "firefox": "100", + "chrome": "109" } } ] diff --git a/package-lock.json b/package-lock.json index 6e32608b..543338b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19162,6 +19162,11 @@ "object-assign": "^4.1.1", "react-is": "^16.13.1" } + }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" } } }, diff --git a/package.json b/package.json index b1c15ddc..71021666 100644 --- a/package.json +++ b/package.json @@ -127,4 +127,4 @@ "webpack-manifest-plugin": "^3.2.0", "webrtc-adapter": "^7.5.1" } -} \ No newline at end of file +} diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 diff --git a/scripts/build_declarations.sh b/scripts/build_declarations.sh old mode 100644 new mode 100755 diff --git a/scripts/build_in_docker.sh b/scripts/build_in_docker.sh new file mode 100755 index 00000000..5d79ed5e --- /dev/null +++ b/scripts/build_in_docker.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +SCRIPT=$(realpath "$0") +SCRIPTPATH=$(dirname "$SCRIPT") +BASEPATH="$(realpath "${SCRIPTPATH}/../")" + +NPM_DIR="${BASEPATH}/.npm" + +if [[ ! -d "${NPM_DIR}" ]]; then + mkdir "${NPM_DIR}" || exit 1 +fi + +if [[ "${BUILDINDOCKER:-}" != "yes" ]]; then + docker run --rm --workdir "/work" -v "${NPM_DIR}:/home/" -v "${BASEPATH}:/work" -e BUILDINDOCKER=yes node:14-bullseye /bin/bash -c 'chmod +x /work/scripts/build_in_docker.sh && /work/scripts/build_in_docker.sh' + exit +fi + +## in docker + +echo "adding npmrc" +cat >>"${HOME}/.npmrc" <<'EOF' +cache=/work/.npm +fund=false +EOF + +echo "adding secure git dir" +git config --global --add safe.directory /work + +echo "running chmods" +find "${BASEPATH}" -iname "*.sh" -exec chmod +x {} + + +echo "Cleaning up old files" +"${BASEPATH}/scripts/cleanup.sh" full >/dev/null 2>&1 || exit 1 + +echo "Installing npm packages" +npm i || exit 1 + +echo "Updating browser list" +npx browserslist@latest --update-db || exit 1 + +echo "running build" +"${BASEPATH}/scripts/build.sh" web rel + +echo "fixing perms" +chown -R 1000:1000 /work diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh old mode 100644 new mode 100755 diff --git a/webpack.config.ts b/webpack.config.ts index e7d62180..833a985c 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -46,9 +46,9 @@ const generateLocalBuildInfo = async (target: string): Promise = { const gitRevision = fs.readFileSync(path.join(__dirname, ".git", "HEAD")).toString(); if(gitRevision.indexOf("/") === -1) { - info.gitVersion = (gitRevision || "00000000").substr(0, 8); + info.gitVersion = (gitRevision || "00000000").substring(0, 8); } else { - info.gitVersion = fs.readFileSync(path.join(__dirname, ".git", gitRevision.substr(5).trim())).toString().substr(0, 8); + info.gitVersion = fs.readFileSync(path.join(__dirname, ".git", gitRevision.substring(5).trim())).toString().substring(0, 8); } try {