Skip to content

fix: remove import-fresh dependency #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2021
Merged

fix: remove import-fresh dependency #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
"fs-extra": "^9.1.0",
"get-port": "^5.1.1",
"has-yarn": "^2.1.0",
"import-fresh": "^3.3.0",
"picomatch": "^2.2.2",
"slash": "^3.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions src/RcFile/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import slash from 'slash'
import picomatch from 'picomatch'
import { join, relative } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Application } from '@adonisjs/application'
import { resolveFrom } from '@poppinss/utils/build/helpers'

Expand Down Expand Up @@ -100,10 +100,10 @@ export class RcFile {
}

/**
* Reloads the rcfile.json bypassing the require cache
* Reloads the rcfile.json
*/
public getDiskContents(): any {
return importFresh(this.rcFilePath) as any
return readJSONSync(this.rcFilePath)
}

/**
Expand Down
8 changes: 4 additions & 4 deletions test/make-command.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import test from 'japa'
import { join } from 'path'
import { Kernel } from '@adonisjs/ace'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'

Expand All @@ -36,7 +36,7 @@ test.group('Make Command', (group) => {
test('make a command inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const command = new MakeCommand(app, new Kernel(app))
Expand Down Expand Up @@ -66,7 +66,7 @@ test.group('Make Command', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const command = new MakeCommand(app, new Kernel(app))
Expand Down Expand Up @@ -96,7 +96,7 @@ test.group('Make Command', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const command = new MakeCommand(app, new Kernel(app))
Expand Down
8 changes: 4 additions & 4 deletions test/make-controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Controller', (group) => {
test('make a controller inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const controller = new MakeController(app, new Kernel(app))
Expand All @@ -54,7 +54,7 @@ test.group('Make Controller', (group) => {
test('make a resourceful controller inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const controller = new MakeController(app, new Kernel(app))
Expand Down Expand Up @@ -83,7 +83,7 @@ test.group('Make Controller', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const controller = new MakeController(app, new Kernel(app))
Expand Down
8 changes: 4 additions & 4 deletions test/make-exception.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Exception', (group) => {
test('make an exception class inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const exception = new MakeException(app, new Kernel(app))
Expand All @@ -56,7 +56,7 @@ test.group('Make Exception', (group) => {
test('make a self-handled exception class inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const exception = new MakeException(app, new Kernel(app))
Expand Down Expand Up @@ -87,7 +87,7 @@ test.group('Make Exception', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const exception = new MakeException(app, new Kernel(app))
Expand Down
6 changes: 3 additions & 3 deletions test/make-listener.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Listener', (group) => {
test('make a listener inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const listener = new MakeListener(app, new Kernel(app))
Expand Down Expand Up @@ -64,7 +64,7 @@ test.group('Make Listener', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const listener = new MakeListener(app, new Kernel(app))
Expand Down
4 changes: 2 additions & 2 deletions test/make-middleware.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Middleware', (group) => {
test('make a middleware inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const middleware = new MakeMiddleware(app, new Kernel(app))
Expand Down
10 changes: 5 additions & 5 deletions test/make-preloaded-file.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Preloaded File', (group) => {
test('make a preload file inside the start directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const preloadFile = new PreloadFile(app, new Kernel(app))
Expand Down Expand Up @@ -69,7 +69,7 @@ test.group('Make Preloaded File', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const preloadFile = new PreloadFile(app, new Kernel(app))
Expand All @@ -96,7 +96,7 @@ test.group('Make Preloaded File', (group) => {
test('select environment as repl', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const preloadFile = new PreloadFile(app, new Kernel(app))
Expand All @@ -122,7 +122,7 @@ test.group('Make Preloaded File', (group) => {
test('prompt for environment when not explicitly defined', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const preloadFile = new PreloadFile(app, new Kernel(app))
Expand Down
10 changes: 5 additions & 5 deletions test/make-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Provider', (group) => {
test('make a provider inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const provider = new MakeProvider(app, new Kernel(app))
Expand Down Expand Up @@ -66,7 +66,7 @@ test.group('Make Provider', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const provider = new MakeProvider(app, new Kernel(app))
Expand All @@ -92,7 +92,7 @@ test.group('Make Provider', (group) => {
test('setup correct path when nested provider is created', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const provider = new MakeProvider(app, new Kernel(app))
Expand All @@ -115,7 +115,7 @@ test.group('Make Provider', (group) => {
test('make ace provider', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const provider = new MakeProvider(app, new Kernel(app))
Expand Down
6 changes: 3 additions & 3 deletions test/make-validator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -36,7 +36,7 @@ test.group('Make Validator', (group) => {
test('make a model inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const validator = new MakeValidator(app, new Kernel(app))
Expand Down Expand Up @@ -66,7 +66,7 @@ test.group('Make Validator', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const validator = new MakeValidator(app, new Kernel(app))
Expand Down
6 changes: 3 additions & 3 deletions test/make-view.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import test from 'japa'
import { join } from 'path'
import importFresh from 'import-fresh'
import { readJSONSync } from 'fs-extra'
import { Kernel } from '@adonisjs/ace'
import { Filesystem } from '@poppinss/dev-utils'
import { Application } from '@adonisjs/application'
Expand All @@ -34,7 +34,7 @@ test.group('Make Command', (group) => {
test('make an empty view inside the default directory', async (assert) => {
await fs.add('.adonisrc.json', JSON.stringify({}))

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const view = new MakeView(app, new Kernel(app))
Expand All @@ -55,7 +55,7 @@ test.group('Make Command', (group) => {
})
)

const rcContents = importFresh(join(fs.basePath, '.adonisrc.json')) as any
const rcContents = readJSONSync(join(fs.basePath, '.adonisrc.json'))
const app = new Application(fs.basePath, 'test', rcContents)

const view = new MakeView(app, new Kernel(app))
Expand Down