diff --git a/packages/nx/src/native/import.js b/packages/nx/src/native/import.js index bbb33352a5d23..44031bf597a5b 100644 --- a/packages/nx/src/native/import.js +++ b/packages/nx/src/native/import.js @@ -54,14 +54,12 @@ Module._load = function (request, parent, isMain) { .digest('hex'); const tmpFile = join(nativeFileCacheLocation, hash + '-' + fileName); if (existsSync(tmpFile)) { - console.log('file already exists @', tmpFile); return originalLoad.apply(this, [tmpFile, parent, isMain]); } if (!existsSync(nativeFileCacheLocation)) { mkdirSync(nativeFileCacheLocation, { recursive: true }); } copyFileSync(nativeLocation, tmpFile); - console.log('copied sucessfully, loading from', tmpFile); return originalLoad.apply(this, [tmpFile, parent, isMain]); } else { return originalLoad.apply(this, arguments); diff --git a/tools/eslint-rules/rules/only-wrapped-native-imports.spec.ts b/tools/eslint-rules/rules/only-wrapped-native-imports.spec.ts index 738bf4ee8e1e9..69e7284150f66 100644 --- a/tools/eslint-rules/rules/only-wrapped-native-imports.spec.ts +++ b/tools/eslint-rules/rules/only-wrapped-native-imports.spec.ts @@ -5,20 +5,19 @@ const ruleTester = new TSESLint.RuleTester({ parser: require.resolve('@typescript-eslint/parser'), }); - ruleTester.run(RULE_NAME, rule, { valid: [ { code: `import something from 'nx/src/native/import';`, - filename: 'project/path/to/file/validFile.js', + filename: 'project/path/to/file/validFile.js', }, { code: `import something from 'nx/src/native/import';`, - filename: 'project/path/to/file/validFile.ts', + filename: 'project/path/to/file/validFile.ts', }, { code: `import something from 'nx/src/native/other-entry-point';`, - filename: 'project/path/to/file/validFile.ts', + filename: 'project/path/to/file/validFile.ts', }, ], invalid: [ @@ -35,22 +34,22 @@ ruleTester.run(RULE_NAME, rule, { { code: `import indexThing from 'nx/src/native/index';`, errors: [{ messageId: 'invalidImport' }], - filename: 'project/path/to/file/invalidFile3.ts', + filename: 'project/path/to/file/invalidFile3.ts', }, { - code: `import relativeNative from '../native';`, + code: `import relativeNative from '../native';`, errors: [{ messageId: 'invalidImport' }], - filename: 'packages/nx/src/nested/relativeImport.ts', + filename: 'packages/nx/src/nested/relativeImport.ts', }, { - code: `import relativeNative from '../../native';`, + code: `import relativeNative from '../../native';`, errors: [{ messageId: 'invalidImport' }], - filename: 'packages/nx/src/nested/utils/relativeImport.ts', + filename: 'packages/nx/src/nested/utils/relativeImport.ts', }, { - code: `import relativeNative from './native';`, + code: `import relativeNative from './native';`, errors: [{ messageId: 'invalidImport' }], - filename: 'packages/nx/src/relativeImport.ts', + filename: 'packages/nx/src/relativeImport.ts', }, ], -}); \ No newline at end of file +}); diff --git a/tools/eslint-rules/rules/only-wrapped-native-imports.ts b/tools/eslint-rules/rules/only-wrapped-native-imports.ts index a7999892975c7..a3cc9c84040f4 100644 --- a/tools/eslint-rules/rules/only-wrapped-native-imports.ts +++ b/tools/eslint-rules/rules/only-wrapped-native-imports.ts @@ -56,7 +56,7 @@ function isInvalidImport(importPath: string, fileName: string): boolean { const absolutePath = resolve(dirname(fileName), importPath); const normalizedPath = normalize(absolutePath); - return regex.test(normalizedPath) + return regex.test(normalizedPath); } - return regex.test(importPath) + return regex.test(importPath); }