From d1f7e17ee6af547c6d5e7edeefed9c4def12890f Mon Sep 17 00:00:00 2001 From: baron_l Date: Mon, 4 Feb 2019 19:08:40 +0100 Subject: [PATCH] dep(build-system): add angularjs-annotate to webpack + fix on imports --- .babelrc | 2 +- .../registry-management/rest/catalog.js | 2 ++ .../rest/transform/linkGetResponse.js | 2 +- package.json | 1 + yarn.lock | 23 +++++++++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.babelrc b/.babelrc index 2a6c485d4..bc70edda8 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { - "plugins": ["lodash"], + "plugins": ["lodash", "angularjs-annotate"], "presets": [ [ "@babel/preset-env", diff --git a/app/extensions/registry-management/rest/catalog.js b/app/extensions/registry-management/rest/catalog.js index 728a18dcd..62b2b8a11 100644 --- a/app/extensions/registry-management/rest/catalog.js +++ b/app/extensions/registry-management/rest/catalog.js @@ -1,3 +1,5 @@ +import linkGetResponse from './transform/linkGetResponse' + angular.module('portainer.extensions.registrymanagement') .factory('RegistryCatalog', ['$resource', 'API_ENDPOINT_REGISTRIES', function RegistryCatalogFactory($resource, API_ENDPOINT_REGISTRIES) { diff --git a/app/extensions/registry-management/rest/transform/linkGetResponse.js b/app/extensions/registry-management/rest/transform/linkGetResponse.js index 5307701ca..7c3a18b65 100644 --- a/app/extensions/registry-management/rest/transform/linkGetResponse.js +++ b/app/extensions/registry-management/rest/transform/linkGetResponse.js @@ -1,4 +1,4 @@ -function linkGetResponse(data, headers) { +export default function linkGetResponse(data, headers) { var response = angular.fromJson(data); var link = headers('link'); if (link) { diff --git a/package.json b/package.json index ae62c0acd..bfa592b8d 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "angular-utils-pagination": "~0.11.1", "angularjs-scroll-glue": "^2.2.0", "angularjs-slider": "^6.4.0", + "babel-plugin-angularjs-annotate": "^0.10.0", "bootbox": "^4.4.0", "bootstrap": "^3.4.0", "chart.js": "~2.6.0", diff --git a/yarn.lock b/yarn.lock index bdc89acfe..87825aaff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -583,6 +583,15 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" +"@babel/types@^7.2.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0" + integrity sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw== + dependencies: + esutils "^2.0.2" + lodash "^4.17.10" + to-fast-properties "^2.0.0" + "@fortawesome/fontawesome-free-webfonts@^1.0.9": version "1.0.9" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5" @@ -1327,6 +1336,15 @@ babel-loader@^8.0.4: mkdirp "^0.5.1" util.promisify "^1.0.0" +babel-plugin-angularjs-annotate@^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" + integrity sha512-NPE7FOAxcLPCUR/kNkrhHIjoScR3RyIlRH3yRn79j8EZWtpILVnCOdA9yKfsOmRh6BHnLHKl8ZAThc+YDd/QwQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/types" "^7.2.0" + simple-is "~0.2.0" + babel-plugin-lodash@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196" @@ -9965,6 +9983,11 @@ signal-exit@^3.0.0: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +simple-is@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" + integrity sha1-Krt1qt453rXMgVzhDmGRFkhQuvA= + slice-ansi@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"