From 0f10e553842a4414d4ad582efa4f1f62921bbd48 Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Mon, 2 Dec 2024 16:17:28 -0800 Subject: [PATCH] Update eslint-plugin-kolibri version. Delete outdated publish.js script. --- package.json | 1 - packages/eslint-plugin-kolibri/package.json | 4 +- packages/kolibri-format/package.json | 2 +- packages/publish.js | 82 --------------------- yarn.lock | 9 --- 5 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 packages/publish.js diff --git a/package.json b/package.json index 260e5e9d6ce..e2db71ecb99 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "lint-frontend:watch:format": "yarn run lint-frontend --monitor --write", "build-kolibri-tools": "yarn workspace kolibri-tools run build-kolibri-tools", "migrate-core-api": "kolibri-tools migrate '{kolibri*/**/assets,packages}/**/*.{js,vue}' --ignore '**/dist/**,**/node_modules/**,**/static/**'", - "publish-packages": "node ./packages/publish.js", "hashi-dev": "yarn workspace hashi run dev", "hashi-build": "yarn workspace hashi run build", "compress": "kolibri-tools compress 'kolibri/*/**/static/**/*.{html,js,css,svg,map,eot,ttf}'" diff --git a/packages/eslint-plugin-kolibri/package.json b/packages/eslint-plugin-kolibri/package.json index a0747eed759..ae05b2207e4 100644 --- a/packages/eslint-plugin-kolibri/package.json +++ b/packages/eslint-plugin-kolibri/package.json @@ -1,7 +1,7 @@ { "name": "eslint-plugin-kolibri", - "version": "0.16.1-dev.1", - "description": "Custom rules.", + "version": "0.18.0", + "description": "Custom linting rules for kolibri", "author": "Learning Equality", "main": "lib/index.js", "dependencies": { diff --git a/packages/kolibri-format/package.json b/packages/kolibri-format/package.json index 8cf41eaffcb..bce88590f6d 100644 --- a/packages/kolibri-format/package.json +++ b/packages/kolibri-format/package.json @@ -17,7 +17,7 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.9.0", "eslint-plugin-jest-dom": "^5.5.0", - "eslint-plugin-kolibri": "0.16.1-dev.1", + "eslint-plugin-kolibri": "^0.18.0", "eslint-plugin-vue": "^9.31.0", "fast-glob": "3.3.2", "kolibri-logging": "^1.0.0", diff --git a/packages/publish.js b/packages/publish.js deleted file mode 100644 index 39f84c1c844..00000000000 --- a/packages/publish.js +++ /dev/null @@ -1,82 +0,0 @@ -const path = require('path'); -const execSync = require('child_process').execSync; -const versionTools = require('./kolibri-tools/lib/version'); - -/* - * Step 1 - Set the version of the kolibri package by the current Kolibri version - */ - -const version = versionTools.setVersion( - path.resolve(__dirname, 'kolibri-core-for-export/package.json'), -); - -/* - * Step 2 - Set the version of the kolibri-tools package by the current Kolibri version - */ - -versionTools.setVersion(path.resolve(__dirname, 'kolibri-tools/package.json'), version); - -/* - * Step 3 - Set the version of the eslint-plugin-kolibri package by the current Kolibri version - */ - -versionTools.setVersion(path.resolve(__dirname, 'eslint-plugin-kolibri/package.json'), version); - -/* - * Step 4 - Set version of the browserslist-config-kolibri package by the current Kolibri version - */ - -versionTools.setVersion( - path.resolve(__dirname, 'browserslist-config-kolibri/package.json'), - version, -); - -/* - * Step 5 - Set version of kolibri-tools' kolibri dependency, eslint-plugin-kolibri dependency, - * and browserslist-config-kolibri dependency - */ - -versionTools.setDependencyVersion( - 'kolibri', - path.resolve(__dirname, 'kolibri-tools/package.json'), - version, -); -versionTools.setDependencyVersion( - 'eslint-plugin-kolibri', - path.resolve(__dirname, 'kolibri-tools/package.json'), - version, -); - -versionTools.setDependencyVersion( - 'browserslist-config-kolibri', - path.resolve(__dirname, 'kolibri-tools/package.json'), - version, -); - -/* - * Step 6 - Set the version of hashi's browserslist-config-kolibri dependency - */ -versionTools.setDependencyVersion( - 'browserslist-config-kolibri', - path.resolve(__dirname, 'hashi/package.json'), - version, -); - -// If the version is a prerelease use the 'next' tag to prevent auto upgrades, otherwise use latest. -const tag = versionTools.isPrerelease(version) ? 'next' : 'latest'; - -const currentCwd = process.cwd(); - -process.chdir(path.resolve(__dirname, '..')); - -function publishCommand(workspace) { - execSync(`yarn workspace ${workspace} publish --new-version ${version} --tag ${tag}`, { - stdio: 'inherit', - }); -} - -['browserslist-config-kolibri', 'eslint-plugin-kolibri', 'kolibri', 'kolibri-tools'].forEach( - publishCommand, -); - -process.chdir(currentCwd); diff --git a/yarn.lock b/yarn.lock index fe37fd4abf3..196e714c4d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2941,15 +2941,6 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -"aphrodite@git+https://github.com/learningequality/aphrodite.git": - version "2.2.3" - uid fdc8d7be8912a5cf17f74ff10f124013c52c3e32 - resolved "git+https://github.com/learningequality/aphrodite.git#fdc8d7be8912a5cf17f74ff10f124013c52c3e32" - dependencies: - asap "^2.0.3" - inline-style-prefixer "^4.0.2" - string-hash "^1.1.3" - "aphrodite@https://github.com/learningequality/aphrodite/": version "2.2.3" resolved "https://github.com/learningequality/aphrodite/#fdc8d7be8912a5cf17f74ff10f124013c52c3e32"