Fix sample directory and delete files

Author: lindsaylevine

index.js

@@ -5,6 +5,7 @@ const util = require('util')
 const findUp = require('find-up')
 const makeDir = require('make-dir')
 
+const { name: pluginName } = require('./package.json')
 const isStaticExportProject = require('./helpers/isStaticExportProject')
 const validateNextUsage = require('./helpers/validateNextUsage')
 
@@ -25,7 +26,7 @@ module.exports = {
     }
 
     const { build } = netlifyConfig
-    const { scripts = {}, dependencies = {} } = packageJson
+    const { name, scripts = {}, dependencies = {} } = packageJson
 
     if (isStaticExportProject({ build, scripts })) {
       return failBuild(`** Static HTML export next.js projects do not require this plugin **`)
@@ -34,7 +35,8 @@ module.exports = {
     const hasNextOnNetlifyInstalled = dependencies['next-on-netlify'] !== undefined
     const hasNextOnNetlifyPostbuildScript =
       typeof scripts.postbuild === 'string' && scripts.postbuild.includes('next-on-netlify')
-    const isAlreadyUsingNextOnNetlify = hasNextOnNetlifyInstalled || hasNextOnNetlifyPostbuildScript
+    const isAlreadyUsingNextOnNetlify =
+      (hasNextOnNetlifyInstalled || hasNextOnNetlifyPostbuildScript) && pluginName !== name
     if (isAlreadyUsingNextOnNetlify) {
       return failBuild(
         `This plugin does not support sites that manually use next-on-netlify. Uninstall next-on-netlify as a dependency to resolve.`,

package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "format": "prettier --write .",
-    "test": "jest"
+    "build": "next build test/sample",
+    "test": "npm run build && jest"
   },
   "repository": {
     "type": "git",

test/index.js

@@ -3,7 +3,6 @@ const process = require('process')
 const nextOnNetlify = require('next-on-netlify')
 const pathExists = require('path-exists')
 const { dir: getTmpDir } = require('tmp-promise')
-const execa = require('execa')
 const cpy = require('cpy')
 
 const plugin = require('..')
@@ -40,14 +39,6 @@ const useFixture = async function (fixtureName) {
   await cpy('**', process.cwd(), { cwd: fixtureDir, parents: true, overwrite: false, dot: true })
 }
 
-// Build the sample project before running the tests
-beforeAll(async () => {
-  await execa('next', ['build'], {
-    cwd: SAMPLE_PROJECT_DIR,
-    preferLocal: true,
-  })
-}, 180 * 1000) // timeout after 180 seconds
-
 // In each test, we change cwd to a temporary directory.
 // This allows us not to have to mock filesystem operations.
 beforeEach(async () => {

test/sample/netlify.toml

@@ -1,6 +1,6 @@
 [build]
-  command = "npm run build"
+  command = "npx next build"
   publish = "my-publish-dir"
 
 [[plugins]]
-  package = "/plugins/netlify-plugin-nextjs"
+  package = "../../"