Merge 094c1c12f4 into eff380dfbc

__tests__/authutil.test.ts

@@ -7,7 +7,6 @@ import * as auth from '../src/authutil';
 import * as cacheUtils from '../src/cache-utils';
 
 let rcFile: string;
-let pkgJson: string;
 
 describe('authutil tests', () => {
   const _runnerDir = path.join(__dirname, 'runner');
@@ -26,12 +25,10 @@ describe('authutil tests', () => {
     process.env['GITHUB_REPOSITORY'] = 'OwnerName/repo';
     process.env['RUNNER_TEMP'] = tempDir;
     rcFile = path.join(tempDir, '.npmrc');
-    pkgJson = path.join(tempDir, 'package.json');
   }, 100000);
 
   beforeEach(async () => {
     await io.rmRF(rcFile);
-    await io.rmRF(pkgJson);
     // if (fs.existsSync(rcFile)) {
     //   fs.unlinkSync(rcFile);
     // }
@@ -116,15 +113,6 @@ describe('authutil tests', () => {
     expect(rc['always-auth']).toBe('false');
   });
 
-  it('Automatically configures npm scope from package.json', async () => {
-    process.env['INPUT_SCOPE'] = '';
-    fs.writeFileSync(pkgJson, '{"name":"@myscope/mypackage"}');
-    await auth.configAuthentication('https://registry.npmjs.org', '');
-
-    const rc = readRcFile(rcFile);
-    expect(rc['@myscope:registry']).toBe('https://registry.npmjs.org/');
-  });
-
   it('Sets up npmrc for always-auth true', async () => {
     await auth.configAuthentication('https://registry.npmjs.org/', 'true');
     expect(fs.statSync(rcFile)).toBeDefined();

src/authutil.ts

@@ -26,10 +26,10 @@ function writeRegistryToFile(
     scope = github.context.repo.owner;
   }
   if (!scope) {
-   const namePrefix = packageJson('name')?.match(/^(@[^/]+)\//);
-   if (namePrefix) {
-    scope = namePrefix[1];
-   }
+    let namePrefix = require('./package').name.match('@[^/]+');
+    if (namePrefix) {
+      scope = namePrefix[0];
+    }
   }
   if (scope && scope[0] != '@') {
     scope = '@' + scope;
@@ -63,14 +63,3 @@ function writeRegistryToFile(
     process.env.NODE_AUTH_TOKEN || 'XXXXX-XXXXX-XXXXX-XXXXX'
   );
 }
-
-function packageJson(prop: string){
-  const pkgPath: string = path.resolve(process.env['RUNNER_TEMP'] || process.cwd(), 'package.json');
-  try {
-    const json = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-
-    return prop ? json[prop] : json;
-  } catch(e) {
-    core.debug(`Unable to read from package.json`);
-  }
-}