Skip to content

N
nexpie-grafana-theme
Commit b44be990 by Dominik Prokop Committed by GitHub
Options

grafana/toolkit: Use babel-plugin-angularjs-annotate (#18005) 

This fixes error caused by ng-annotate mentioned in #17819 (comment)
parent 9e87dbb1
Showing with 18 additions and 10 deletions
packages/grafana-toolkit/package.json
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"@types/webpack": "4.4.34", "@types/webpack": "4.4.34",
"axios": "0.19.0", "axios": "0.19.0",
"babel-loader": "8.0.6", "babel-loader": "8.0.6",
"babel-plugin-angularjs-annotate": "0.10.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"commander": "^2.20.0", "commander": "^2.20.0",
"concurrently": "4.1.0", "concurrently": "4.1.0",
...@@ -46,7 +47,6 @@ ...@@ -46,7 +47,6 @@
"jest-coverage-badges": "^1.1.2", "jest-coverage-badges": "^1.1.2",
"lodash": "4.17.11", "lodash": "4.17.11",
"mini-css-extract-plugin": "^0.7.0", "mini-css-extract-plugin": "^0.7.0",
"ng-annotate-webpack-plugin": "^0.3.0",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"optimize-css-assets-webpack-plugin": "^5.0.3", "optimize-css-assets-webpack-plugin": "^5.0.3",
"ora": "^3.4.0", "ora": "^3.4.0",
......
packages/grafana-toolkit/src/config/webpack.plugin.config.ts
...@@ -5,7 +5,7 @@ const ReplaceInFileWebpackPlugin = require('replace-in-file-webpack-plugin'); ...@@ -5,7 +5,7 @@ const ReplaceInFileWebpackPlugin = require('replace-in-file-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin'); const TerserPlugin = require('terser-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const ngAnnotatePlugin = require('ng-annotate-webpack-plugin');
import * as webpack from 'webpack'; import * as webpack from 'webpack';
import { hasThemeStylesheets, getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders'; import { hasThemeStylesheets, getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders';
...@@ -114,7 +114,6 @@ export const getWebpackConfig: WebpackConfigurationGetter = options => { ...@@ -114,7 +114,6 @@ export const getWebpackConfig: WebpackConfigurationGetter = options => {
const optimization: { [key: string]: any } = {}; const optimization: { [key: string]: any } = {};
if (options.production) { if (options.production) {
plugins.push(new ngAnnotatePlugin());
optimization.minimizer = [new TerserPlugin(), new OptimizeCssAssetsPlugin()]; optimization.minimizer = [new TerserPlugin(), new OptimizeCssAssetsPlugin()];
} }
...@@ -177,8 +176,12 @@ export const getWebpackConfig: WebpackConfigurationGetter = options => { ...@@ -177,8 +176,12 @@ export const getWebpackConfig: WebpackConfigurationGetter = options => {
loaders: [ loaders: [
{ {
loader: 'babel-loader', loader: 'babel-loader',
options: { presets: ['@babel/preset-env'] }, options: {
presets: ['@babel/preset-env'],
plugins: ['angularjs-annotate'],
},
}, },
'ts-loader', 'ts-loader',
], ],
exclude: /(node_modules)/, exclude: /(node_modules)/,
......
yarn.lock
...@@ -2283,10 +2283,10 @@ ...@@ -2283,10 +2283,10 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
"@types/lodash@4.14.119", "@types/lodash@4.14.123": "@types/lodash@4.14.123":
version "4.14.119" version "4.14.123"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.119.tgz#be847e5f4bc3e35e46d041c394ead8b603ad8b39" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
integrity sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw== integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
"@types/marked@0.6.5": "@types/marked@0.6.5":
version "0.6.5" version "0.6.5"
...@@ -3432,7 +3432,7 @@ babel-plugin-add-react-displayname@^0.0.5: ...@@ -3432,7 +3432,7 @@ babel-plugin-add-react-displayname@^0.0.5:
version "0.0.5" version "0.0.5"
resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5" resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
babel-plugin-angularjs-annotate@0.10.0: babel-plugin-angularjs-annotate@0.10.0, babel-plugin-angularjs-annotate@^0.10.0:
version "0.10.0" version "0.10.0"
resolved "https://registry.yarnpkg.com/babel-plugin-angularjs-annotate/-/babel-plugin-angularjs-annotate-0.10.0.tgz#4213b3aaae494a087aad0b8237c5d0716d22ca76" resolved "https://registry.yarnpkg.com/babel-plugin-angularjs-annotate/-/babel-plugin-angularjs-annotate-0.10.0.tgz#4213b3aaae494a087aad0b8237c5d0716d22ca76"
dependencies: dependencies:
...@@ -4216,6 +4216,11 @@ caniuse-api@^3.0.0: ...@@ -4216,6 +4216,11 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2" lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-db@1.0.30000772:
version "1.0.30000772"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000772.tgz#51aae891768286eade4a3d8319ea76d6a01b512b"
integrity sha1-UarokXaChureSj2DGep21qAbUSs=
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963:
version "1.0.30000966" version "1.0.30000966"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000966.tgz#f3c6fefacfbfbfb981df6dfa68f2aae7bff41b64" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000966.tgz#f3c6fefacfbfbfb981df6dfa68f2aae7bff41b64"
...@@ -10753,7 +10758,7 @@ ng-annotate-loader@0.6.1: ...@@ -10753,7 +10758,7 @@ ng-annotate-loader@0.6.1:
normalize-path "2.0.1" normalize-path "2.0.1"
source-map "0.5.6" source-map "0.5.6"
ng-annotate-webpack-plugin@0.3.0, ng-annotate-webpack-plugin@^0.3.0: ng-annotate-webpack-plugin@0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/ng-annotate-webpack-plugin/-/ng-annotate-webpack-plugin-0.3.0.tgz#2e7f5e29c6a4ce26649edcb06c1213408b35b84a" resolved "https://registry.yarnpkg.com/ng-annotate-webpack-plugin/-/ng-annotate-webpack-plugin-0.3.0.tgz#2e7f5e29c6a4ce26649edcb06c1213408b35b84a"
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment