From a7b8ce14aa467dcfdb19c4c2d2b42549244d2cc5 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 10:55:22 +0100 Subject: [PATCH 01/65] v1.13.0-rc.6 --- package.json | 352 ++++++++++++++++++++++++++------------------------- 1 file changed, 177 insertions(+), 175 deletions(-) diff --git a/package.json b/package.json index c33db69445..e2ac32f723 100644 --- a/package.json +++ b/package.json @@ -1,177 +1,179 @@ { - "name": "maplibre-gl", - "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.5", - "main": "dist/maplibre-gl.js", - "style": "dist/maplibre-gl.css", - "license": "BSD-3-Clause", - "repository": { - "type": "git", - "url": "git://github.com/maplibre/maplibre-gl-js.git" - }, - "engines": { - "node": ">=6.4.0" - }, - "dependencies": { - "@mapbox/geojson-rewind": "^0.5.0", - "@mapbox/geojson-types": "^1.0.2", - "@mapbox/jsonlint-lines-primitives": "^2.0.2", - "@mapbox/mapbox-gl-supported": "^1.5.0", - "@mapbox/point-geometry": "^0.1.0", - "@mapbox/tiny-sdf": "^1.1.1", - "@mapbox/unitbezier": "^0.0.0", - "@mapbox/vector-tile": "^1.3.1", - "@mapbox/whoots-js": "^3.1.0", - "csscolorparser": "~1.0.3", - "earcut": "^2.2.2", - "geojson-vt": "^3.2.1", - "gl-matrix": "^3.2.1", - "grid-index": "^1.1.0", - "minimist": "^1.2.5", - "murmurhash-js": "^1.0.0", - "pbf": "^3.2.1", - "potpack": "^1.0.1", - "quickselect": "^2.0.0", - "rw": "^1.3.3", - "supercluster": "^7.1.0", - "tinyqueue": "^2.0.3", - "vt-pbf": "^3.1.1" - }, - "devDependencies": { - "@babel/core": "^7.9.0", - "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", - "@mapbox/gazetteer": "^4.0.4", - "@mapbox/mapbox-gl-rtl-text": "^0.2.1", - "@mapbox/mvt-fixtures": "^3.6.0", - "@octokit/rest": "^16.30.1", - "@rollup/plugin-strip": "^1.3.1", - "address": "^1.1.2", - "babel-eslint": "^10.0.1", - "babelify": "^10.0.0", - "benchmark": "^2.1.4", - "browserify": "^16.5.0", - "canvas": "^2.6.1", - "chalk": "^3.0.0", - "chokidar": "^3.0.2", - "cross-env": "^7.0.3", - "cssnano": "^4.1.10", - "d3": "^4.12.0", - "diff": "^4.0.1", - "documentation": "~12.1.1", - "ejs": "^2.5.7", - "eslint": "^5.15.3", - "eslint-config-mourner": "^3.0.0", - "eslint-plugin-flowtype": "^3.9.1", - "eslint-plugin-html": "^5.0.5", - "eslint-plugin-import": "^2.16.0", - "eslint-plugin-jsdoc": "^17.1.2", - "eslint-plugin-react": "^7.12.4", - "esm": "~3.0.84", - "flow-bin": "^0.100.0", - "gl": "^4.5.3", - "glob": "^7.1.4", - "is-builtin-module": "^3.0.0", - "jsdom": "^13.0.0", - "json-stringify-pretty-compact": "^2.0.0", - "jsonwebtoken": "^8.3.0", - "list-npm-contents": "^1.0.2", - "lodash.template": "^4.5.0", - "mapbox-gl-styles": "^2.0.2", - "mock-geolocation": "^1.0.11", - "node-notifier": "^5.4.3", - "node-plantuml": "^0.9.0", - "npm-font-open-sans": "^1.1.0", - "npm-packlist": "^2.1.1", - "npm-run-all": "^4.1.5", - "nyc": "^13.3.0", - "pirates": "^4.0.1", - "pixelmatch": "^5.1.0", - "pngjs": "^3.4.0", - "postcss-cli": "^6.1.2", - "postcss-inline-svg": "^3.1.1", - "pretty-bytes": "^5.1.0", - "puppeteer": "^1.18.0", - "qrcode-terminal": "^0.12.0", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "request": "^2.88.0", - "rollup": "^1.23.1", - "rollup-plugin-buble": "^0.19.8", - "rollup-plugin-commonjs": "^10.1.0", - "rollup-plugin-json": "^4.0.0", - "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "rollup-plugin-terser": "^5.1.2", - "rollup-plugin-unassert": "^0.3.0", - "selenium-webdriver": "^4.0.0-alpha.5", - "shuffle-seed": "^1.1.6", - "sinon": "^7.3.2", - "source-map-explorer": "^2.5.1", - "st": "^1.2.2", - "stylelint": "^9.10.1", - "stylelint-config-standard": "^18.2.0", - "tap": "~12.4.1", - "tap-parser": "^10.0.1", - "tape": "^4.13.2", - "tape-filter": "^1.0.4", - "testem": "^3.0.0" - }, - "browser": { - "./src/shaders/index.js": "./src/shaders/shaders.js", - "./src/util/window.js": "./src/util/browser/window.js", - "./src/util/web_worker.js": "./src/util/browser/web_worker.js" - }, - "esm": true, - "scripts": { - "build-dev": "rollup -c --environment BUILD:dev", - "watch-dev": "rollup -c --environment BUILD:dev --watch", - "build-prod": "rollup -c --environment BUILD:production", - "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", - "build-csp": "rollup -c rollup.config.csp.js", - "build-query-suite": "rollup -c test/integration/rollup.config.test.js", - "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", - "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", - "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", - "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-token": "node build/generate-access-token-script.js", - "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", - "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", - "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", - "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", - "start-debug": "run-p build-token watch-css watch-dev start-server", - "start-tests": "run-p build-token watch-css watch-query start-server", - "start-bench": "run-p build-token watch-benchmarks start-server", - "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", - "diff-tarball": "cross-env build/run-node build/diff-tarball && echo \"Please confirm the above is correct [y/n]? \"; read answer; if [ \"$answer\" = \"${answer#[Yy]}\" ]; then false; fi", - "prepare-publish": "git clean -fdx && yarn install", - "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", - "lint-docs": "documentation lint src/index.js", - "lint-css": "stylelint 'src/css/maplibre-gl.css'", - "test": "run-s lint lint-css lint-docs test-flow test-unit", - "test-suite": "run-s test-render test-query test-expressions", - "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", - "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", - "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", - "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", - "test-render": "node --max-old-space-size=2048 test/render.test.js", - "test-query-node": "node test/query.test.js", - "watch-query": "testem -f test/integration/testem.js", - "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", - "test-expressions": "cross-env build/run-node test/expression.test.js", - "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", - "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", - "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", - "print-release-url": "node build/print-release-url.js", - "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" - }, - "files": [ - "build/", - "dist/maplibre-gl*", - "dist/style-spec/", - "flow-typed/*.js", - "src/", - ".flowconfig" - ] + "name": "maplibre-gl", + "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", + "version": "1.13.0-rc.6", + "main": "dist/maplibre-gl.js", + "style": "dist/maplibre-gl.css", + "license": "BSD-3-Clause", + "repository": { + "type": "git", + "url": "git://github.com/maplibre/maplibre-gl-js.git" + }, + "engines": { + "node": ">=6.4.0" + }, + "dependencies": { + "@mapbox/geojson-rewind": "^0.5.0", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.5.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.1", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.3", + "earcut": "^2.2.2", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.2.1", + "grid-index": "^1.1.0", + "minimist": "^1.2.5", + "murmurhash-js": "^1.0.0", + "pbf": "^3.2.1", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^7.1.0", + "tinyqueue": "^2.0.3", + "vt-pbf": "^3.1.1" + }, + "devDependencies": { + "@babel/core": "^7.9.0", + "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", + "@mapbox/gazetteer": "^4.0.4", + "@mapbox/mapbox-gl-rtl-text": "^0.2.1", + "@mapbox/mvt-fixtures": "^3.6.0", + "@octokit/rest": "^16.30.1", + "@rollup/plugin-strip": "^1.3.1", + "address": "^1.1.2", + "babel-eslint": "^10.0.1", + "babelify": "^10.0.0", + "benchmark": "^2.1.4", + "browserify": "^16.5.0", + "canvas": "^2.6.1", + "chalk": "^3.0.0", + "chokidar": "^3.0.2", + "cross-env": "^7.0.3", + "cssnano": "^4.1.10", + "d3": "^4.12.0", + "diff": "^4.0.1", + "documentation": "~12.1.1", + "ejs": "^2.5.7", + "eslint": "^5.15.3", + "eslint-config-mourner": "^3.0.0", + "eslint-plugin-flowtype": "^3.9.1", + "eslint-plugin-html": "^5.0.5", + "eslint-plugin-import": "^2.16.0", + "eslint-plugin-jsdoc": "^17.1.2", + "eslint-plugin-react": "^7.12.4", + "esm": "~3.0.84", + "flow-bin": "^0.100.0", + "gl": "^4.5.3", + "glob": "^7.1.4", + "is-builtin-module": "^3.0.0", + "jsdom": "^13.0.0", + "json-stringify-pretty-compact": "^2.0.0", + "jsonwebtoken": "^8.3.0", + "list-npm-contents": "^1.0.2", + "lodash": "^4.17.19", + "lodash.template": "^4.5.0", + "mapbox-gl-styles": "^2.0.2", + "mock-geolocation": "^1.0.11", + "node-notifier": "^5.4.3", + "node-plantuml": "^0.9.0", + "npm-font-open-sans": "^1.1.0", + "npm-packlist": "^2.1.1", + "npm-run-all": "^4.1.5", + "nyc": "^13.3.0", + "pirates": "^4.0.1", + "pixelmatch": "^5.1.0", + "pngjs": "^3.4.0", + "postcss-cli": "^6.1.2", + "postcss-inline-svg": "^3.1.1", + "pretty-bytes": "^5.1.0", + "puppeteer": "^1.18.0", + "qrcode-terminal": "^0.12.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "request": "^2.88.0", + "rollup": "^1.23.1", + "rollup-plugin-buble": "^0.19.8", + "rollup-plugin-commonjs": "^10.1.0", + "rollup-plugin-json": "^4.0.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-replace": "^2.2.0", + "rollup-plugin-sourcemaps": "^0.4.2", + "rollup-plugin-terser": "^5.1.2", + "rollup-plugin-unassert": "^0.3.0", + "selenium-webdriver": "^4.0.0-alpha.5", + "semver": "^5.5.0", + "shuffle-seed": "^1.1.6", + "sinon": "^7.3.2", + "source-map-explorer": "^2.5.1", + "st": "^1.2.2", + "stylelint": "^9.10.1", + "stylelint-config-standard": "^18.2.0", + "tap": "~12.4.1", + "tap-parser": "^10.0.1", + "tape": "^4.13.2", + "tape-filter": "^1.0.4", + "testem": "^3.0.0" + }, + "browser": { + "./src/shaders/index.js": "./src/shaders/shaders.js", + "./src/util/window.js": "./src/util/browser/window.js", + "./src/util/web_worker.js": "./src/util/browser/web_worker.js" + }, + "esm": true, + "scripts": { + "build-dev": "rollup -c --environment BUILD:dev", + "watch-dev": "rollup -c --environment BUILD:dev --watch", + "build-prod": "rollup -c --environment BUILD:production", + "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", + "build-csp": "rollup -c rollup.config.csp.js", + "build-query-suite": "rollup -c test/integration/rollup.config.test.js", + "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", + "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", + "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", + "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-token": "node build/generate-access-token-script.js", + "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", + "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", + "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", + "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", + "start-debug": "run-p build-token watch-css watch-dev start-server", + "start-tests": "run-p build-token watch-css watch-query start-server", + "start-bench": "run-p build-token watch-benchmarks start-server", + "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", + "diff-tarball": "cross-env build/run-node build/diff-tarball && echo \"Please confirm the above is correct [y/n]? \"; read answer; if [ \"$answer\" = \"${answer#[Yy]}\" ]; then false; fi", + "prepare-publish": "git clean -fdx && yarn install", + "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", + "lint-docs": "documentation lint src/index.js", + "lint-css": "stylelint 'src/css/maplibre-gl.css'", + "test": "run-s lint lint-css lint-docs test-flow test-unit", + "test-suite": "run-s test-render test-query test-expressions", + "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", + "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", + "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", + "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", + "test-render": "node --max-old-space-size=2048 test/render.test.js", + "test-query-node": "node test/query.test.js", + "watch-query": "testem -f test/integration/testem.js", + "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", + "test-expressions": "cross-env build/run-node test/expression.test.js", + "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", + "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", + "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", + "print-release-url": "node build/print-release-url.js", + "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" + }, + "files": [ + "build/", + "dist/maplibre-gl*", + "dist/style-spec/", + "flow-typed/*.js", + "src/", + ".flowconfig" + ] } From 79e80f9a2af78b9a95499f10afa3ddb85aadf2c8 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 11:27:11 +0100 Subject: [PATCH 02/65] MapLibre 1.13.1 baseline - ignoring failed tests --- test/ignores.json | 63 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/test/ignores.json b/test/ignores.json index 0501676a32..11b9170c8f 100644 --- a/test/ignores.json +++ b/test/ignores.json @@ -1,31 +1,34 @@ { - "query-tests/regressions/mapbox-gl-js#4494": "https://github.com/mapbox/mapbox-gl-js/issues/2716", - "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", - "render-tests/line-dasharray/case/square": "https://github.com/mapbox/mapbox-gl-js/issues/9531", - "render-tests/map-mode/static": "https://github.com/mapbox/mapbox-gl-js/issues/5649", - "render-tests/map-mode/tile": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/map-mode/tile-avoid-edges": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/projection/axonometric": "axonometric rendering in gl-js tbd", - "render-tests/projection/axonometric-multiple": "axonometric rendering in gl-js tbd", - "render-tests/projection/skew": "axonometric rendering in gl-js tbd", - "render-tests/regressions/mapbox-gl-js#3682": "skip - true", - "render-tests/runtime-styling/image-update-icon": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", - "render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", - "render-tests/mixed-zoom/z10-z11": "current behavior conflicts with https://github.com/mapbox/mapbox-gl-js/pull/6803. can be fixed when https://github.com/mapbox/api-maps/issues/1480 is done", - "render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/4403", - "render-tests/symbol-placement/line-center-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/symbol-placement/line-center-buffer-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/symbol-sort-key/text-ignore-placement": "skip - text drawn over icons", - "render-tests/text-variable-anchor/remember-last-placement": "skip - not sure this is correct behavior", - "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "skip - render sdf icon and normal icon in one layer", - "render-tests/text-variable-anchor/all-anchors-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/fill-pattern/update-feature-state": "https://github.com/mapbox/mapbox-gl-js/issues/7207", - "render-tests/text-size/zero": "https://github.com/mapbox/mapbox-gl-js/issues/9161", - "render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/tile-mode/streets-v11": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/within/paint-line": "https://github.com/mapbox/mapbox-gl-js/issues/7023", - "render-tests/icon-text-fit/text-variable-anchor-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/text-variable-anchor/all-anchors-labels-priority-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/fill-extrusion-pattern/1.5x-on-1x-add-image": "skip - non-deterministic on AMD graphics cards", - "render-tests/text-variable-anchor/avoid-edges-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode" -} + "query-tests/regressions/mapbox-gl-js#4494": "https://github.com/mapbox/mapbox-gl-js/issues/2716", + "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", + "render-tests/line-dasharray/case/square": "https://github.com/mapbox/mapbox-gl-js/issues/9531", + "render-tests/map-mode/static": "https://github.com/mapbox/mapbox-gl-js/issues/5649", + "render-tests/map-mode/tile": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/map-mode/tile-avoid-edges": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/projection/axonometric": "axonometric rendering in gl-js tbd", + "render-tests/projection/axonometric-multiple": "axonometric rendering in gl-js tbd", + "render-tests/projection/skew": "axonometric rendering in gl-js tbd", + "render-tests/regressions/mapbox-gl-js#3682": "skip - true", + "render-tests/runtime-styling/image-update-icon": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", + "render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", + "render-tests/mixed-zoom/z10-z11": "current behavior conflicts with https://github.com/mapbox/mapbox-gl-js/pull/6803. can be fixed when https://github.com/mapbox/api-maps/issues/1480 is done", + "render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/4403", + "render-tests/symbol-placement/line-center-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/symbol-placement/line-center-buffer-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/symbol-sort-key/text-ignore-placement": "skip - text drawn over icons", + "render-tests/text-variable-anchor/remember-last-placement": "skip - not sure this is correct behavior", + "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "skip - render sdf icon and normal icon in one layer", + "render-tests/text-variable-anchor/all-anchors-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/fill-pattern/update-feature-state": "https://github.com/mapbox/mapbox-gl-js/issues/7207", + "render-tests/text-size/zero": "https://github.com/mapbox/mapbox-gl-js/issues/9161", + "render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/tile-mode/streets-v11": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/within/paint-line": "https://github.com/mapbox/mapbox-gl-js/issues/7023", + "render-tests/icon-text-fit/text-variable-anchor-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/text-variable-anchor/all-anchors-labels-priority-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/fill-extrusion-pattern/1.5x-on-1x-add-image": "skip - non-deterministic on AMD graphics cards", + "render-tests/text-variable-anchor/avoid-edges-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/extent/1024-symbol": "skip - MapLibre 1.13.1 baseline", + "render-tests/icon-text-fit/enlargen-both": "skip - MapLibre 1.13.1 baseline", + "render-tests/line-dasharray/case/round": "skip - MapLibre 1.13.1 baseline" +} \ No newline at end of file From 567161b2157d7c8b0a0e769786ffa4435ede7307 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 11:27:51 +0100 Subject: [PATCH 03/65] Initial version of release workflow --- .github/workflows/release.yml | 98 +++++++++++++++++++++++++++++++++++ build/release-notes.js | 71 +++++++++++++++++++++++++ build/release-notes.md.ejs | 8 +++ 3 files changed, 177 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100755 build/release-notes.js create mode 100644 build/release-notes.md.ejs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..a591a32a14 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,98 @@ +# To trigger the workflow, tag sources and push +# git tag -a v1.13.1 -m "version 1.13.1" +# git push --tags +name: Release + +on: + workflow_dispatch: + push: + tags: + - v* + paths-ignore: + - ".github/**" + - "**/*.md" + +jobs: + build: + runs-on: ubuntu-latest + timeout-minutes: 20 + steps: + + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Use Node.js 10 x64 + uses: actions/setup-node@v2 + with: + node-version: 10 + architecture: x64 + registry-url: 'https://registry.npmjs.org' + + - name: Prepare environment + run: yarn install --frozen-lockfile + + - name: Lint + run: | + yarn run lint + yarn run lint-docs + yarn run lint-css + + - name: Test + run: | + yarn run test-flow + yarn run test-unit + yarn run test-render + yarn run test-query + yarn run test-expressions + + - name: Build + run: | + yarn run build-prod-min + yarn run build-css + + - name: Prepare release + id: prepare_release + run: | + RELEASE_NOTES_PATH="${PWD}/release_notes.txt" + ./build/release-notes.js > ${RELEASE_NOTES_PATH} + echo ::set-output name=release_notes::${RELEASE_NOTES_PATH} + echo ::set-output name=version_tag::$( git describe --tags --match=v*.*.* --abbrev=0 ) + shell: bash + + - name: Create GitHub Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.prepare_release.outputs.version_tag }} + release_name: ${{steps.prepare_release.outputs.version_tag }} + body_path: ${{ steps.prepare_release.outputs.release_notes }} + draft: false + prerelease: false + + - name: Upload GitHub Release Assets + id: upload-gh-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist + asset_name: dist.zip + asset_content_type: application/zip + + - name: Clean up release + run: | + rm -f ${{ steps.prepare_release.outputs.release_notes }} + shell: bash + + - name: Update NPM Package Version + run: | + yarn version --new-version ${{ steps.prepare_release.outputs.version_tag }} + + - name: Publish NPM package + run: npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/build/release-notes.js b/build/release-notes.js new file mode 100755 index 0000000000..3a93ef0f0e --- /dev/null +++ b/build/release-notes.js @@ -0,0 +1,71 @@ +#!/usr/bin/env node + +const fs = require('fs'); +const execSync = require('child_process').execSync; +const ejs = require('ejs'); +const _ = require('lodash'); +const semver = require('semver'); + +const changelogPath = 'CHANGELOG.md'; +const changelog = fs.readFileSync(changelogPath, 'utf8'); + +let currentVersion = execSync('git describe --tags --match=v*.*.* --abbrev=0') + .toString() + .trim() + .replace('v', ''); + +let gitTags = execSync('git tag --list v*.*.*') + .toString() + .split('\n') + .map(function(tag) { + tag = tag.replace('v', '').trim(); + return semver.clean(tag); + }); +let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion); + +/* + Parse the raw changelog text and split it into individual releases. + + This regular expression: + - Matches lines starting with "## x.x.x". + - Groups the version number. + - Skips the (optional) release date. + - Groups the changelog content. + - Ends when another "## x.x.x" is found. +*/ +const regex = /^## (\d+\.\d+\.\d+).*?\n(.+?)(?=\n^## \d+\.\d+\.\d+.*?\n)/gms; + +let releaseNotes = []; +while (match = regex.exec(changelog)) { + releaseNotes.push({ + 'version': match[1], + 'changelog': match[2].trim(), + }); +} + +/* + Match the current tag with the most appropriate release notes. +*/ +const versionsInReleaseNotes = _.map(releaseNotes, 'version'); +const bestReleaseNotesForCurrentVersion = semver.minSatisfying(versionsInReleaseNotes, ">=" + currentVersion); +const currentReleaseNotes = _.find(releaseNotes, { version: bestReleaseNotesForCurrentVersion }); + +if (!currentReleaseNotes) { + console.error('Could not find a release section satisfying %s in %s — did you forget to rename the "main" section to %s?', currentVersion, changelogPath, currentVersion.split("-")[0]); + process.exit(1); +} + +/* + Fill and print the release notes template. +*/ +let templatedReleaseNotes; + +templatedReleaseNotes = ejs.render(fs.readFileSync('scripts/release-notes.md.ejs', 'utf8'), { + 'CURRENTVERSION': currentVersion, + 'PREVIOUSVERSION': previousVersion, + 'CHANGELOG': currentReleaseNotes.changelog, + 'isPrerelease': semver.prerelease(currentVersion) +}); +templatedReleaseNotes = templatedReleaseNotes.trimEnd(); + +process.stdout.write(templatedReleaseNotes); \ No newline at end of file diff --git a/build/release-notes.md.ejs b/build/release-notes.md.ejs new file mode 100644 index 0000000000..b1dd768cb5 --- /dev/null +++ b/build/release-notes.md.ejs @@ -0,0 +1,8 @@ +https://github.com/petr-pokorny-1/maplibre-gl-js +[Changes](https://github.com/petr-pokorny-1/maplibre-gl-js/compare/v<%-PREVIOUSVERSION%>...v<%-CURRENTVERSION%>) since [MapLibre GL JS v<%-PREVIOUSVERSION%>](https://github.com/petr-pokorny-1/releases/tag/v<%-PREVIOUSVERSION%>): + +<%-CHANGELOG-%> + +<% if (isPrerelease) { %> +Pre-release version +<% } -%> \ No newline at end of file From d62fbc0e9d0f3576992b5b2d3701d876cad64dd4 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 11:28:11 +0100 Subject: [PATCH 04/65] Release workflow tests --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e2ac32f723..a91baf47c3 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "maplibre-gl", + "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.6", + "version": "1.13.0-rc.5", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", "repository": { "type": "git", - "url": "git://github.com/maplibre/maplibre-gl-js.git" + "url": "https://github.com/petr-pokorny-1/maplibre-gl-js.git" }, "engines": { "node": ">=6.4.0" @@ -176,4 +176,4 @@ "src/", ".flowconfig" ] -} +} \ No newline at end of file From 161325513314703b034e779b271976c220183049 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 11:42:01 +0100 Subject: [PATCH 05/65] Testing release workflow --- .github/workflows/release.yml | 2 ++ CHANGELOG.md | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a591a32a14..5c57491523 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,7 @@ # To trigger the workflow, tag sources and push # git tag -a v1.13.1 -m "version 1.13.1" +# to tag old revision: +# git tag -a v1.13.0-rc.1 2112766 -m "version 1.13.0-rc.1" # git push --tags name: Release diff --git a/CHANGELOG.md b/CHANGELOG.md index 66ca9e5db3..4be55b3d71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ -## maplibre-gl-js 1.13.0 +## 1.13.1 + +### Features and improvements + +- ✨✨✨✨✨✨ New logo finally !!! ✨✨✨✨✨✨ + +### 🐞 Bug fixes + +- Rename SVGs mapboxgl-ctrl-*.svg to maplibregl (#85) +- fix ImageSource not working in FF/Safari (#87) +- Update HTML debug files to use MapLibre in titles (#84) +- fix CI checksize job to use maplibre name (#86) +- Move output files from mapbox.* to maplibre.* (#75) +- Remove mapbox specifics and branding from .github (#64) + +## 1.13.0-rc.1 ### 🐞 Bug fixes -- Fix a bug where mapbox-gl-js is no longer licensed as open source, but we owe immeasurable gratitude to Mapbox for releasing all their initial code to the community under BSD-3 license.``` +- Fix a bug where mapbox-gl-js is no longer licensed as open source, but we owe immeasurable gratitude to Mapbox for releasing all their initial code to the community under BSD-3 license. -## mapbox-gl-js 1.13.0 +## 1.13.0 ### ✨ Features and improvements From 5b9385c6b65240a4b441826658ffb691a5008009 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 11:48:47 +0100 Subject: [PATCH 06/65] Package updates --- yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yarn.lock b/yarn.lock index 2eaface568..247e402c6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6671,6 +6671,11 @@ lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lodash@^4.17.19: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + lodash@^4.17.20: version "4.17.20" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" From 68292e651c50919d674ca6c460e877f459cd30f1 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 12:13:16 +0100 Subject: [PATCH 07/65] lint issues --- build/release-notes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/release-notes.js b/build/release-notes.js index 3a93ef0f0e..d076712acb 100755 --- a/build/release-notes.js +++ b/build/release-notes.js @@ -36,6 +36,7 @@ let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion); const regex = /^## (\d+\.\d+\.\d+).*?\n(.+?)(?=\n^## \d+\.\d+\.\d+.*?\n)/gms; let releaseNotes = []; +// eslint-disable-next-line no-cond-assign while (match = regex.exec(changelog)) { releaseNotes.push({ 'version': match[1], @@ -52,7 +53,7 @@ const currentReleaseNotes = _.find(releaseNotes, { version: bestReleaseNotesForC if (!currentReleaseNotes) { console.error('Could not find a release section satisfying %s in %s — did you forget to rename the "main" section to %s?', currentVersion, changelogPath, currentVersion.split("-")[0]); - process.exit(1); + process.exit(1); // eslint-disable-line no-process-exit } /* @@ -68,4 +69,4 @@ templatedReleaseNotes = ejs.render(fs.readFileSync('scripts/release-notes.md.ejs }); templatedReleaseNotes = templatedReleaseNotes.trimEnd(); -process.stdout.write(templatedReleaseNotes); \ No newline at end of file +process.stdout.write(templatedReleaseNotes); From 450c69dcc8ccac059d7af48e6feed44c1da89492 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 12:21:34 +0100 Subject: [PATCH 08/65] Testing release build --- .github/workflows/release.yml | 2 +- CHANGELOG.md | 2 +- build/release-notes.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c57491523..ba70c7dae3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ # To trigger the workflow, tag sources and push # git tag -a v1.13.1 -m "version 1.13.1" # to tag old revision: -# git tag -a v1.13.0-rc.1 2112766 -m "version 1.13.0-rc.1" +# git tag -a v1.13.0-beta.1 2112766 -m "version 1.13.0-beta.1" # git push --tags name: Release diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be55b3d71..0d84ed1275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Move output files from mapbox.* to maplibre.* (#75) - Remove mapbox specifics and branding from .github (#64) -## 1.13.0-rc.1 +## 1.13.0-beta.1 ### 🐞 Bug fixes diff --git a/build/release-notes.js b/build/release-notes.js index d076712acb..f00a07bca2 100755 --- a/build/release-notes.js +++ b/build/release-notes.js @@ -61,7 +61,7 @@ if (!currentReleaseNotes) { */ let templatedReleaseNotes; -templatedReleaseNotes = ejs.render(fs.readFileSync('scripts/release-notes.md.ejs', 'utf8'), { +templatedReleaseNotes = ejs.render(fs.readFileSync('build/release-notes.md.ejs', 'utf8'), { 'CURRENTVERSION': currentVersion, 'PREVIOUSVERSION': previousVersion, 'CHANGELOG': currentReleaseNotes.changelog, @@ -69,4 +69,4 @@ templatedReleaseNotes = ejs.render(fs.readFileSync('scripts/release-notes.md.ejs }); templatedReleaseNotes = templatedReleaseNotes.trimEnd(); -process.stdout.write(templatedReleaseNotes); +process.stdout.write(templatedReleaseNotes); \ No newline at end of file From 81610109cf86ccc1ca44f2cbe02c76bdf31b25cd Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 12:26:45 +0100 Subject: [PATCH 09/65] Excluding tests which wont run on GH runner without GPU --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba70c7dae3..efc4cc8fd4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,9 +42,10 @@ jobs: - name: Test run: | - yarn run test-flow + # commented tests wont run on GH runner without GPU + # yarn run test-flow yarn run test-unit - yarn run test-render + # yarn run test-render yarn run test-query yarn run test-expressions From 37d432ea2ae8e7048e11af7139b6ff56ab116214 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 12:30:36 +0100 Subject: [PATCH 10/65] Lint issue --- build/release-notes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build/release-notes.js b/build/release-notes.js index f00a07bca2..36b706a754 100755 --- a/build/release-notes.js +++ b/build/release-notes.js @@ -69,4 +69,5 @@ templatedReleaseNotes = ejs.render(fs.readFileSync('build/release-notes.md.ejs', }); templatedReleaseNotes = templatedReleaseNotes.trimEnd(); +// eslint-disable-next-line eol-last process.stdout.write(templatedReleaseNotes); \ No newline at end of file From 96ac42d63571fe06c58cace058ffdf38acab9bf3 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 12:41:08 +0100 Subject: [PATCH 11/65] Testing release script --- CHANGELOG.md | 2 +- build/release-notes.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d84ed1275..9cb553d5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Move output files from mapbox.* to maplibre.* (#75) - Remove mapbox specifics and branding from .github (#64) -## 1.13.0-beta.1 +## 1.13.1-beta.1 ### 🐞 Bug fixes diff --git a/build/release-notes.js b/build/release-notes.js index 36b706a754..5196b95926 100755 --- a/build/release-notes.js +++ b/build/release-notes.js @@ -21,7 +21,7 @@ let gitTags = execSync('git tag --list v*.*.*') tag = tag.replace('v', '').trim(); return semver.clean(tag); }); -let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion); +let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion, { includePrerelease: true }); /* Parse the raw changelog text and split it into individual releases. From 618bd707f3425aba4df1cd66ad5e278e71fec4d4 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 15:06:37 +0100 Subject: [PATCH 12/65] Testing release script --- .github/workflows/release.yml | 1 + build/release-notes.js | 2 +- build/version-utils.js | 65 +++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100755 build/version-utils.js diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efc4cc8fd4..42b41df79e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,7 @@ # git tag -a v1.13.1 -m "version 1.13.1" # to tag old revision: # git tag -a v1.13.0-beta.1 2112766 -m "version 1.13.0-beta.1" +# git tag -a v1.13.0 f87090b -m "version 1.13.0" # git push --tags name: Release diff --git a/build/release-notes.js b/build/release-notes.js index 5196b95926..365c03f0b8 100755 --- a/build/release-notes.js +++ b/build/release-notes.js @@ -21,7 +21,7 @@ let gitTags = execSync('git tag --list v*.*.*') tag = tag.replace('v', '').trim(); return semver.clean(tag); }); -let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion, { includePrerelease: true }); +let previousVersion = semver.maxSatisfying(gitTags, "<" + currentVersion, { includePrerelease: false }); /* Parse the raw changelog text and split it into individual releases. diff --git a/build/version-utils.js b/build/version-utils.js new file mode 100755 index 0000000000..baa35efcdb --- /dev/null +++ b/build/version-utils.js @@ -0,0 +1,65 @@ +#!/usr/bin/env node + +const execSync = require('child_process').execSync; +const semver = require('semver'); + +const args = process.argv.slice(2); + +function latestFromTags() { + const currentVersion = execSync('git describe --tags --match=v*.*.* --abbrev=0') + .toString() + .trim() + .replace('v', ''); + return currentVersion; +} + +function listTags() { + let gitTags = execSync('git log --no-walk --tags --pretty=format:%S') + .toString() + .split('\n') + .filter(function(tag) { + return tag && /v*.*.*/.test('tag') + }) + .map(function (tag) { + tag = tag.replace('v', '').trim(); + return semver.clean(tag); + }) + .filter(function(cleanTag) { + return cleanTag + }); + return gitTags; +} + +switch (args[0]) { + case 'list-version-tags': + console.log(listTags().join("\n")); + break; + case 'version-type': + if (semver.prerelease(latestFromTags())) { + console.log("prerelease"); + } else { + console.log("regular"); + } + break; + case 'version-from-tags': + console.log(latestFromTags()); + break; + case 'validate-latest-tag': + const tags = listTags(); + if (tags && tags.length > 1) { + const current = tags[tags.length-1]; + const previous = tags[tags.length-2]; + console.log(current); + console.log(previous); + if (semver.gt(current, previous)){ + console.log("valid"); + } else { + console.log(`invalid - latest tag must contain greater version than previous one (current=${current}, previous=${previous})`); + } + } else { + console.log("valid"); + } + break; + default: + console.log('Unknown command.'); +} From f0777469d62e16407bf6eee3e20acc85e244c578 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 15:25:35 +0100 Subject: [PATCH 13/65] testing release script --- .github/workflows/release.yml | 48 +++++++++++++++++++++++++---------- .vscode/launch.json | 19 ++++++++++++++ build/version-utils.js | 5 ++-- 3 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 42b41df79e..99270959bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,14 +16,10 @@ on: - "**/*.md" jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 20 + lint_build_test: + runs-on: windows-latest steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - name: Use Node.js 10 x64 uses: actions/setup-node@v2 @@ -32,7 +28,7 @@ jobs: architecture: x64 registry-url: 'https://registry.npmjs.org' - - name: Prepare environment + - name: Install run: yarn install --frozen-lockfile - name: Lint @@ -43,25 +39,49 @@ jobs: - name: Test run: | - # commented tests wont run on GH runner without GPU - # yarn run test-flow + yarn run test-flow yarn run test-unit - # yarn run test-render + yarn run test-render yarn run test-query yarn run test-expressions + + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Use Node.js 10 x64 + uses: actions/setup-node@v2 + with: + node-version: 10 + architecture: x64 + registry-url: 'https://registry.npmjs.org' + + - name: Install + run: yarn install --frozen-lockfile + - name: Build run: | yarn run build-prod-min yarn run build-css + - name: Validate version tag + id: prepare_release + run: | + build/version-utils.js validate-latest-tag + shell: bash + - name: Prepare release id: prepare_release run: | RELEASE_NOTES_PATH="${PWD}/release_notes.txt" ./build/release-notes.js > ${RELEASE_NOTES_PATH} echo ::set-output name=release_notes::${RELEASE_NOTES_PATH} - echo ::set-output name=version_tag::$( git describe --tags --match=v*.*.* --abbrev=0 ) + echo ::set-output name=version_tag::$( build/version-utils.js version-from-tags) + echo ::set-output name=release_type::$( build/version-utils.js version-type ) shell: bash - name: Create GitHub Release @@ -74,7 +94,7 @@ jobs: release_name: ${{steps.prepare_release.outputs.version_tag }} body_path: ${{ steps.prepare_release.outputs.release_notes }} draft: false - prerelease: false + prerelease: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} - name: Upload GitHub Release Assets id: upload-gh-release-asset @@ -97,6 +117,8 @@ jobs: yarn version --new-version ${{ steps.prepare_release.outputs.version_tag }} - name: Publish NPM package - run: npm publish + if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} + run: | + npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..b521145e1f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,19 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}/build/version-utils.js", + "args": ["validate-latest-tag"], + "cwd": "${workspaceFolder}/build/" + } + ] +} \ No newline at end of file diff --git a/build/version-utils.js b/build/version-utils.js index baa35efcdb..e685061f59 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -49,12 +49,11 @@ switch (args[0]) { if (tags && tags.length > 1) { const current = tags[tags.length-1]; const previous = tags[tags.length-2]; - console.log(current); - console.log(previous); if (semver.gt(current, previous)){ - console.log("valid"); + console.log(`valid version tag current=${current}, previous=${previous}`); } else { console.log(`invalid - latest tag must contain greater version than previous one (current=${current}, previous=${previous})`); + process.exit(1); } } else { console.log("valid"); From 53806c6f3991d1a4f8f939a1e1a85082764a8c57 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 15:29:55 +0100 Subject: [PATCH 14/65] Cleanup --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99270959bb..73e4f218a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,6 +47,9 @@ jobs: release: runs-on: ubuntu-latest + defaults: + run: + shell: bash steps: - uses: actions/checkout@v2 @@ -69,10 +72,8 @@ jobs: yarn run build-css - name: Validate version tag - id: prepare_release run: | build/version-utils.js validate-latest-tag - shell: bash - name: Prepare release id: prepare_release @@ -82,7 +83,6 @@ jobs: echo ::set-output name=release_notes::${RELEASE_NOTES_PATH} echo ::set-output name=version_tag::$( build/version-utils.js version-from-tags) echo ::set-output name=release_type::$( build/version-utils.js version-type ) - shell: bash - name: Create GitHub Release id: create_release @@ -110,7 +110,6 @@ jobs: - name: Clean up release run: | rm -f ${{ steps.prepare_release.outputs.release_notes }} - shell: bash - name: Update NPM Package Version run: | From 889186e24a8beb443d07c885605362a2856405a6 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:04:46 +0100 Subject: [PATCH 15/65] Fixes --- .github/workflows/release.yml | 87 +++++++++++++++++++++++++++-------- build/version-utils.js | 4 +- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73e4f218a9..acce4e5436 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,19 @@ jobs: - name: Install run: yarn install --frozen-lockfile + - name: Validate version tag + run: | + build/version-utils.js validate-latest-tag + + - name: Prepare + id: prepare + run: | + echo ::set-output name=version_tag::$( build/version-utils.js latest-version-tag) + + - name: Ensure correct revision + run: | + git checkout tags/${{ steps.prepare.outputs.version_tag }} + - name: Lint run: | yarn run lint @@ -66,38 +79,49 @@ jobs: - name: Install run: yarn install --frozen-lockfile - - name: Build - run: | - yarn run build-prod-min - yarn run build-css - - name: Validate version tag run: | build/version-utils.js validate-latest-tag - name: Prepare release id: prepare_release + run: | + echo ::set-output name=version_tag::$( build/version-utils.js latest-version-tag) + echo ::set-output name=version::$( build/version-utils.js version-from-tags) + echo ::set-output name=release_type::$( build/version-utils.js version-type ) + + - name: Ensure correct revision + run: | + git checkout tags/${{ steps.prepare_release.outputs.version_tag }} + + - name: Build + run: | + yarn run build-prod-min + yarn run build-css + + - name: Build Release Notes + id: release_notes + if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} run: | RELEASE_NOTES_PATH="${PWD}/release_notes.txt" - ./build/release-notes.js > ${RELEASE_NOTES_PATH} + ./build/release-notes.js > ${RELEASE_NOTES_PATH} echo ::set-output name=release_notes::${RELEASE_NOTES_PATH} - echo ::set-output name=version_tag::$( build/version-utils.js version-from-tags) - echo ::set-output name=release_type::$( build/version-utils.js version-type ) - - - name: Create GitHub Release - id: create_release + + - name: Create GitHub Release (regular) + id: create_regular_release + if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ steps.prepare_release.outputs.version_tag }} release_name: ${{steps.prepare_release.outputs.version_tag }} - body_path: ${{ steps.prepare_release.outputs.release_notes }} + body_path: ${{ steps.release_notes.outputs.release_notes }} draft: false - prerelease: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} - - - name: Upload GitHub Release Assets - id: upload-gh-release-asset + prerelease: false + + - name: Upload GitHub Release Assets (regular) + if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -105,18 +129,41 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: dist asset_name: dist.zip - asset_content_type: application/zip + asset_content_type: application/zip - - name: Clean up release + - name: Create GitHub Release (prerelease) + id: create_prerelease + if: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.prepare_release.outputs.version_tag }} + release_name: ${{steps.prepare_release.outputs.version_tag }} + draft: false + prerelease: true + + - name: Upload GitHub Release Assets (prerelease) + uses: actions/upload-release-asset@v1 + if: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_prerelease.outputs.upload_url }} + asset_path: dist + asset_name: dist.zip + asset_content_type: application/zip + + - name: Clean up + if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} run: | rm -f ${{ steps.prepare_release.outputs.release_notes }} - name: Update NPM Package Version run: | - yarn version --new-version ${{ steps.prepare_release.outputs.version_tag }} + yarn version --new-version ${{ steps.prepare_release.outputs.version }} - name: Publish NPM package - if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} run: | npm publish env: diff --git a/build/version-utils.js b/build/version-utils.js index e685061f59..60ccee87fe 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -47,8 +47,8 @@ switch (args[0]) { case 'validate-latest-tag': const tags = listTags(); if (tags && tags.length > 1) { - const current = tags[tags.length-1]; - const previous = tags[tags.length-2]; + const current = tags[0]; + const previous = tags[1]; if (semver.gt(current, previous)){ console.log(`valid version tag current=${current}, previous=${previous}`); } else { From 19e2638e0f6b5cd20bf7a3ee099ee98597e2df1b Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:11:13 +0100 Subject: [PATCH 16/65] Added missing command --- build/version-utils.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build/version-utils.js b/build/version-utils.js index 60ccee87fe..e355c8f4cd 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -5,6 +5,13 @@ const semver = require('semver'); const args = process.argv.slice(2); +function latestVersionTag() { + const latestVersionTag = execSync('git describe --tags --match=v*.*.* --abbrev=0') + .toString() + .trim(); + return latestVersionTag; +} + function latestFromTags() { const currentVersion = execSync('git describe --tags --match=v*.*.* --abbrev=0') .toString() @@ -41,6 +48,9 @@ switch (args[0]) { console.log("regular"); } break; + case 'latest-version-tag': + console.log(latestVersionTag()); + break; case 'version-from-tags': console.log(latestFromTags()); break; From dbd7c25fe02385782d4510f826aaeeae761555b3 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:15:22 +0100 Subject: [PATCH 17/65] Fixes --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acce4e5436..a9e469c6a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,7 +126,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} + upload_url: ${{ steps.create_regular_release.outputs.upload_url }} asset_path: dist asset_name: dist.zip asset_content_type: application/zip From 7a621621e066f9e24645b9b6b99446529fa57457 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:17:52 +0100 Subject: [PATCH 18/65] Fixes --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9e469c6a3..dbf9753f51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,6 +60,7 @@ jobs: release: runs-on: ubuntu-latest + needs: lint_build_test defaults: run: shell: bash From 438ca8665f2e8a315ceef62d0798ff8292cc0a86 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:32:34 +0100 Subject: [PATCH 19/65] Fix for windows runner --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbf9753f51..e1954c2de4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare id: prepare run: | - echo ::set-output name=version_tag::$( build/version-utils.js latest-version-tag) + Write-Output "::set-output name=version_tag::[string](build/version-utils.js latest-version-tag)" - name: Ensure correct revision run: | From beb350a367c1934f3a280962156e9700c56ecbe9 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 16:58:52 +0100 Subject: [PATCH 20/65] Another attempt --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1954c2de4..5a30bd2a88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare id: prepare run: | - Write-Output "::set-output name=version_tag::[string](build/version-utils.js latest-version-tag)" + echo ::set-output name=version_tag::build/version-utils.js latest-version-tag - name: Ensure correct revision run: | From 2e79d4190a31309bfa42605633899428565c106c Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:06:29 +0100 Subject: [PATCH 21/65] Another attempt --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a30bd2a88..97d0c10280 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare id: prepare run: | - echo ::set-output name=version_tag::build/version-utils.js latest-version-tag + echo ::set-output name=version_tag::${build/version-utils.js latest-version-tag} - name: Ensure correct revision run: | From 2012b30e86d716a8ecf0922adf2b167e541b6ca3 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:07:31 +0100 Subject: [PATCH 22/65] Another attempt --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97d0c10280..8c9052c176 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare id: prepare run: | - echo ::set-output name=version_tag::${build/version-utils.js latest-version-tag} + echo "::set-output name=version_tag::${build/version-utils.js latest-version-tag}" - name: Ensure correct revision run: | From 9a1fc05da89daa151ac3c633bc0b05cdaf9a5a1e Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:12:51 +0100 Subject: [PATCH 23/65] Another attempt --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c9052c176..d4b7f4d38d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare id: prepare run: | - echo "::set-output name=version_tag::${build/version-utils.js latest-version-tag}" + echo "::set-output name=version_tag::$(build/version-utils.js latest-version-tag)" - name: Ensure correct revision run: | From 75016977251799ea4600a64a11571412814683ac Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:19:01 +0100 Subject: [PATCH 24/65] Tests --- .github/workflows/release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4b7f4d38d..0a38e449c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,13 @@ jobs: lint_build_test: runs-on: windows-latest steps: + + - name: Test + id: test + run: | + $TEST_VALUE=$(build/version-utils.js latest-version-tag) + $TEST_VALUE + - uses: actions/checkout@v2 - name: Use Node.js 10 x64 From 9f1dbfa7f6a02e6ee667b3b88b198defa0d5aa74 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:19:54 +0100 Subject: [PATCH 25/65] Test --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a38e449c0..742f1eaf68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Test id: test run: | - $TEST_VALUE=$(build/version-utils.js latest-version-tag) + $TEST_VALUE=$(date) $TEST_VALUE - uses: actions/checkout@v2 From d9c62b735062aee967212da01541c0307d997265 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:23:08 +0100 Subject: [PATCH 26/65] Another attempt --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 742f1eaf68..bcc8b1e1aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,11 @@ jobs: run: | $TEST_VALUE=$(date) $TEST_VALUE + echo "::set-output name=the_value::$TEST_VALUE" + + - name: Test1 + run: | + run: echo ${{ steps.test.outputs.the_value }} - uses: actions/checkout@v2 From c5c72871fb2a11ea66b1771b544db33227911bb5 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:24:25 +0100 Subject: [PATCH 27/65] Another attempt --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bcc8b1e1aa..6358fac5db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Test1 run: | - run: echo ${{ steps.test.outputs.the_value }} + echo ${{ steps.test.outputs.the_value }} - uses: actions/checkout@v2 From e70accc5803f7ef16211665e91abb65017c76f44 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:27:56 +0100 Subject: [PATCH 28/65] Another attempt --- .github/workflows/release.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6358fac5db..deff20cc62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,19 +19,9 @@ jobs: lint_build_test: runs-on: windows-latest steps: - - - name: Test - id: test - run: | - $TEST_VALUE=$(date) - $TEST_VALUE - echo "::set-output name=the_value::$TEST_VALUE" - - - name: Test1 - run: | - echo ${{ steps.test.outputs.the_value }} - - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Use Node.js 10 x64 uses: actions/setup-node@v2 @@ -50,7 +40,9 @@ jobs: - name: Prepare id: prepare run: | - echo "::set-output name=version_tag::$(build/version-utils.js latest-version-tag)" + $LatestVersionTag=$(build/version-utils.js latest-version-tag) + echo "Latest version tag=$LatestVersionTag" + echo "::set-output name=version_tag::$LatestVersionTag" - name: Ensure correct revision run: | From f02608365cca9f22e1c1fe109445c978625b8a85 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 17:39:35 +0100 Subject: [PATCH 29/65] Testing on self-hosted runner --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index deff20cc62..6830ce919c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,8 @@ on: jobs: lint_build_test: - runs-on: windows-latest + #runs-on: windows-latest + runs-on: [self-hosted, win-p] steps: - uses: actions/checkout@v2 with: From ada1261b2855a3923d763ae5a60a64088165d1d5 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 18:25:00 +0100 Subject: [PATCH 30/65] Fixes for windows runner --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6830ce919c..28b95c2f40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,12 +36,12 @@ jobs: - name: Validate version tag run: | - build/version-utils.js validate-latest-tag + node build\version-utils.js validate-latest-tag - name: Prepare id: prepare run: | - $LatestVersionTag=$(build/version-utils.js latest-version-tag) + $LatestVersionTag=$(node build\version-utils.js latest-version-tag) echo "Latest version tag=$LatestVersionTag" echo "::set-output name=version_tag::$LatestVersionTag" From d4b1c7d3bd8b0f01cd99bd5b9b2d256fa3662955 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 18:25:41 +0100 Subject: [PATCH 31/65] Back to default runner --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28b95c2f40..fe65a7b8fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,8 @@ on: jobs: lint_build_test: - #runs-on: windows-latest - runs-on: [self-hosted, win-p] + runs-on: windows-latest + #runs-on: [self-hosted, win-p] steps: - uses: actions/checkout@v2 with: From d403708aef01e4ef091425b8e6b9a325cac45c75 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:07:19 +0100 Subject: [PATCH 32/65] Fixes --- .github/workflows/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe65a7b8fb..09d8dd4381 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,8 @@ on: jobs: lint_build_test: + if: ${{ false }} runs-on: windows-latest - #runs-on: [self-hosted, win-p] steps: - uses: actions/checkout@v2 with: @@ -65,7 +65,7 @@ jobs: release: runs-on: ubuntu-latest - needs: lint_build_test + #needs: lint_build_test defaults: run: shell: bash @@ -105,6 +105,10 @@ jobs: yarn run build-prod-min yarn run build-css + - name: Create Archive + run: | + zip -r dist dist + - name: Build Release Notes id: release_notes if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} @@ -133,7 +137,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_regular_release.outputs.upload_url }} - asset_path: dist + asset_path: ./dist.zip asset_name: dist.zip asset_content_type: application/zip @@ -156,7 +160,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_prerelease.outputs.upload_url }} - asset_path: dist + asset_path: ./dist.zip asset_name: dist.zip asset_content_type: application/zip From 0cc752bd36f104ff431a601547f54332e274d34f Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:17:18 +0100 Subject: [PATCH 33/65] v1.13.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a91baf47c3..daf2339311 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.5", + "version": "1.13.1", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", @@ -176,4 +176,4 @@ "src/", ".flowconfig" ] -} \ No newline at end of file +} From e9f8a93962d49b9800b93f1bbc6e063c41d83d33 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:23:43 +0100 Subject: [PATCH 34/65] Fixes --- .github/workflows/release.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09d8dd4381..d5d8251ed7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,7 @@ on: jobs: lint_build_test: + name: Build, Lint and Test if: ${{ false }} runs-on: windows-latest steps: @@ -64,6 +65,7 @@ jobs: yarn run test-expressions release: + name: Release runs-on: ubuntu-latest #needs: lint_build_test defaults: @@ -171,10 +173,18 @@ jobs: - name: Update NPM Package Version run: | - yarn version --new-version ${{ steps.prepare_release.outputs.version }} + yarn version --non-interactive --no-git-tag-version --new-version ${{ steps.prepare_release.outputs.version }} - name: Publish NPM package run: | npm publish env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + + - name: Commit & Push updated version + run: | + git config --global user.name $GITHUB_ACTOR + git config --global user.email '$GITHUB_ACTOR@users.noreply.github.com' + git commit -a package.json + git commit -m "Version Bump" + git push From 6cc62fb397b1c3e4d33c66624bf4190129a6bdfb Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:45:45 +0100 Subject: [PATCH 35/65] Fixes --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5d8251ed7..ecfb14120c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -177,14 +177,14 @@ jobs: - name: Publish NPM package run: | - npm publish + echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc && yarn publish --non-interactive env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Commit & Push updated version run: | git config --global user.name $GITHUB_ACTOR - git config --global user.email '$GITHUB_ACTOR@users.noreply.github.com' + git config --global user.email '$GITHUB_ACTOR@noreply.maplibre.org' git commit -a package.json git commit -m "Version Bump" git push From 0a7ade603e589c1e6ee0b9eb476a59fd407856a8 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:50:51 +0100 Subject: [PATCH 36/65] Fixes --- .github/workflows/release.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ecfb14120c..d0326b0fdb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -175,12 +175,6 @@ jobs: run: | yarn version --non-interactive --no-git-tag-version --new-version ${{ steps.prepare_release.outputs.version }} - - name: Publish NPM package - run: | - echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc && yarn publish --non-interactive - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Commit & Push updated version run: | git config --global user.name $GITHUB_ACTOR @@ -188,3 +182,10 @@ jobs: git commit -a package.json git commit -m "Version Bump" git push + + - name: Publish NPM package + run: | + echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc && yarn publish --non-interactive + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + From ddc926b8675fe863946134d5974dd9c9540faf05 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:52:47 +0100 Subject: [PATCH 37/65] testing release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0326b0fdb..2c6988ff72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -185,7 +185,7 @@ jobs: - name: Publish NPM package run: | - echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc && yarn publish --non-interactive + yarn publish --non-interactive env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 8c9d346a1ce372e46e13e710df80ecaf78986c20 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 19:58:29 +0100 Subject: [PATCH 38/65] Fixes --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c6988ff72..806413a48d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -179,7 +179,7 @@ jobs: run: | git config --global user.name $GITHUB_ACTOR git config --global user.email '$GITHUB_ACTOR@noreply.maplibre.org' - git commit -a package.json + git add package.json git commit -m "Version Bump" git push From 5c7c9adc23a60898b14f43af2d64f9c675bc5659 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:08:22 +0100 Subject: [PATCH 39/65] testing release script --- .github/workflows/release.yml | 15 +++++++++------ package.json | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 806413a48d..23abce9010 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -177,12 +177,15 @@ jobs: - name: Commit & Push updated version run: | - git config --global user.name $GITHUB_ACTOR - git config --global user.email '$GITHUB_ACTOR@noreply.maplibre.org' - git add package.json - git commit -m "Version Bump" - git push - + git add package.json + if [[ -n "$(git status --porcelain)" ]]; then + git config --local user.email "maplibre@noreply.maplibre.org" + git config --local user.name "MapLibre" + git commit -m "Version Bump" + git push + else + echo "no changes"; + fi - name: Publish NPM package run: | yarn publish --non-interactive diff --git a/package.json b/package.json index daf2339311..2624cc798c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.1", + "version": "1.13.0-rc.5", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From c79f1fb77fa0868973b8d47b14819fbeab762ce4 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:14:28 +0100 Subject: [PATCH 40/65] Testing release script --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23abce9010..35a6eb1afe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -182,7 +182,7 @@ jobs: git config --local user.email "maplibre@noreply.maplibre.org" git config --local user.name "MapLibre" git commit -m "Version Bump" - git push + git push origin HEAD:release-automation else echo "no changes"; fi From 5dae4562969179b36b8e3b768f855fdb3b0fa1a3 Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 19:16:55 +0000 Subject: [PATCH 41/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2624cc798c..daf2339311 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.5", + "version": "1.13.1", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From b0612d8658a209895536e26b6f58d62017812ce9 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:43:02 +0100 Subject: [PATCH 42/65] teting build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index daf2339311..c7e19d1132 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ "test-expressions": "cross-env build/run-node test/expression.test.js", "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", - "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", + "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build", "print-release-url": "node build/print-release-url.js", "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" }, From 33d3af08e42187fccfe84bdd841e170aee6b7293 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:43:34 +0100 Subject: [PATCH 43/65] Testing build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7e19d1132..a90e7ed5e0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.1", + "version": "1.13.0-rc.5", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From 5d8e72f49d416a4316b60e98618a084cf08f44b6 Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 19:46:18 +0000 Subject: [PATCH 44/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a90e7ed5e0..c7e19d1132 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.5", + "version": "1.13.1", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From 6e8fa656d9818d53b1fa26f07ba0ea6442daa5ed Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:50:48 +0100 Subject: [PATCH 45/65] Testing build --- build/diff-tarball.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/diff-tarball.js b/build/diff-tarball.js index f868437be1..c44a5ba2e9 100644 --- a/build/diff-tarball.js +++ b/build/diff-tarball.js @@ -1,7 +1,7 @@ const packlist = require('npm-packlist') const npmContent = require('list-npm-contents'); -npmContent('maplibre-gl').then(function(last_version_files) { +npmContent('petr-maplibre-gl').then(function(last_version_files) { packlist({ path: '.' }).then(function(new_version_files) { new_version_files = new_version_files.map(file => file.replace(/\/\/+/g, '/')); let diff_new = new_version_files.filter(x => !last_version_files.includes(x)); From 3f6d068cff38ec2b20a43dd073e4923bdbf03648 Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 19:53:38 +0000 Subject: [PATCH 46/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7e19d1132..d3c9e189df 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.1", + "version": "1.13.2-beta.1", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From 5166571b97df7ae95035c1a4765aeae793db1b8b Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 20:57:23 +0100 Subject: [PATCH 47/65] Testing build --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb553d5b7..212059ad92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.13.2 + +### Features and improvements + +- ✨ New Release process + ## 1.13.1 ### Features and improvements From fa35aced41ab1684dd1723fa32c34626e8f6e1e7 Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 20:00:03 +0000 Subject: [PATCH 48/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3c9e189df..d94ecf20df 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.2-beta.1", + "version": "1.13.2", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From ee7ad886cf72f3b59cba9c9e296a0f8a6307dc6f Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 21:08:38 +0100 Subject: [PATCH 49/65] Another test --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 212059ad92..52e6a33fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.13.3 + +### Features and improvements + +- ✨ Another test + ## 1.13.2 ### Features and improvements diff --git a/package.json b/package.json index d3c9e189df..c7bc65b3ae 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ "test-expressions": "cross-env build/run-node test/expression.test.js", "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", - "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build", + "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", "print-release-url": "node build/print-release-url.js", "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" }, From 0521545e70f2d6006e6c13ca4b58a45e6de1460d Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 20:10:53 +0000 Subject: [PATCH 50/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1805944ba1..489e740fc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.2", + "version": "1.13.3", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From cbc8e9038e08429f26b95e5456d5d9f3fbbbe162 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 21:56:28 +0100 Subject: [PATCH 51/65] Making tarball check non-interactive --- build/diff-tarball.js | 12 +++++++++++- package.json | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build/diff-tarball.js b/build/diff-tarball.js index c44a5ba2e9..0f77846fb7 100644 --- a/build/diff-tarball.js +++ b/build/diff-tarball.js @@ -5,7 +5,13 @@ npmContent('petr-maplibre-gl').then(function(last_version_files) { packlist({ path: '.' }).then(function(new_version_files) { new_version_files = new_version_files.map(file => file.replace(/\/\/+/g, '/')); let diff_new = new_version_files.filter(x => !last_version_files.includes(x)); - let diff_last = last_version_files.filter(x => !new_version_files.includes(x)); + + // excludes folder names which caused this script + // to fail with message: xx files are about to be deleted in the new tarball + // i.e. src/ui was reported but src/ui/anchor.js, src/ui/camera.js, etc are included indeed + let diff_last = last_version_files + .filter(x => !new_version_files.includes(x) && !new_version_files.some(y => y.startsWith(x))); + console.log(`${diff_new.length} files are about to be added in the new tarball`) diff_new.forEach(file => { console.log('+', file); @@ -14,5 +20,9 @@ npmContent('petr-maplibre-gl').then(function(last_version_files) { diff_last.forEach(file => { console.log('-', file); }); + + if (diff_new.length > 0 || diff_last.length > 0) { + console.log('\x1b[36m%s\x1b[31m', 'Number of files in tarball will change!'); + } }); }); diff --git a/package.json b/package.json index 1805944ba1..1f39404916 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "start-tests": "run-p build-token watch-css watch-query start-server", "start-bench": "run-p build-token watch-benchmarks start-server", "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", - "diff-tarball": "cross-env build/run-node build/diff-tarball && echo \"Please confirm the above is correct [y/n]? \"; read answer; if [ \"$answer\" = \"${answer#[Yy]}\" ]; then false; fi", + "diff-tarball": "cross-env build/run-node build/diff-tarball", "prepare-publish": "git clean -fdx && yarn install", "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", "lint-docs": "documentation lint src/index.js", From 8f8fdbb38c1eea551aca281b7e4df8583fcf67a6 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 21:59:23 +0100 Subject: [PATCH 52/65] another test & trabal check fix --- CHANGELOG.md | 4 ++++ build/diff-tarball.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e6a33fbf..4e7f802f83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.13.4-rc.1 + +- ✨ Another test 2 + ## 1.13.3 ### Features and improvements diff --git a/build/diff-tarball.js b/build/diff-tarball.js index 0f77846fb7..ee2a146e7f 100644 --- a/build/diff-tarball.js +++ b/build/diff-tarball.js @@ -22,7 +22,7 @@ npmContent('petr-maplibre-gl').then(function(last_version_files) { }); if (diff_new.length > 0 || diff_last.length > 0) { - console.log('\x1b[36m%s\x1b[31m', 'Number of files in tarball will change!'); + console.log('\x1b[31m%s\x1b[0m', 'Number of files in tarball will change!'); } }); }); From fe0ee5173fb8eecf8d53a770e5b3070621a67047 Mon Sep 17 00:00:00 2001 From: MapLibre Date: Thu, 11 Mar 2021 21:02:34 +0000 Subject: [PATCH 53/65] Version Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd75e95256..ac44e60380 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "petr-maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.3", + "version": "1.13.4-rc.1", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", From 5e638e8ba75ff1ab1cb9235cfbf4c6840e778f67 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 22:11:41 +0100 Subject: [PATCH 54/65] Removing debug code & clean up --- .github/workflows/release.yml | 5 ++--- CHANGELOG.md | 14 ++++---------- build/diff-tarball.js | 2 +- build/release-notes.md.ejs | 4 ++-- package.json | 4 ++-- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35a6eb1afe..38edc225e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,6 @@ on: jobs: lint_build_test: name: Build, Lint and Test - if: ${{ false }} runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -67,7 +66,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - #needs: lint_build_test + needs: lint_build_test defaults: run: shell: bash @@ -182,7 +181,7 @@ jobs: git config --local user.email "maplibre@noreply.maplibre.org" git config --local user.name "MapLibre" git commit -m "Version Bump" - git push origin HEAD:release-automation + git push origin HEAD:main else echo "no changes"; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7f802f83..5ddcb18c83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,12 @@ -## 1.13.4-rc.1 - -- ✨ Another test 2 - -## 1.13.3 +## main ### Features and improvements -- ✨ Another test - -## 1.13.2 +- Add new stuff here -### Features and improvements +### 🐞 Bug fixes -- ✨ New Release process +- Add smashed bugs here ## 1.13.1 diff --git a/build/diff-tarball.js b/build/diff-tarball.js index ee2a146e7f..81b52a3e01 100644 --- a/build/diff-tarball.js +++ b/build/diff-tarball.js @@ -1,7 +1,7 @@ const packlist = require('npm-packlist') const npmContent = require('list-npm-contents'); -npmContent('petr-maplibre-gl').then(function(last_version_files) { +npmContent('maplibre-gl').then(function(last_version_files) { packlist({ path: '.' }).then(function(new_version_files) { new_version_files = new_version_files.map(file => file.replace(/\/\/+/g, '/')); let diff_new = new_version_files.filter(x => !last_version_files.includes(x)); diff --git a/build/release-notes.md.ejs b/build/release-notes.md.ejs index b1dd768cb5..22b5db961b 100644 --- a/build/release-notes.md.ejs +++ b/build/release-notes.md.ejs @@ -1,5 +1,5 @@ -https://github.com/petr-pokorny-1/maplibre-gl-js -[Changes](https://github.com/petr-pokorny-1/maplibre-gl-js/compare/v<%-PREVIOUSVERSION%>...v<%-CURRENTVERSION%>) since [MapLibre GL JS v<%-PREVIOUSVERSION%>](https://github.com/petr-pokorny-1/releases/tag/v<%-PREVIOUSVERSION%>): +https://github.com/maplibre/maplibre-gl-js +[Changes](https://github.com/maplibre/maplibre-gl-js/compare/v<%-PREVIOUSVERSION%>...v<%-CURRENTVERSION%>) since [MapLibre GL JS v<%-PREVIOUSVERSION%>](https://github.com/maplibre/releases/tag/v<%-PREVIOUSVERSION%>): <%-CHANGELOG-%> diff --git a/package.json b/package.json index fd75e95256..dae0822649 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "petr-maplibre-gl", + "name": "maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", "version": "1.13.3", "main": "dist/maplibre-gl.js", @@ -7,7 +7,7 @@ "license": "BSD-3-Clause", "repository": { "type": "git", - "url": "https://github.com/petr-pokorny-1/maplibre-gl-js.git" + "url": "https://github.com/maplibre/maplibre-gl-js.git" }, "engines": { "node": ">=6.4.0" From 4aa316561e8be95fb028a1e3ffdba097baa3a399 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 22:15:36 +0100 Subject: [PATCH 55/65] Removing vscode stuff --- .vscode/launch.json | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index b521145e1f..0000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "pwa-node", - "request": "launch", - "name": "Launch Program", - "skipFiles": [ - "/**" - ], - "program": "${workspaceFolder}/build/version-utils.js", - "args": ["validate-latest-tag"], - "cwd": "${workspaceFolder}/build/" - } - ] -} \ No newline at end of file From 78f6662dd217ce30fb525036680116d0f66f499b Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 22:21:51 +0100 Subject: [PATCH 56/65] Remove formatting changes --- package.json | 314 +++++++++++++++++++++++++-------------------------- 1 file changed, 156 insertions(+), 158 deletions(-) diff --git a/package.json b/package.json index dda50d9123..ea5da01b5e 100644 --- a/package.json +++ b/package.json @@ -1,179 +1,177 @@ { "name": "maplibre-gl", "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.4-rc.1", + "version": "1.13.0-rc.5", "main": "dist/maplibre-gl.js", "style": "dist/maplibre-gl.css", "license": "BSD-3-Clause", "repository": { - "type": "git", - "url": "https://github.com/maplibre/maplibre-gl-js.git" + "type": "git", + "url": "git://github.com/maplibre/maplibre-gl-js.git" }, "engines": { - "node": ">=6.4.0" + "node": ">=6.4.0" }, "dependencies": { - "@mapbox/geojson-rewind": "^0.5.0", - "@mapbox/geojson-types": "^1.0.2", - "@mapbox/jsonlint-lines-primitives": "^2.0.2", - "@mapbox/mapbox-gl-supported": "^1.5.0", - "@mapbox/point-geometry": "^0.1.0", - "@mapbox/tiny-sdf": "^1.1.1", - "@mapbox/unitbezier": "^0.0.0", - "@mapbox/vector-tile": "^1.3.1", - "@mapbox/whoots-js": "^3.1.0", - "csscolorparser": "~1.0.3", - "earcut": "^2.2.2", - "geojson-vt": "^3.2.1", - "gl-matrix": "^3.2.1", - "grid-index": "^1.1.0", - "minimist": "^1.2.5", - "murmurhash-js": "^1.0.0", - "pbf": "^3.2.1", - "potpack": "^1.0.1", - "quickselect": "^2.0.0", - "rw": "^1.3.3", - "supercluster": "^7.1.0", - "tinyqueue": "^2.0.3", - "vt-pbf": "^3.1.1" + "@mapbox/geojson-rewind": "^0.5.0", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.5.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.1", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.3", + "earcut": "^2.2.2", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.2.1", + "grid-index": "^1.1.0", + "minimist": "^1.2.5", + "murmurhash-js": "^1.0.0", + "pbf": "^3.2.1", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^7.1.0", + "tinyqueue": "^2.0.3", + "vt-pbf": "^3.1.1" }, "devDependencies": { - "@babel/core": "^7.9.0", - "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", - "@mapbox/gazetteer": "^4.0.4", - "@mapbox/mapbox-gl-rtl-text": "^0.2.1", - "@mapbox/mvt-fixtures": "^3.6.0", - "@octokit/rest": "^16.30.1", - "@rollup/plugin-strip": "^1.3.1", - "address": "^1.1.2", - "babel-eslint": "^10.0.1", - "babelify": "^10.0.0", - "benchmark": "^2.1.4", - "browserify": "^16.5.0", - "canvas": "^2.6.1", - "chalk": "^3.0.0", - "chokidar": "^3.0.2", - "cross-env": "^7.0.3", - "cssnano": "^4.1.10", - "d3": "^4.12.0", - "diff": "^4.0.1", - "documentation": "~12.1.1", - "ejs": "^2.5.7", - "eslint": "^5.15.3", - "eslint-config-mourner": "^3.0.0", - "eslint-plugin-flowtype": "^3.9.1", - "eslint-plugin-html": "^5.0.5", - "eslint-plugin-import": "^2.16.0", - "eslint-plugin-jsdoc": "^17.1.2", - "eslint-plugin-react": "^7.12.4", - "esm": "~3.0.84", - "flow-bin": "^0.100.0", - "gl": "^4.5.3", - "glob": "^7.1.4", - "is-builtin-module": "^3.0.0", - "jsdom": "^13.0.0", - "json-stringify-pretty-compact": "^2.0.0", - "jsonwebtoken": "^8.3.0", - "list-npm-contents": "^1.0.2", - "lodash": "^4.17.19", - "lodash.template": "^4.5.0", - "mapbox-gl-styles": "^2.0.2", - "mock-geolocation": "^1.0.11", - "node-notifier": "^5.4.3", - "node-plantuml": "^0.9.0", - "npm-font-open-sans": "^1.1.0", - "npm-packlist": "^2.1.1", - "npm-run-all": "^4.1.5", - "nyc": "^13.3.0", - "pirates": "^4.0.1", - "pixelmatch": "^5.1.0", - "pngjs": "^3.4.0", - "postcss-cli": "^6.1.2", - "postcss-inline-svg": "^3.1.1", - "pretty-bytes": "^5.1.0", - "puppeteer": "^1.18.0", - "qrcode-terminal": "^0.12.0", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "request": "^2.88.0", - "rollup": "^1.23.1", - "rollup-plugin-buble": "^0.19.8", - "rollup-plugin-commonjs": "^10.1.0", - "rollup-plugin-json": "^4.0.0", - "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "rollup-plugin-terser": "^5.1.2", - "rollup-plugin-unassert": "^0.3.0", - "selenium-webdriver": "^4.0.0-alpha.5", - "semver": "^5.5.0", - "shuffle-seed": "^1.1.6", - "sinon": "^7.3.2", - "source-map-explorer": "^2.5.1", - "st": "^1.2.2", - "stylelint": "^9.10.1", - "stylelint-config-standard": "^18.2.0", - "tap": "~12.4.1", - "tap-parser": "^10.0.1", - "tape": "^4.13.2", - "tape-filter": "^1.0.4", - "testem": "^3.0.0" + "@babel/core": "^7.9.0", + "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", + "@mapbox/gazetteer": "^4.0.4", + "@mapbox/mapbox-gl-rtl-text": "^0.2.1", + "@mapbox/mvt-fixtures": "^3.6.0", + "@octokit/rest": "^16.30.1", + "@rollup/plugin-strip": "^1.3.1", + "address": "^1.1.2", + "babel-eslint": "^10.0.1", + "babelify": "^10.0.0", + "benchmark": "^2.1.4", + "browserify": "^16.5.0", + "canvas": "^2.6.1", + "chalk": "^3.0.0", + "chokidar": "^3.0.2", + "cross-env": "^7.0.3", + "cssnano": "^4.1.10", + "d3": "^4.12.0", + "diff": "^4.0.1", + "documentation": "~12.1.1", + "ejs": "^2.5.7", + "eslint": "^5.15.3", + "eslint-config-mourner": "^3.0.0", + "eslint-plugin-flowtype": "^3.9.1", + "eslint-plugin-html": "^5.0.5", + "eslint-plugin-import": "^2.16.0", + "eslint-plugin-jsdoc": "^17.1.2", + "eslint-plugin-react": "^7.12.4", + "esm": "~3.0.84", + "flow-bin": "^0.100.0", + "gl": "^4.5.3", + "glob": "^7.1.4", + "is-builtin-module": "^3.0.0", + "jsdom": "^13.0.0", + "json-stringify-pretty-compact": "^2.0.0", + "jsonwebtoken": "^8.3.0", + "list-npm-contents": "^1.0.2", + "lodash.template": "^4.5.0", + "mapbox-gl-styles": "^2.0.2", + "mock-geolocation": "^1.0.11", + "node-notifier": "^5.4.3", + "node-plantuml": "^0.9.0", + "npm-font-open-sans": "^1.1.0", + "npm-packlist": "^2.1.1", + "npm-run-all": "^4.1.5", + "nyc": "^13.3.0", + "pirates": "^4.0.1", + "pixelmatch": "^5.1.0", + "pngjs": "^3.4.0", + "postcss-cli": "^6.1.2", + "postcss-inline-svg": "^3.1.1", + "pretty-bytes": "^5.1.0", + "puppeteer": "^1.18.0", + "qrcode-terminal": "^0.12.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "request": "^2.88.0", + "rollup": "^1.23.1", + "rollup-plugin-buble": "^0.19.8", + "rollup-plugin-commonjs": "^10.1.0", + "rollup-plugin-json": "^4.0.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-replace": "^2.2.0", + "rollup-plugin-sourcemaps": "^0.4.2", + "rollup-plugin-terser": "^5.1.2", + "rollup-plugin-unassert": "^0.3.0", + "selenium-webdriver": "^4.0.0-alpha.5", + "shuffle-seed": "^1.1.6", + "sinon": "^7.3.2", + "source-map-explorer": "^2.5.1", + "st": "^1.2.2", + "stylelint": "^9.10.1", + "stylelint-config-standard": "^18.2.0", + "tap": "~12.4.1", + "tap-parser": "^10.0.1", + "tape": "^4.13.2", + "tape-filter": "^1.0.4", + "testem": "^3.0.0" }, "browser": { - "./src/shaders/index.js": "./src/shaders/shaders.js", - "./src/util/window.js": "./src/util/browser/window.js", - "./src/util/web_worker.js": "./src/util/browser/web_worker.js" + "./src/shaders/index.js": "./src/shaders/shaders.js", + "./src/util/window.js": "./src/util/browser/window.js", + "./src/util/web_worker.js": "./src/util/browser/web_worker.js" }, "esm": true, "scripts": { - "build-dev": "rollup -c --environment BUILD:dev", - "watch-dev": "rollup -c --environment BUILD:dev --watch", - "build-prod": "rollup -c --environment BUILD:production", - "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", - "build-csp": "rollup -c rollup.config.csp.js", - "build-query-suite": "rollup -c test/integration/rollup.config.test.js", - "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", - "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", - "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", - "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-token": "node build/generate-access-token-script.js", - "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", - "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", - "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", - "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", - "start-debug": "run-p build-token watch-css watch-dev start-server", - "start-tests": "run-p build-token watch-css watch-query start-server", - "start-bench": "run-p build-token watch-benchmarks start-server", - "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", - "diff-tarball": "cross-env build/run-node build/diff-tarball", - "prepare-publish": "git clean -fdx && yarn install", - "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", - "lint-docs": "documentation lint src/index.js", - "lint-css": "stylelint 'src/css/maplibre-gl.css'", - "test": "run-s lint lint-css lint-docs test-flow test-unit", - "test-suite": "run-s test-render test-query test-expressions", - "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", - "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", - "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", - "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", - "test-render": "node --max-old-space-size=2048 test/render.test.js", - "test-query-node": "node test/query.test.js", - "watch-query": "testem -f test/integration/testem.js", - "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", - "test-expressions": "cross-env build/run-node test/expression.test.js", - "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", - "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", - "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", - "print-release-url": "node build/print-release-url.js", - "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" + "build-dev": "rollup -c --environment BUILD:dev", + "watch-dev": "rollup -c --environment BUILD:dev --watch", + "build-prod": "rollup -c --environment BUILD:production", + "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", + "build-csp": "rollup -c rollup.config.csp.js", + "build-query-suite": "rollup -c test/integration/rollup.config.test.js", + "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", + "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", + "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", + "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-token": "node build/generate-access-token-script.js", + "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", + "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", + "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", + "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", + "start-debug": "run-p build-token watch-css watch-dev start-server", + "start-tests": "run-p build-token watch-css watch-query start-server", + "start-bench": "run-p build-token watch-benchmarks start-server", + "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", + "diff-tarball": "cross-env build/run-node build/diff-tarball", + "prepare-publish": "git clean -fdx && yarn install", + "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", + "lint-docs": "documentation lint src/index.js", + "lint-css": "stylelint 'src/css/maplibre-gl.css'", + "test": "run-s lint lint-css lint-docs test-flow test-unit", + "test-suite": "run-s test-render test-query test-expressions", + "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", + "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", + "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", + "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", + "test-render": "node --max-old-space-size=2048 test/render.test.js", + "test-query-node": "node test/query.test.js", + "watch-query": "testem -f test/integration/testem.js", + "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", + "test-expressions": "cross-env build/run-node test/expression.test.js", + "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", + "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", + "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", + "print-release-url": "node build/print-release-url.js", + "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" }, "files": [ - "build/", - "dist/maplibre-gl*", - "dist/style-spec/", - "flow-typed/*.js", - "src/", - ".flowconfig" + "build/", + "dist/maplibre-gl*", + "dist/style-spec/", + "flow-typed/*.js", + "src/", + ".flowconfig" ] -} + } \ No newline at end of file From 157b14a38b20a2aaf3c69fcf2c855f66f20c1557 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 22:28:14 +0100 Subject: [PATCH 57/65] Added missing packages --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index ea5da01b5e..7848111af5 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "json-stringify-pretty-compact": "^2.0.0", "jsonwebtoken": "^8.3.0", "list-npm-contents": "^1.0.2", + "lodash": "^4.17.19", "lodash.template": "^4.5.0", "mapbox-gl-styles": "^2.0.2", "mock-geolocation": "^1.0.11", @@ -105,6 +106,7 @@ "rollup-plugin-terser": "^5.1.2", "rollup-plugin-unassert": "^0.3.0", "selenium-webdriver": "^4.0.0-alpha.5", + "semver": "^5.5.0", "shuffle-seed": "^1.1.6", "sinon": "^7.3.2", "source-map-explorer": "^2.5.1", From a3d3d7d7ca52b150e59b832de85fe03c116ccc6b Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 22:43:59 +0100 Subject: [PATCH 58/65] Revert formating changes --- package.json | 356 +++++++++++++++++++++++----------------------- test/ignores.json | 64 ++++----- 2 files changed, 210 insertions(+), 210 deletions(-) diff --git a/package.json b/package.json index 7848111af5..7fdb080bbd 100644 --- a/package.json +++ b/package.json @@ -1,179 +1,179 @@ { - "name": "maplibre-gl", - "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", - "version": "1.13.0-rc.5", - "main": "dist/maplibre-gl.js", - "style": "dist/maplibre-gl.css", - "license": "BSD-3-Clause", - "repository": { - "type": "git", - "url": "git://github.com/maplibre/maplibre-gl-js.git" - }, - "engines": { - "node": ">=6.4.0" - }, - "dependencies": { - "@mapbox/geojson-rewind": "^0.5.0", - "@mapbox/geojson-types": "^1.0.2", - "@mapbox/jsonlint-lines-primitives": "^2.0.2", - "@mapbox/mapbox-gl-supported": "^1.5.0", - "@mapbox/point-geometry": "^0.1.0", - "@mapbox/tiny-sdf": "^1.1.1", - "@mapbox/unitbezier": "^0.0.0", - "@mapbox/vector-tile": "^1.3.1", - "@mapbox/whoots-js": "^3.1.0", - "csscolorparser": "~1.0.3", - "earcut": "^2.2.2", - "geojson-vt": "^3.2.1", - "gl-matrix": "^3.2.1", - "grid-index": "^1.1.0", - "minimist": "^1.2.5", - "murmurhash-js": "^1.0.0", - "pbf": "^3.2.1", - "potpack": "^1.0.1", - "quickselect": "^2.0.0", - "rw": "^1.3.3", - "supercluster": "^7.1.0", - "tinyqueue": "^2.0.3", - "vt-pbf": "^3.1.1" - }, - "devDependencies": { - "@babel/core": "^7.9.0", - "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", - "@mapbox/gazetteer": "^4.0.4", - "@mapbox/mapbox-gl-rtl-text": "^0.2.1", - "@mapbox/mvt-fixtures": "^3.6.0", - "@octokit/rest": "^16.30.1", - "@rollup/plugin-strip": "^1.3.1", - "address": "^1.1.2", - "babel-eslint": "^10.0.1", - "babelify": "^10.0.0", - "benchmark": "^2.1.4", - "browserify": "^16.5.0", - "canvas": "^2.6.1", - "chalk": "^3.0.0", - "chokidar": "^3.0.2", - "cross-env": "^7.0.3", - "cssnano": "^4.1.10", - "d3": "^4.12.0", - "diff": "^4.0.1", - "documentation": "~12.1.1", - "ejs": "^2.5.7", - "eslint": "^5.15.3", - "eslint-config-mourner": "^3.0.0", - "eslint-plugin-flowtype": "^3.9.1", - "eslint-plugin-html": "^5.0.5", - "eslint-plugin-import": "^2.16.0", - "eslint-plugin-jsdoc": "^17.1.2", - "eslint-plugin-react": "^7.12.4", - "esm": "~3.0.84", - "flow-bin": "^0.100.0", - "gl": "^4.5.3", - "glob": "^7.1.4", - "is-builtin-module": "^3.0.0", - "jsdom": "^13.0.0", - "json-stringify-pretty-compact": "^2.0.0", - "jsonwebtoken": "^8.3.0", - "list-npm-contents": "^1.0.2", - "lodash": "^4.17.19", - "lodash.template": "^4.5.0", - "mapbox-gl-styles": "^2.0.2", - "mock-geolocation": "^1.0.11", - "node-notifier": "^5.4.3", - "node-plantuml": "^0.9.0", - "npm-font-open-sans": "^1.1.0", - "npm-packlist": "^2.1.1", - "npm-run-all": "^4.1.5", - "nyc": "^13.3.0", - "pirates": "^4.0.1", - "pixelmatch": "^5.1.0", - "pngjs": "^3.4.0", - "postcss-cli": "^6.1.2", - "postcss-inline-svg": "^3.1.1", - "pretty-bytes": "^5.1.0", - "puppeteer": "^1.18.0", - "qrcode-terminal": "^0.12.0", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "request": "^2.88.0", - "rollup": "^1.23.1", - "rollup-plugin-buble": "^0.19.8", - "rollup-plugin-commonjs": "^10.1.0", - "rollup-plugin-json": "^4.0.0", - "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "rollup-plugin-terser": "^5.1.2", - "rollup-plugin-unassert": "^0.3.0", - "selenium-webdriver": "^4.0.0-alpha.5", - "semver": "^5.5.0", - "shuffle-seed": "^1.1.6", - "sinon": "^7.3.2", - "source-map-explorer": "^2.5.1", - "st": "^1.2.2", - "stylelint": "^9.10.1", - "stylelint-config-standard": "^18.2.0", - "tap": "~12.4.1", - "tap-parser": "^10.0.1", - "tape": "^4.13.2", - "tape-filter": "^1.0.4", - "testem": "^3.0.0" - }, - "browser": { - "./src/shaders/index.js": "./src/shaders/shaders.js", - "./src/util/window.js": "./src/util/browser/window.js", - "./src/util/web_worker.js": "./src/util/browser/web_worker.js" - }, - "esm": true, - "scripts": { - "build-dev": "rollup -c --environment BUILD:dev", - "watch-dev": "rollup -c --environment BUILD:dev --watch", - "build-prod": "rollup -c --environment BUILD:production", - "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", - "build-csp": "rollup -c rollup.config.csp.js", - "build-query-suite": "rollup -c test/integration/rollup.config.test.js", - "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", - "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", - "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", - "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", - "build-token": "node build/generate-access-token-script.js", - "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", - "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", - "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", - "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", - "start-debug": "run-p build-token watch-css watch-dev start-server", - "start-tests": "run-p build-token watch-css watch-query start-server", - "start-bench": "run-p build-token watch-benchmarks start-server", - "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", - "diff-tarball": "cross-env build/run-node build/diff-tarball", - "prepare-publish": "git clean -fdx && yarn install", - "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", - "lint-docs": "documentation lint src/index.js", - "lint-css": "stylelint 'src/css/maplibre-gl.css'", - "test": "run-s lint lint-css lint-docs test-flow test-unit", - "test-suite": "run-s test-render test-query test-expressions", - "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", - "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", - "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", - "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", - "test-render": "node --max-old-space-size=2048 test/render.test.js", - "test-query-node": "node test/query.test.js", - "watch-query": "testem -f test/integration/testem.js", - "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", - "test-expressions": "cross-env build/run-node test/expression.test.js", - "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", - "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", - "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", - "print-release-url": "node build/print-release-url.js", - "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" - }, - "files": [ - "build/", - "dist/maplibre-gl*", - "dist/style-spec/", - "flow-typed/*.js", - "src/", - ".flowconfig" - ] - } \ No newline at end of file + "name": "maplibre-gl", + "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library", + "version": "1.13.0-rc.5", + "main": "dist/maplibre-gl.js", + "style": "dist/maplibre-gl.css", + "license": "BSD-3-Clause", + "repository": { + "type": "git", + "url": "git://github.com/maplibre/maplibre-gl-js.git" + }, + "engines": { + "node": ">=6.4.0" + }, + "dependencies": { + "@mapbox/geojson-rewind": "^0.5.0", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.5.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.1", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.3", + "earcut": "^2.2.2", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.2.1", + "grid-index": "^1.1.0", + "minimist": "^1.2.5", + "murmurhash-js": "^1.0.0", + "pbf": "^3.2.1", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^7.1.0", + "tinyqueue": "^2.0.3", + "vt-pbf": "^3.1.1" + }, + "devDependencies": { + "@babel/core": "^7.9.0", + "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", + "@mapbox/gazetteer": "^4.0.4", + "@mapbox/mapbox-gl-rtl-text": "^0.2.1", + "@mapbox/mvt-fixtures": "^3.6.0", + "@octokit/rest": "^16.30.1", + "@rollup/plugin-strip": "^1.3.1", + "address": "^1.1.2", + "babel-eslint": "^10.0.1", + "babelify": "^10.0.0", + "benchmark": "^2.1.4", + "browserify": "^16.5.0", + "canvas": "^2.6.1", + "chalk": "^3.0.0", + "chokidar": "^3.0.2", + "cross-env": "^7.0.3", + "cssnano": "^4.1.10", + "d3": "^4.12.0", + "diff": "^4.0.1", + "documentation": "~12.1.1", + "ejs": "^2.5.7", + "eslint": "^5.15.3", + "eslint-config-mourner": "^3.0.0", + "eslint-plugin-flowtype": "^3.9.1", + "eslint-plugin-html": "^5.0.5", + "eslint-plugin-import": "^2.16.0", + "eslint-plugin-jsdoc": "^17.1.2", + "eslint-plugin-react": "^7.12.4", + "esm": "~3.0.84", + "flow-bin": "^0.100.0", + "gl": "^4.5.3", + "glob": "^7.1.4", + "is-builtin-module": "^3.0.0", + "jsdom": "^13.0.0", + "json-stringify-pretty-compact": "^2.0.0", + "jsonwebtoken": "^8.3.0", + "list-npm-contents": "^1.0.2", + "lodash": "^4.17.19", + "lodash.template": "^4.5.0", + "mapbox-gl-styles": "^2.0.2", + "mock-geolocation": "^1.0.11", + "node-notifier": "^5.4.3", + "node-plantuml": "^0.9.0", + "npm-font-open-sans": "^1.1.0", + "npm-packlist": "^2.1.1", + "npm-run-all": "^4.1.5", + "nyc": "^13.3.0", + "pirates": "^4.0.1", + "pixelmatch": "^5.1.0", + "pngjs": "^3.4.0", + "postcss-cli": "^6.1.2", + "postcss-inline-svg": "^3.1.1", + "pretty-bytes": "^5.1.0", + "puppeteer": "^1.18.0", + "qrcode-terminal": "^0.12.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "request": "^2.88.0", + "rollup": "^1.23.1", + "rollup-plugin-buble": "^0.19.8", + "rollup-plugin-commonjs": "^10.1.0", + "rollup-plugin-json": "^4.0.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-replace": "^2.2.0", + "rollup-plugin-sourcemaps": "^0.4.2", + "rollup-plugin-terser": "^5.1.2", + "rollup-plugin-unassert": "^0.3.0", + "selenium-webdriver": "^4.0.0-alpha.5", + "semver": "^5.5.0", + "shuffle-seed": "^1.1.6", + "sinon": "^7.3.2", + "source-map-explorer": "^2.5.1", + "st": "^1.2.2", + "stylelint": "^9.10.1", + "stylelint-config-standard": "^18.2.0", + "tap": "~12.4.1", + "tap-parser": "^10.0.1", + "tape": "^4.13.2", + "tape-filter": "^1.0.4", + "testem": "^3.0.0" + }, + "browser": { + "./src/shaders/index.js": "./src/shaders/shaders.js", + "./src/util/window.js": "./src/util/browser/window.js", + "./src/util/web_worker.js": "./src/util/browser/web_worker.js" + }, + "esm": true, + "scripts": { + "build-dev": "rollup -c --environment BUILD:dev", + "watch-dev": "rollup -c --environment BUILD:dev --watch", + "build-prod": "rollup -c --environment BUILD:production", + "build-prod-min": "rollup -c --environment BUILD:production,MINIFY:true", + "build-csp": "rollup -c rollup.config.csp.js", + "build-query-suite": "rollup -c test/integration/rollup.config.test.js", + "build-flow-types": "mkdir -p dist && cp build/maplibre-gl.js.flow dist/maplibre-gl.js.flow && cp build/maplibre-gl.js.flow dist/maplibre-gl-dev.js.flow", + "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-style-spec": "cd src/style-spec && npm run build && cd ../.. && mkdir -p dist/style-spec && cp src/style-spec/dist/* dist/style-spec", + "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg", + "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css", + "build-token": "node build/generate-access-token-script.js", + "build-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/versions/rollup_config_benchmarks.js", + "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js -w", + "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .", + "start": "run-p build-token watch-css watch-query watch-benchmarks start-server", + "start-debug": "run-p build-token watch-css watch-dev start-server", + "start-tests": "run-p build-token watch-css watch-query start-server", + "start-bench": "run-p build-token watch-benchmarks start-server", + "start-release": "run-s build-token build-prod-min build-css print-release-url start-server", + "diff-tarball": "cross-env build/run-node build/diff-tarball", + "prepare-publish": "git clean -fdx && yarn install", + "lint": "eslint --cache --ignore-path .gitignore src test bench build debug/*.html", + "lint-docs": "documentation lint src/index.js", + "lint-css": "stylelint 'src/css/maplibre-gl.css'", + "test": "run-s lint lint-css lint-docs test-flow test-unit", + "test-suite": "run-s test-render test-query test-expressions", + "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r", + "test-unit": "cross-env build/run-tap --reporter classic --no-coverage test/unit", + "test-build": "cross-env build/run-tap --no-coverage test/build/**/*.test.js", + "test-browser": "cross-env build/run-tap --reporter spec --no-coverage test/browser/**/*.test.js", + "test-render": "node --max-old-space-size=2048 test/render.test.js", + "test-query-node": "node test/query.test.js", + "watch-query": "testem -f test/integration/testem.js", + "test-query": "testem ci -f test/integration/testem.js -R xunit > test/integration/query-tests/test-results.xml", + "test-expressions": "cross-env build/run-node test/expression.test.js", + "test-flow": "cross-env build/run-node build/generate-flow-typed-style-spec && flow .", + "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render", + "prepublishOnly": "run-s prepare-publish build-flow-types build-dev build-prod-min build-prod build-csp build-css build-style-spec test-build diff-tarball", + "print-release-url": "node build/print-release-url.js", + "codegen": "cross-env build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js" + }, + "files": [ + "build/", + "dist/maplibre-gl*", + "dist/style-spec/", + "flow-typed/*.js", + "src/", + ".flowconfig" + ] +} \ No newline at end of file diff --git a/test/ignores.json b/test/ignores.json index 11b9170c8f..f3057371a7 100644 --- a/test/ignores.json +++ b/test/ignores.json @@ -1,34 +1,34 @@ { - "query-tests/regressions/mapbox-gl-js#4494": "https://github.com/mapbox/mapbox-gl-js/issues/2716", - "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", - "render-tests/line-dasharray/case/square": "https://github.com/mapbox/mapbox-gl-js/issues/9531", - "render-tests/map-mode/static": "https://github.com/mapbox/mapbox-gl-js/issues/5649", - "render-tests/map-mode/tile": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/map-mode/tile-avoid-edges": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/projection/axonometric": "axonometric rendering in gl-js tbd", - "render-tests/projection/axonometric-multiple": "axonometric rendering in gl-js tbd", - "render-tests/projection/skew": "axonometric rendering in gl-js tbd", - "render-tests/regressions/mapbox-gl-js#3682": "skip - true", - "render-tests/runtime-styling/image-update-icon": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", - "render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", - "render-tests/mixed-zoom/z10-z11": "current behavior conflicts with https://github.com/mapbox/mapbox-gl-js/pull/6803. can be fixed when https://github.com/mapbox/api-maps/issues/1480 is done", - "render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/4403", - "render-tests/symbol-placement/line-center-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/symbol-placement/line-center-buffer-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/symbol-sort-key/text-ignore-placement": "skip - text drawn over icons", - "render-tests/text-variable-anchor/remember-last-placement": "skip - not sure this is correct behavior", - "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "skip - render sdf icon and normal icon in one layer", - "render-tests/text-variable-anchor/all-anchors-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/fill-pattern/update-feature-state": "https://github.com/mapbox/mapbox-gl-js/issues/7207", - "render-tests/text-size/zero": "https://github.com/mapbox/mapbox-gl-js/issues/9161", - "render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/tile-mode/streets-v11": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/within/paint-line": "https://github.com/mapbox/mapbox-gl-js/issues/7023", - "render-tests/icon-text-fit/text-variable-anchor-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/text-variable-anchor/all-anchors-labels-priority-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/fill-extrusion-pattern/1.5x-on-1x-add-image": "skip - non-deterministic on AMD graphics cards", - "render-tests/text-variable-anchor/avoid-edges-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", - "render-tests/extent/1024-symbol": "skip - MapLibre 1.13.1 baseline", - "render-tests/icon-text-fit/enlargen-both": "skip - MapLibre 1.13.1 baseline", - "render-tests/line-dasharray/case/round": "skip - MapLibre 1.13.1 baseline" + "query-tests/regressions/mapbox-gl-js#4494": "https://github.com/mapbox/mapbox-gl-js/issues/2716", + "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", + "render-tests/line-dasharray/case/square": "https://github.com/mapbox/mapbox-gl-js/issues/9531", + "render-tests/map-mode/static": "https://github.com/mapbox/mapbox-gl-js/issues/5649", + "render-tests/map-mode/tile": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/map-mode/tile-avoid-edges": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/projection/axonometric": "axonometric rendering in gl-js tbd", + "render-tests/projection/axonometric-multiple": "axonometric rendering in gl-js tbd", + "render-tests/projection/skew": "axonometric rendering in gl-js tbd", + "render-tests/regressions/mapbox-gl-js#3682": "skip - true", + "render-tests/runtime-styling/image-update-icon": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", + "render-tests/runtime-styling/image-update-pattern": "skip - https://github.com/mapbox/mapbox-gl-js/issues/4804", + "render-tests/mixed-zoom/z10-z11": "current behavior conflicts with https://github.com/mapbox/mapbox-gl-js/pull/6803. can be fixed when https://github.com/mapbox/api-maps/issues/1480 is done", + "render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/4403", + "render-tests/symbol-placement/line-center-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/symbol-placement/line-center-buffer-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/symbol-sort-key/text-ignore-placement": "skip - text drawn over icons", + "render-tests/text-variable-anchor/remember-last-placement": "skip - not sure this is correct behavior", + "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "skip - render sdf icon and normal icon in one layer", + "render-tests/text-variable-anchor/all-anchors-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/fill-pattern/update-feature-state": "https://github.com/mapbox/mapbox-gl-js/issues/7207", + "render-tests/text-size/zero": "https://github.com/mapbox/mapbox-gl-js/issues/9161", + "render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/tile-mode/streets-v11": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/within/paint-line": "https://github.com/mapbox/mapbox-gl-js/issues/7023", + "render-tests/icon-text-fit/text-variable-anchor-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/text-variable-anchor/all-anchors-labels-priority-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/fill-extrusion-pattern/1.5x-on-1x-add-image": "skip - non-deterministic on AMD graphics cards", + "render-tests/text-variable-anchor/avoid-edges-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode", + "render-tests/extent/1024-symbol": "skip - MapLibre 1.13.1 baseline", + "render-tests/icon-text-fit/enlargen-both": "skip - MapLibre 1.13.1 baseline", + "render-tests/line-dasharray/case/round": "skip - MapLibre 1.13.1 baseline" } \ No newline at end of file From a50c98bfa51c3c9f765963e31de8031e0ba6de44 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Thu, 11 Mar 2021 23:21:26 +0100 Subject: [PATCH 59/65] lint issues --- build/diff-tarball.js | 2 +- build/version-utils.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/diff-tarball.js b/build/diff-tarball.js index 81b52a3e01..b3f2500f93 100644 --- a/build/diff-tarball.js +++ b/build/diff-tarball.js @@ -5,7 +5,7 @@ npmContent('maplibre-gl').then(function(last_version_files) { packlist({ path: '.' }).then(function(new_version_files) { new_version_files = new_version_files.map(file => file.replace(/\/\/+/g, '/')); let diff_new = new_version_files.filter(x => !last_version_files.includes(x)); - + // excludes folder names which caused this script // to fail with message: xx files are about to be deleted in the new tarball // i.e. src/ui was reported but src/ui/anchor.js, src/ui/camera.js, etc are included indeed diff --git a/build/version-utils.js b/build/version-utils.js index e355c8f4cd..6578453733 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -40,7 +40,7 @@ function listTags() { switch (args[0]) { case 'list-version-tags': console.log(listTags().join("\n")); - break; + break; case 'version-type': if (semver.prerelease(latestFromTags())) { console.log("prerelease"); @@ -50,7 +50,7 @@ switch (args[0]) { break; case 'latest-version-tag': console.log(latestVersionTag()); - break; + break; case 'version-from-tags': console.log(latestFromTags()); break; @@ -59,11 +59,11 @@ switch (args[0]) { if (tags && tags.length > 1) { const current = tags[0]; const previous = tags[1]; - if (semver.gt(current, previous)){ + if (semver.gt(current, previous)) { console.log(`valid version tag current=${current}, previous=${previous}`); } else { console.log(`invalid - latest tag must contain greater version than previous one (current=${current}, previous=${previous})`); - process.exit(1); + process.exit(1); // eslint-disable-line no-process-exit } } else { console.log("valid"); From 7708fd37e1c6ad926107d8263369fbc96c97cd1a Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Fri, 12 Mar 2021 08:01:03 +0100 Subject: [PATCH 60/65] Update package.json Co-authored-by: Yuri Astrakhan --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fdb080bbd..72c73e717b 100644 --- a/package.json +++ b/package.json @@ -176,4 +176,4 @@ "src/", ".flowconfig" ] -} \ No newline at end of file +} From f07eb2c7803e525deb730b47bfc5295793a7c01c Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Fri, 12 Mar 2021 08:01:30 +0100 Subject: [PATCH 61/65] Update build/version-utils.js Co-authored-by: Yuri Astrakhan --- build/version-utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build/version-utils.js b/build/version-utils.js index 6578453733..6e32a0bc99 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -71,4 +71,5 @@ switch (args[0]) { break; default: console.log('Unknown command.'); + break; } From ae0bd9b7ad74fa5515ccdc8543f484011319676a Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Fri, 12 Mar 2021 08:02:38 +0100 Subject: [PATCH 62/65] Update test/ignores.json Co-authored-by: Yuri Astrakhan --- test/ignores.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ignores.json b/test/ignores.json index f3057371a7..c4db1cd793 100644 --- a/test/ignores.json +++ b/test/ignores.json @@ -31,4 +31,4 @@ "render-tests/extent/1024-symbol": "skip - MapLibre 1.13.1 baseline", "render-tests/icon-text-fit/enlargen-both": "skip - MapLibre 1.13.1 baseline", "render-tests/line-dasharray/case/round": "skip - MapLibre 1.13.1 baseline" -} \ No newline at end of file +} From 6c315b316e31c408436ceea3503594105a0563f4 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Fri, 12 Mar 2021 08:27:52 +0100 Subject: [PATCH 63/65] PR review fixes --- build/version-utils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/version-utils.js b/build/version-utils.js index 6e32a0bc99..29884af244 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -16,7 +16,7 @@ function latestFromTags() { const currentVersion = execSync('git describe --tags --match=v*.*.* --abbrev=0') .toString() .trim() - .replace('v', ''); + .replace(/^v/, ''); return currentVersion; } @@ -25,10 +25,10 @@ function listTags() { .toString() .split('\n') .filter(function(tag) { - return tag && /v*.*.*/.test('tag') + return tag && /v\d+.\d+.\d+/.test(tag) }) .map(function (tag) { - tag = tag.replace('v', '').trim(); + tag = tag.replace(/^v/, '').trim(); return semver.clean(tag); }) .filter(function(cleanTag) { From 1a6b3bcb9bfbe7c4a97b03d57b199ac292af911e Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Mon, 15 Mar 2021 22:33:34 +0100 Subject: [PATCH 64/65] Addressing PR review --- build/version-utils.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build/version-utils.js b/build/version-utils.js index 29884af244..5f5c1bf9cf 100755 --- a/build/version-utils.js +++ b/build/version-utils.js @@ -24,16 +24,13 @@ function listTags() { let gitTags = execSync('git log --no-walk --tags --pretty=format:%S') .toString() .split('\n') - .filter(function(tag) { - return tag && /v\d+.\d+.\d+/.test(tag) - }) - .map(function (tag) { - tag = tag.replace(/^v/, '').trim(); - return semver.clean(tag); - }) - .filter(function(cleanTag) { - return cleanTag - }); + .reduce((filtered, tag) => { + const parsed = semver.valid(tag.replace(/^v/, '')); + if (parsed) { + filtered.push(parsed); + } + return filtered; + }, []); return gitTags; } From ebe015449468005b44cd970104311baf98e857d9 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Wed, 24 Mar 2021 11:35:29 +0100 Subject: [PATCH 65/65] Changelog update for v1.14.0 --- CHANGELOG.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ddcb18c83..94b6e7c164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,13 @@ ### 🐞 Bug fixes -- Add smashed bugs here +- Add fixed bugs here -## 1.13.1 +## 1.14.0 ### Features and improvements -- ✨✨✨✨✨✨ New logo finally !!! ✨✨✨✨✨✨ +- New logo ### 🐞 Bug fixes @@ -22,11 +22,6 @@ - fix CI checksize job to use maplibre name (#86) - Move output files from mapbox.* to maplibre.* (#75) - Remove mapbox specifics and branding from .github (#64) - -## 1.13.1-beta.1 - -### 🐞 Bug fixes - - Fix a bug where mapbox-gl-js is no longer licensed as open source, but we owe immeasurable gratitude to Mapbox for releasing all their initial code to the community under BSD-3 license. ## 1.13.0