diff --git a/gulpfile.js b/gulpfile.js index 8bd5d4a87..13985a513 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,26 +1,26 @@ const gulp = require('gulp'); -const utils = require('./packages/tools/gulp/utils'); +const { execCommand } = require('@joplin/utils'); const tasks = { updateIgnoredTypeScriptBuild: require('./packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild'), buildCommandIndex: require('./packages/tools/gulp/tasks/buildCommandIndex'), completePublishAll: { fn: async () => { - await utils.execCommandVerbose('git', ['add', '-A']); - await utils.execCommandVerbose('git', ['commit', '-m', 'Releasing sub-packages']); + await execCommand(['git', 'add', '-A']); + await execCommand(['git', 'commit', '-m', 'Releasing sub-packages']); // Lerna does some unnecessary auth check that doesn't work with // automation tokens, thus the --no-verify-access. Automation token // is still used for access when publishing even with this flag // (publishing would fail otherwise). // https://github.com/lerna/lerna/issues/2788 - await utils.execCommandVerbose('lerna', ['publish', 'from-package', '-y', '--no-verify-access']); + await execCommand(['lerna', 'publish', 'from-package', '-y', '--no-verify-access']); - await utils.execCommandVerbose('yarn', ['install']); - await utils.execCommandVerbose('git', ['add', '-A']); - await utils.execCommandVerbose('git', ['commit', '-m', 'Lock file']); + await execCommand(['yarn', 'install']); + await execCommand(['git', 'add', '-A']); + await execCommand(['git', 'commit', '-m', 'Lock file']); - await utils.execCommandVerbose('git', ['push']); + await execCommand(['git', 'push']); }, }, build: { @@ -33,12 +33,14 @@ const tasks = { // faster, especially when having to rebuild after adding a // dependency. if (process.env.BUILD_SEQUENCIAL === '1') { - await utils.execCommandVerbose('yarn', ['run', 'buildSequential']); + await execCommand(['yarn', 'run', 'buildSequential']); } else { - await utils.execCommandVerbose('yarn', ['run', 'buildParallel']); + await execCommand(['yarn', 'run', 'buildParallel']); } }, }, }; -utils.registerGulpTasks(gulp, tasks); +for (const taskName in tasks) { + gulp.task(taskName, tasks[taskName].fn); +} diff --git a/package.json b/package.json index 3bb7f32ed..1e7eee230 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ } }, "devDependencies": { + "@joplin/utils": "~2.11", "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0", "@typescript-eslint/eslint-plugin": "5.48.2", "@typescript-eslint/parser": "5.48.2", diff --git a/yarn.lock b/yarn.lock index e21754cb8..f860fdd4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28898,6 +28898,7 @@ __metadata: version: 0.0.0-use.local resolution: "root@workspace:." dependencies: + "@joplin/utils": ~2.11 "@seiyab/eslint-plugin-react-hooks": 4.5.1-beta.0 "@types/fs-extra": 9.0.13 "@typescript-eslint/eslint-plugin": 5.48.2