@next/eslint-plugin-next 16.0.2 → 16.1.0-canary.0

package/dist/rules/next-script-for-ga.js

@@ -15,23 +15,14 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-var SUPPORTED_SRCS = [
-    'www.google-analytics.com/analytics.js',
-    'www.googletagmanager.com/gtag/js'
-];
-var SUPPORTED_HTML_CONTENT_URLS = [
-    'www.google-analytics.com/analytics.js',
-    'www.googletagmanager.com/gtm.js'
-];
-var description = 'Prefer `next/script` component when using the inline script for Google Analytics.';
+var GOOGLE_ANALYTICS_URL = 'www.google-analytics.com/analytics.js';
+var GOOGLE_TAG_MANAGER_URL = 'www.googletagmanager.com/gtag/js';
+var GOOGLE_ANALYTICS_SRC = GOOGLE_ANALYTICS_URL;
+var GOOGLE_TAG_MANAGER_SRC = 'www.googletagmanager.com/gtm.js';
+var description = 'Prefer `@next/third-parties/google` when using the inline script for Google Analytics and Tag Manager.';
 var url = 'https://nextjs.org/docs/messages/next-script-for-ga';
-var ERROR_MSG = "".concat(description, " See: ").concat(url);
-// Check if one of the items in the list is a substring of the passed string
-var containsStr = function(str, strList) {
-    return strList.some(function(s) {
-        return str.includes(s);
-    });
-};
+var ERROR_MSG_GOOGLE_ANALYTICS = "Prefer `GoogleAnalytics` component from `@next/third-parties/google` when using the inline script for Google Analytics. See: ".concat(url);
+var ERROR_MSG_GOOGLE_TAG_MANAGER = "Prefer `GoogleTagManager` component from `@next/third-parties/google` when using the inline script for Google Tag Manager. See: ".concat(url);
 var _default = (0, _definerule.defineRule)({
     meta: {
         docs: {
@@ -52,24 +43,38 @@ var _default = (0, _definerule.defineRule)({
                     return;
                 }
                 var attributes = new _nodeattributes.default(node);
+                var src = attributes.value('src');
                 // Check if the Alternative async tag is being used to add GA.
                 // https://developers.google.com/analytics/devguides/collection/analyticsjs#alternative_async_tag
                 // https://developers.google.com/analytics/devguides/collection/gtagjs
-                if (typeof attributes.value('src') === 'string' && containsStr(attributes.value('src'), SUPPORTED_SRCS)) {
+                if (typeof src === 'string' && src.includes(GOOGLE_ANALYTICS_URL)) {
                     return context.report({
                         node: node,
-                        message: ERROR_MSG
+                        message: ERROR_MSG_GOOGLE_ANALYTICS
+                    });
+                } else if (typeof src === 'string' && src.includes(GOOGLE_TAG_MANAGER_URL)) {
+                    return context.report({
+                        node: node,
+                        message: ERROR_MSG_GOOGLE_TAG_MANAGER
                     });
                 }
+                var dangerouslySetInnerHTML = attributes.value('dangerouslySetInnerHTML');
                 // Check if inline script is being used to add GA.
                 // https://developers.google.com/analytics/devguides/collection/analyticsjs#the_google_analytics_tag
                 // https://developers.google.com/tag-manager/quickstart
-                if (attributes.value('dangerouslySetInnerHTML') && attributes.value('dangerouslySetInnerHTML').length > 0) {
-                    var htmlContent = attributes.value('dangerouslySetInnerHTML')[0].value.quasis && attributes.value('dangerouslySetInnerHTML')[0].value.quasis[0].value.raw;
-                    if (htmlContent && containsStr(htmlContent, SUPPORTED_HTML_CONTENT_URLS)) {
+                if (dangerouslySetInnerHTML && dangerouslySetInnerHTML.length > 0) {
+                    var _quasis__value, _quasis_;
+                    var quasis = dangerouslySetInnerHTML[0].value.quasis;
+                    var htmlContent = quasis === null || quasis === void 0 ? void 0 : (_quasis_ = quasis[0]) === null || _quasis_ === void 0 ? void 0 : (_quasis__value = _quasis_.value) === null || _quasis__value === void 0 ? void 0 : _quasis__value.raw;
+                    if (htmlContent && htmlContent.includes(GOOGLE_ANALYTICS_SRC)) {
+                        context.report({
+                            node: node,
+                            message: ERROR_MSG_GOOGLE_ANALYTICS
+                        });
+                    } else if (htmlContent && htmlContent.includes(GOOGLE_TAG_MANAGER_SRC)) {
                         context.report({
                             node: node,
-                            message: ERROR_MSG
+                            message: ERROR_MSG_GOOGLE_TAG_MANAGER
                         });
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "16.0.2",
+  "version": "16.1.0-canary.0",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",