From 32ff943a296c50878fd0176bf6072d1f5d953062 Mon Sep 17 00:00:00 2001 From: Simon Graband Date: Wed, 19 Feb 2025 14:56:05 +0100 Subject: [PATCH] Fix next build (#14981) Fixed the next build by updating the latest tag to be an annotated tag. Adjusted the documentation to make this clearer. Also fixed some versions that were left behind in the `lerna.json` an `@examples/playwright`. Improved the Publishing guide for the native dependency steps. Signed-off-by: Simon Graband --- doc/Publishing.md | 17 +- examples/playwright/package.json | 2 +- lerna.json | 2 +- package-lock.json | 310 +------------------------------ package.json | 6 +- 5 files changed, 22 insertions(+), 315 deletions(-) diff --git a/doc/Publishing.md b/doc/Publishing.md index 821b52878f42c..1dae57af5ac06 100644 --- a/doc/Publishing.md +++ b/doc/Publishing.md @@ -169,7 +169,11 @@ Format: - Push the branch. -- Run the [_Package Native Dependencies_](https://github.com/eclipse-theia/theia/actions/workflows/native-dependencies.yml) GitHub Action on the new branch and download the artifacts. +- Get the `native dependencies` + - Run the [_Package Native Dependencies_](https://github.com/eclipse-theia/theia/actions/workflows/native-dependencies.yml) GitHub Action on the new branch (You can continue while you wait). + - Download the artifacts (They are located on the build overview at the bottom). + - Extract the downloaded folders. + - Leave the dependencies for now, you will need them later. - Create a PR (not needed for patch releases): - Name: `Theia {version}`. @@ -182,6 +186,12 @@ Format: git tag -a v{version} ${sha} -m "v{version}" ``` + _Note_: The tag needs to be annotated otherwise it might break the publishing. Check that the output of the following command is `tag` and not `commit`. + + ```bash + git for-each-ref refs/tags | grep 'v1.58.0' | awk '{print $2}' + ``` + - Push the tag: ```bash @@ -193,7 +203,10 @@ Format: - Choose the appropriate `tag` and input a `name` (e.g., `v1.55.0`, `Eclipse Theia v1.55.0`). - Use `generate release notes` for contributors and format like previous releases. - Reference the `changelog` and breaking changes. - - Attach _Package Native Dependencies_ artifacts. + - Attach _Native Dependencies_ artifacts (the extracted zips). + - native-dependencies-darwin-arm64.zip + - native-dependencies-linux-x64.zip + - native-dependencies-win32-x64.zip - Mark the release as `latest` (_Do not mark for a patch on an older version_). - Select _"Publish Release"_. - See [GitHub documentation](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release) for details. diff --git a/examples/playwright/package.json b/examples/playwright/package.json index ba47de28e66cf..a156f65732687 100644 --- a/examples/playwright/package.json +++ b/examples/playwright/package.json @@ -35,7 +35,7 @@ "fs-extra": "^9.0.8" }, "devDependencies": { - "@theia/cli": "1.55.0", + "@theia/cli": "1.58.0", "@types/fs-extra": "^9.0.8", "allure-commandline": "^2.23.1", "allure-playwright": "^2.5.0", diff --git a/lerna.json b/lerna.json index eedf550adc744..b7382e02f844c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/lerna.json", "npmClient": "npm", - "version": "1.57.0", + "version": "1.58.0", "command": { "run": { "stream": true diff --git a/package-lock.json b/package-lock.json index 6841bc4494033..3a819a32de33f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -205,7 +205,6 @@ "dev-packages/ffmpeg": { "name": "@theia/ffmpeg", "version": "1.58.0", - "hasInstallScript": true, "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "dependencies": { "@electron/get": "^2.0.0", @@ -575,7 +574,7 @@ "fs-extra": "^9.0.8" }, "devDependencies": { - "@theia/cli": "1.55.0", + "@theia/cli": "1.58.0", "@types/fs-extra": "^9.0.8", "allure-commandline": "^2.23.1", "allure-playwright": "^2.5.0", @@ -584,207 +583,12 @@ "typescript": "~5.4.5" } }, - "examples/playwright/node_modules/@theia/application-manager": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/application-manager/-/application-manager-1.55.0.tgz", - "integrity": "sha512-YFBwsbE1XLYnZb1xUxlKiVkQtIYw7vnSkf+1SHIyR2p01ep4am2gcAsaNLtQ4cdxenBayYkg14DASCDQPIeWWA==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@babel/core": "^7.10.0", - "@babel/plugin-transform-classes": "^7.10.0", - "@babel/plugin-transform-runtime": "^7.10.0", - "@babel/preset-env": "^7.10.0", - "@theia/application-package": "1.55.0", - "@theia/ffmpeg": "1.55.0", - "@theia/native-webpack-plugin": "1.55.0", - "@types/fs-extra": "^4.0.2", - "@types/semver": "^7.5.0", - "babel-loader": "^8.2.2", - "buffer": "^6.0.3", - "compression-webpack-plugin": "^9.0.0", - "copy-webpack-plugin": "^8.1.1", - "css-loader": "^6.2.0", - "electron-rebuild": "^3.2.7", - "fs-extra": "^4.0.2", - "http-server": "^14.1.1", - "ignore-loader": "^0.1.2", - "less": "^3.0.3", - "mini-css-extract-plugin": "^2.6.1", - "node-abi": "*", - "node-loader": "^2.0.0", - "path-browserify": "^1.0.1", - "semver": "^7.5.4", - "setimmediate": "^1.0.5", - "source-map": "^0.6.1", - "source-map-loader": "^2.0.1", - "source-map-support": "^0.5.19", - "style-loader": "^2.0.0", - "tslib": "^2.6.2", - "umd-compat-loader": "^2.1.2", - "webpack": "^5.76.0", - "webpack-cli": "4.7.0", - "worker-loader": "^3.0.8", - "yargs": "^15.3.1" - }, - "peerDependencies": { - "@theia/electron": "*" - }, - "peerDependenciesMeta": { - "@theia/electron": { - "optional": true - } - } - }, - "examples/playwright/node_modules/@theia/application-manager/node_modules/@types/fs-extra": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.15.tgz", - "integrity": "sha512-zU/EU2kZ1tv+p4pswQLntA7dFQq84wXrSCfmLjZvMbLjf4N46cPOWHg+WKfc27YnEOQ0chVFlBui55HRsvzHPA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "examples/playwright/node_modules/@theia/application-manager/node_modules/fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "examples/playwright/node_modules/@theia/application-manager/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "examples/playwright/node_modules/@theia/application-manager/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "examples/playwright/node_modules/@theia/application-package": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/application-package/-/application-package-1.55.0.tgz", - "integrity": "sha512-CsQ3HiavsV/RR4Qkd48v4NdCrA3nLzRrjOlB+cCoIpxnxzF5f0r/veXLqIAAQSHSRDAzZAwS/nWz62liXtzoHA==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@theia/request": "1.55.0", - "@types/fs-extra": "^4.0.2", - "@types/semver": "^7.5.0", - "@types/write-json-file": "^2.2.1", - "deepmerge": "^4.2.2", - "fs-extra": "^4.0.2", - "is-electron": "^2.1.0", - "nano": "^10.1.3", - "resolve-package-path": "^4.0.3", - "semver": "^7.5.4", - "tslib": "^2.6.2", - "write-json-file": "^2.2.0" - } - }, - "examples/playwright/node_modules/@theia/application-package/node_modules/@types/fs-extra": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.15.tgz", - "integrity": "sha512-zU/EU2kZ1tv+p4pswQLntA7dFQq84wXrSCfmLjZvMbLjf4N46cPOWHg+WKfc27YnEOQ0chVFlBui55HRsvzHPA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "examples/playwright/node_modules/@theia/application-package/node_modules/fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "examples/playwright/node_modules/@theia/application-package/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "examples/playwright/node_modules/@theia/application-package/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "examples/playwright/node_modules/@theia/cli": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/cli/-/cli-1.55.0.tgz", - "integrity": "sha512-y9d4HYuKX3x2OsNge9BNE3ZneI+Oy5MBuPG/urZsBNzHhK2vom07+pxMiNF4vcc6AuLScIOsLLmhzQVy9m1Y/A==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@theia/application-manager": "1.55.0", - "@theia/application-package": "1.55.0", - "@theia/ffmpeg": "1.55.0", - "@theia/localization-manager": "1.55.0", - "@theia/ovsx-client": "1.55.0", - "@theia/request": "1.55.0", - "@types/chai": "^4.2.7", - "@types/mocha": "^10.0.0", - "@types/node-fetch": "^2.5.7", - "chai": "^4.3.10", - "chalk": "4.0.0", - "decompress": "^4.2.1", - "escape-string-regexp": "4.0.0", - "glob": "^8.0.3", - "http-server": "^14.1.1", - "limiter": "^2.1.0", - "log-update": "^4.0.0", - "mocha": "^10.1.0", - "patch-package": "^8.0.0", - "puppeteer": "23.1.0", - "puppeteer-core": "23.1.0", - "puppeteer-to-istanbul": "1.4.0", - "temp": "^0.9.1", - "tslib": "^2.6.2", - "yargs": "^15.3.1" - }, - "bin": { - "theia": "bin/theia", - "theia-patch": "bin/theia-patch.js" - } - }, "examples/playwright/node_modules/@theia/cli/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, + "extraneous": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -800,116 +604,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "examples/playwright/node_modules/@theia/ffmpeg": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/ffmpeg/-/ffmpeg-1.55.0.tgz", - "integrity": "sha512-GMQ5GOTgjLPr52LAsO3oDFk2lN5FElEwynD65R2EbKHoQEfj9nj2OhJMk78UdU6yqvYqnb0Qd1IB0g/aBeRNSg==", - "dev": true, - "hasInstallScript": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@electron/get": "^2.0.0", - "tslib": "^2.6.2", - "unzipper": "^0.9.11" - } - }, - "examples/playwright/node_modules/@theia/localization-manager": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/localization-manager/-/localization-manager-1.55.0.tgz", - "integrity": "sha512-+y0UzuoWDAFVhjAcsK3vpX1eXHflL8ym+UGHJWCX643LYC6RKy5LsVj7voyGC0KcUu0hggCpHQ3I4Clk0z1KmQ==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@types/bent": "^7.0.1", - "@types/fs-extra": "^4.0.2", - "bent": "^7.1.0", - "chalk": "4.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^4.0.2", - "glob": "^7.2.0", - "tslib": "^2.6.2", - "typescript": "~5.4.5" - } - }, - "examples/playwright/node_modules/@theia/localization-manager/node_modules/@types/fs-extra": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.15.tgz", - "integrity": "sha512-zU/EU2kZ1tv+p4pswQLntA7dFQq84wXrSCfmLjZvMbLjf4N46cPOWHg+WKfc27YnEOQ0chVFlBui55HRsvzHPA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "examples/playwright/node_modules/@theia/localization-manager/node_modules/fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "examples/playwright/node_modules/@theia/localization-manager/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "examples/playwright/node_modules/@theia/localization-manager/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "examples/playwright/node_modules/@theia/native-webpack-plugin": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/native-webpack-plugin/-/native-webpack-plugin-1.55.0.tgz", - "integrity": "sha512-C9XJ4iEbBvepIjAWt/0txmg8R8oLldUbEy3f8wc/yw5nkZXERq9Y7Uc3jeTjRvVTFoNZrzxSG9OEGIJsis6LeA==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", - "dependencies": { - "detect-libc": "^2.0.2", - "tslib": "^2.6.2", - "webpack": "^5.76.0" - } - }, - "examples/playwright/node_modules/@theia/ovsx-client": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/ovsx-client/-/ovsx-client-1.55.0.tgz", - "integrity": "sha512-k6gT9LKcMZvnKPm2Aq2K+QJzOu1fVeDyixfK2naBP6GlxNyheeRst9BaA1HJLokcr1vYs5N9TKHp08qNR9b1og==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "@theia/request": "1.55.0", - "limiter": "^2.1.0", - "semver": "^7.5.4", - "tslib": "^2.6.2" - } - }, - "examples/playwright/node_modules/@theia/request": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/@theia/request/-/request-1.55.0.tgz", - "integrity": "sha512-Wul9E8NerN5EfZHvL2/C42UAqLmiIYHz1zff+ya6SgVMIRbEqernbhKu/N4+4ltTh/jX+55McgCa3JX74n95bw==", - "dev": true, - "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", - "dependencies": { - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "tslib": "^2.6.2" - } - }, "examples/playwright/node_modules/@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", diff --git a/package.json b/package.json index 801e3b3939167..2963022675a59 100644 --- a/package.json +++ b/package.json @@ -75,9 +75,9 @@ "lint:clean": "rimraf .eslintcache", "preinstall": "node-gyp install", "postinstall": "theia-patch && npm run -s compute-references && lerna run afterInstall", - "publish:latest": "lerna publish --exact --yes --no-push", - "publish:patch": "lerna publish --exact --yes --no-push --dist-tag patch", - "publish:next": "lerna publish preminor --exact --canary --preid next --dist-tag next --no-git-reset --no-git-tag-version --no-push --yes && npm run -s publish:check", + "publish:latest": "lerna publish --exact --yes", + "publish:patch": "lerna publish --exact --yes --dist-tag patch", + "publish:next": "lerna publish --canary preminor --exact --yes --preid next --dist-tag next && npm run -s publish:check", "publish:check": "node scripts/check-publish.js", "rebuild:clean": "rimraf .browser_modules", "rebuild:browser": "cd examples/browser && npm run rebuild",