From ab71814be10e78d585b68fb5b7b0b4fb383f8e24 Mon Sep 17 00:00:00 2001 From: rmilea Date: Tue, 22 Sep 2026 15:00:51 +0300 Subject: [PATCH 1/3] Export restricted import paths --- ...t-7dbe24de-8ab8-4aa4-868e-a9f987950098.json | 7 +++++++ packages/eslint-config-javascript/index.js | 1 + packages/eslint-config-javascript/lib/es6.js | 14 ++++++++------ tests/javascript/eslint.config.js | 18 +++++++++++++++++- 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json diff --git a/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json b/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json new file mode 100644 index 00000000..3492c6ef --- /dev/null +++ b/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Export restricted import paths for extension by consuming projects", + "packageName": "@ni/eslint-config-javascript", + "email": "robert.milea@ni.com", + "dependentChangeType": "patch" +} \ No newline at end of file diff --git a/packages/eslint-config-javascript/index.js b/packages/eslint-config-javascript/index.js index 6536e272..97023cf2 100644 --- a/packages/eslint-config-javascript/index.js +++ b/packages/eslint-config-javascript/index.js @@ -12,6 +12,7 @@ import { imports } from './lib/imports.js'; import { strict } from './lib/strict.js'; export { importNodeEsmConfig } from './lib/import-node-esm.js'; +export { restrictedImportPaths } from './lib/es6.js'; export const javascriptConfig = defineConfig([ stylisticPlugin.configs['disable-legacy'], bestPractices, diff --git a/packages/eslint-config-javascript/lib/es6.js b/packages/eslint-config-javascript/lib/es6.js index e6f0a58e..2a24efd8 100644 --- a/packages/eslint-config-javascript/lib/es6.js +++ b/packages/eslint-config-javascript/lib/es6.js @@ -1,5 +1,12 @@ import { defineConfig } from 'eslint/config'; +export const restrictedImportPaths = [{ + // The following is recommended by the @angular-eslint/recommended--extra configuration. + // https://github.com/angular-eslint/angular-eslint/blob/v15.2.1/packages/eslint-plugin/src/configs/recommended--extra.json + name: 'rxjs/Rx', + message: 'Please import directly from \'rxjs\' instead' +}]; + export const es6 = defineConfig([{ rules: { /* @@ -84,12 +91,7 @@ export const es6 = defineConfig([{ 'no-restricted-imports': [ 'error', { - paths: [{ - // The following is recommended by the @angular-eslint/recommended--extra configuration. - // https://github.com/angular-eslint/angular-eslint/blob/v15.2.1/packages/eslint-plugin/src/configs/recommended--extra.json - name: 'rxjs/Rx', - message: 'Please import directly from \'rxjs\' instead' - }] + paths: restrictedImportPaths }], /* diff --git a/tests/javascript/eslint.config.js b/tests/javascript/eslint.config.js index 662b25b1..37eaf25a 100644 --- a/tests/javascript/eslint.config.js +++ b/tests/javascript/eslint.config.js @@ -1,6 +1,22 @@ import { defineConfig } from 'eslint/config'; -import { javascriptConfig } from '@ni/eslint-config-javascript'; +import { javascriptConfig, restrictedImportPaths } from '@ni/eslint-config-javascript'; export default defineConfig([ javascriptConfig, + { + rules: { + 'no-restricted-imports': [ + 'error', + { + paths: [ + ...restrictedImportPaths, + { + name: 'custom-restricted-import', + message: 'Custom restricted import.' + } + ] + } + ] + } + } ]); From f2ed801acf1a84f3dd728b600de302fe50fae374 Mon Sep 17 00:00:00 2001 From: Milea Robert Stefan <58860510+MileaRobertStefan@users.noreply.github.com> Date: Thu, 24 Sep 2026 12:41:55 +0300 Subject: [PATCH 2/3] Update change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json Co-authored-by: Jesse Attas --- ...-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json b/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json index 3492c6ef..e8c22c7f 100644 --- a/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json +++ b/change/@ni-eslint-config-javascript-7dbe24de-8ab8-4aa4-868e-a9f987950098.json @@ -1,5 +1,5 @@ { - "type": "patch", + "type": "minor", "comment": "Export restricted import paths for extension by consuming projects", "packageName": "@ni/eslint-config-javascript", "email": "robert.milea@ni.com", From 62a8ac33e4bb13a793bece7ab54539535b480e00 Mon Sep 17 00:00:00 2001 From: rmilea Date: Thu, 24 Sep 2026 12:44:16 +0300 Subject: [PATCH 3/3] revert test change --- tests/javascript/eslint.config.js | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tests/javascript/eslint.config.js b/tests/javascript/eslint.config.js index 37eaf25a..169512df 100644 --- a/tests/javascript/eslint.config.js +++ b/tests/javascript/eslint.config.js @@ -1,22 +1,6 @@ import { defineConfig } from 'eslint/config'; -import { javascriptConfig, restrictedImportPaths } from '@ni/eslint-config-javascript'; +import { javascriptConfig } from '@ni/eslint-config-javascript'; export default defineConfig([ javascriptConfig, - { - rules: { - 'no-restricted-imports': [ - 'error', - { - paths: [ - ...restrictedImportPaths, - { - name: 'custom-restricted-import', - message: 'Custom restricted import.' - } - ] - } - ] - } - } -]); +]); \ No newline at end of file