diff --git a/.circleci/config.yml b/.circleci/config.yml index bb27ed19ecf..4ad80e061bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -628,10 +628,6 @@ jobs: - image: circleci/node:10 steps: - checkout - # - run: - # name: yarn install - # command: 'yarn install --pure-lockfile --no-progress' - # no_output_timeout: 5m - run: name: boostrap lerna command: 'npx lerna bootstrap' diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 73bbc12c020..d7a60641261 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -37,8 +37,5 @@ "rollup-plugin-visualizer": "0.9.2", "sinon": "1.17.6", "typescript": "3.4.1" - }, - "resolutions": { - "@types/lodash": "4.14.119" } } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 7905da52922..3d0d5a4b34a 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -33,8 +33,5 @@ "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", "typescript": "3.4.1" - }, - "resolutions": { - "@types/lodash": "4.14.119" } } diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 78f8438ba56..b15743a7ba4 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -75,9 +75,6 @@ "url-loader": "^2.0.1", "webpack": "4.35.0" }, - "resolutions": { - "@types/lodash": "4.14.119" - }, "devDependencies": { "@types/glob": "^7.1.1", "@types/prettier": "^1.16.4" diff --git a/packages/grafana-toolkit/src/cli/tasks/package.build.ts b/packages/grafana-toolkit/src/cli/tasks/package.build.ts index c52c098c32f..4429bf4033c 100644 --- a/packages/grafana-toolkit/src/cli/tasks/package.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/package.build.ts @@ -99,4 +99,4 @@ const buildTaskRunner: TaskRunner = async ({ scope }) => { await Promise.all(scopes.map(s => s())); }; -export const buildPackageTask = new Task('@grafana/ui build', buildTaskRunner); +export const buildPackageTask = new Task('Package build uild', buildTaskRunner); diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 47426a9b083..667d50aa5a7 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -78,8 +78,5 @@ "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", "typescript": "3.4.1" - }, - "resolutions": { - "@types/lodash": "4.14.119" } }