From 666696af456ca0c7f775ee6c9c51969ccf7139cc Mon Sep 17 00:00:00 2001 From: Wahyu Bucil Date: Mon, 19 Oct 2020 00:28:57 +0800 Subject: [PATCH] feat: use new AdonisJs beta core packages --- commands/Mix/Build.ts | 4 +- commands/Mix/Watch.ts | 4 +- instructions.ts | 4 +- npm-audit.html | 2 +- package-lock.json | 366 +++++++++++++++++++--------------- package.json | 8 +- providers/MixAssetProvider.ts | 21 +- 7 files changed, 219 insertions(+), 190 deletions(-) diff --git a/commands/Mix/Build.ts b/commands/Mix/Build.ts index 08a8d5d..13be69d 100644 --- a/commands/Mix/Build.ts +++ b/commands/Mix/Build.ts @@ -1,4 +1,4 @@ -import { BaseCommand, flags } from '@adonisjs/ace' +import { BaseCommand, flags } from '@adonisjs/core/build/standalone' import { spawn } from 'child_process' import { existsSync } from 'fs' import { join } from 'path' @@ -23,7 +23,7 @@ export default class MixBuild extends BaseCommand { }) public mixConfig: string - public async handle() { + public async run() { let webpackConfigPath = require.resolve('laravel-mix/setup/webpack.config.js') if (!existsSync(webpackConfigPath)) { this.logger.error('Please install Laravel Mix') diff --git a/commands/Mix/Watch.ts b/commands/Mix/Watch.ts index cdcb9a4..02fb644 100644 --- a/commands/Mix/Watch.ts +++ b/commands/Mix/Watch.ts @@ -1,4 +1,4 @@ -import { BaseCommand, flags } from '@adonisjs/ace' +import { BaseCommand, flags } from '@adonisjs/core/build/standalone' import { spawn } from 'child_process' import { existsSync } from 'fs' import { join } from 'path' @@ -17,7 +17,7 @@ export default class MixWatch extends BaseCommand { }) public mixConfig: string - public async handle() { + public async run() { const webpackConfigPath = require.resolve('laravel-mix/setup/webpack.config.js') if (!existsSync(webpackConfigPath)) { this.logger.error('Please install Laravel Mix') diff --git a/instructions.ts b/instructions.ts index 18dd9a6..20b3ed4 100644 --- a/instructions.ts +++ b/instructions.ts @@ -11,9 +11,9 @@ export default async function instructions( ) { const mixConfig = new files.MustacheFile(projectRoot, 'webpack.mix.js', MIX_CONFIG_TEMPLATE_STUB) if (mixConfig.exists()) { - logger.skip('webpack.mix.js File already exists') + logger.action('create').skipped('webpack.mix.js', 'File already exists') } else { mixConfig.apply({}).commit() - logger.create('webpack.mix.js') + logger.action('create').succeeded('webpack.mix.js') } } diff --git a/npm-audit.html b/npm-audit.html index e6bd8f7..5428127 100644 --- a/npm-audit.html +++ b/npm-audit.html @@ -55,7 +55,7 @@
- October 18th 2020, 3:48:11 pm + October 18th 2020, 4:29:00 pm

Last updated

diff --git a/package-lock.json b/package-lock.json index c94e90b..ac643ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,22 +4,44 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@adonisjs/ace": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/@adonisjs/ace/-/ace-6.9.4.tgz", - "integrity": "sha512-73SaXumO9fYzPa8GvVT4uoz0xJhmzFlBHd9XuLUInu5qr6OX3LrZclPmAAKZNogaACUCUNOaGB3fG0JPhIlUkQ==", + "@adonisjs/application": { + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/@adonisjs/application/-/application-3.0.19.tgz", + "integrity": "sha512-NI24JeIz5CvzptPymLRSWsNW3tRMko8whM/1W7YWscHHEDEy+7+1eSz5P9BqIVtQO964EcoWAt3y8vKGQw5oyA==", "dev": true, "requires": { - "@poppinss/colors": "^2.0.1", - "@poppinss/fancy-logs": "^1.3.7", - "@poppinss/prompts": "^1.1.3", - "@poppinss/utils": "^2.5.2", + "@adonisjs/config": "^2.0.1", + "@adonisjs/env": "^2.0.5", + "@adonisjs/fold": "^7.0.7", + "@adonisjs/logger": "^3.0.2", + "@adonisjs/profiler": "^5.0.2", + "@poppinss/utils": "^2.5.7", + "semver": "^7.3.2" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } + } + }, + "@adonisjs/bodyparser": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@adonisjs/bodyparser/-/bodyparser-5.0.4.tgz", + "integrity": "sha512-/qBVleXBVcGWuSXspCFzQEo89bYk5wC8YMp3bBWvOlSJLnMekpq1mxC7NldqMf2tFd4ZVYdklcACNYbg3cTGqg==", + "dev": true, + "requires": { + "@poppinss/co-body": "^1.0.0", + "@poppinss/utils": "^2.5.7", + "bytes": "^3.1.0", + "cuid": "^2.1.8", + "end-of-stream": "^1.4.4", + "file-type": "^15.0.1", "fs-extra": "^9.0.1", - "getopts": "^2.2.4", - "leven": "^3.1.0", - "mustache": "^4.0.1", - "pluralize": "^8.0.0", - "slash": "^3.0.0" + "media-typer": "^1.1.0", + "multiparty": "^4.2.2" }, "dependencies": { "fs-extra": { @@ -52,41 +74,51 @@ } } }, - "@adonisjs/application": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@adonisjs/application/-/application-2.0.0.tgz", - "integrity": "sha512-rAHI4BgVsLCCMFWoIW/zRAe9AdaqUeAh7SfWYGkadMkv7Yw3LiHe/2+XC1N+jcIrymfiSmlJ9vkP11Rb3+1hPQ==", + "@adonisjs/config": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@adonisjs/config/-/config-2.0.1.tgz", + "integrity": "sha512-GPLsB9v1ojlamXf75ITrKvxk31sk8eG3vv/rJPabXKRAQiMZVTKRuqpGSJl1GgoQsjCTvDMScLhHeCtsVx+CVQ==", "dev": true, "requires": { - "@poppinss/utils": "^2.3.0", - "semver": "^7.3.2" - }, - "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - } + "@poppinss/utils": "^2.5.7" } }, - "@adonisjs/bodyparser": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@adonisjs/bodyparser/-/bodyparser-4.0.6.tgz", - "integrity": "sha512-MTDNNR7LTN7VTuSoE9rUp8ei5qc//dZ9tnL1rpIfH5AsGczcRFrKhf/RhDJB5akFdSuyrW2xBIsiCsSUtbqPrQ==", - "dev": true, - "requires": { - "@poppinss/co-body": "^1.0.0", - "@poppinss/utils": "^2.5.5", - "bytes": "^3.1.0", - "cuid": "^2.1.8", - "end-of-stream": "^1.4.4", - "file-type": "^15.0.0", - "fs-extra": "^9.0.1", - "media-typer": "^1.1.0", - "multiparty": "^4.2.2" + "@adonisjs/core": { + "version": "5.0.2-beta-rc-8", + "resolved": "https://registry.npmjs.org/@adonisjs/core/-/core-5.0.2-beta-rc-8.tgz", + "integrity": "sha512-wtvk7NmZ3uRGvJcCfBn7QrVXEv/RyHvGDvcYCM0NJplMkT1aaovPTHN8kGgpe5MfVxr0HCUXrzRixAFVWkBR/w==", + "dev": true, + "requires": { + "@adonisjs/ace": "^7.1.5", + "@adonisjs/application": "^3.0.19", + "@adonisjs/bodyparser": "^5.0.4", + "@adonisjs/encryption": "^3.0.4", + "@adonisjs/events": "^5.0.3", + "@adonisjs/hash": "^6.0.4", + "@adonisjs/http-server": "^4.0.5", + "@adonisjs/validator": "^8.0.4", + "@poppinss/cliui": "^2.0.2", + "@poppinss/utils": "^2.5.7", + "serve-static": "^1.14.1" }, "dependencies": { + "@adonisjs/ace": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/@adonisjs/ace/-/ace-7.1.5.tgz", + "integrity": "sha512-2CD8LREYo+k/OJEd26na7D2hb5xTfZEtj5gWqxCqanYxbGwSNZ45m23lrFwX/DbsEMpsCoDZK155DXiFJGocHQ==", + "dev": true, + "requires": { + "@poppinss/cliui": "^2.0.1", + "@poppinss/prompts": "^1.1.7", + "@poppinss/utils": "^2.5.7", + "fs-extra": "^9.0.1", + "getopts": "^2.2.4", + "leven": "^3.1.0", + "mustache": "^4.0.1", + "pluralize": "^8.0.0", + "slash": "^3.0.0" + } + }, "fs-extra": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", @@ -117,105 +149,64 @@ } } }, - "@adonisjs/config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@adonisjs/config/-/config-1.1.0.tgz", - "integrity": "sha512-Y67wzNNgbcaBEItlRAmjP/Je0knH2caYgkyHozKbTjrlzzTR6lZ9VCLoIiGBMr8FdPJZaIZ7ryHk++pXTN3XEg==", - "dev": true, - "requires": { - "@poppinss/utils": "^2.3.0" - } - }, - "@adonisjs/core": { - "version": "5.0.0-preview-rc-1.12", - "resolved": "https://registry.npmjs.org/@adonisjs/core/-/core-5.0.0-preview-rc-1.12.tgz", - "integrity": "sha512-XrBW3yshHZ9BptPZOg8IjMNd5fwGqLUuy4KI54m6fC5Ph2DbwvIj08gC5OgKhIGBXObY1viZ5ezwqoUURndP6w==", - "dev": true, - "requires": { - "@adonisjs/application": "^2.0.0", - "@adonisjs/bodyparser": "^4.0.6", - "@adonisjs/config": "^1.1.0", - "@adonisjs/encryption": "^2.0.6", - "@adonisjs/env": "^1.0.18", - "@adonisjs/events": "^4.0.1", - "@adonisjs/hash": "^5.0.0", - "@adonisjs/http-server": "^3.0.2", - "@adonisjs/logger": "^2.1.0", - "@adonisjs/profiler": "^4.0.1", - "@adonisjs/validator": "^7.4.2", - "@poppinss/utils": "^2.5.5", - "@types/find-package-json": "^1.1.1", - "cli-table3": "^0.6.0", - "find-package-json": "^1.2.0", - "semver": "^7.3.2", - "serve-static": "^1.14.1" - }, - "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - } - } - }, "@adonisjs/encryption": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@adonisjs/encryption/-/encryption-2.0.6.tgz", - "integrity": "sha512-eyFmdk421R5HDK9qwgH61z3Tt6m0b+NZZ3TqmzrTWIKWpYpdf9d+2CuTOo1OR0QEMxQyXEPKxdR0JcCCqalSdQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@adonisjs/encryption/-/encryption-3.0.4.tgz", + "integrity": "sha512-ig/x5CNUSV1dPbeXnLoyUFEJdpj91v054DZNk9815J2WkzdM5WRwNE6XC5ovNE1v+yNadUOS52wvMYYwIp1tww==", "dev": true, "requires": { - "@poppinss/utils": "^2.3.0" + "@poppinss/utils": "^2.5.7" } }, "@adonisjs/env": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-1.0.18.tgz", - "integrity": "sha512-Zo/dh70DRw8XgYpzL1ygBnzTO0gr7oIyVdcj9QGySE/7+gvtpgENgHZyin5JuefWOCDDERIVkPM86WpXBSPlnA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-2.0.5.tgz", + "integrity": "sha512-SVHhnOGc1g/3Myier5z3BJ6pxD6XTXdoPZBUcxTSJoFc5ZIzEjpV9YPFToSQv6UJcmmuFc9JlX21956+P3kstQ==", "dev": true, "requires": { - "@poppinss/utils": "^2.3.0", - "dotenv": "^8.2.0" + "@poppinss/utils": "^2.5.7", + "dotenv": "^8.2.0", + "validator": "^13.1.17" } }, "@adonisjs/events": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@adonisjs/events/-/events-4.0.1.tgz", - "integrity": "sha512-tF3xt+I/efJ/IFSf6vHScf6mzDPWks6NmiLFSuHYe7cxzHwtjnr4lY+s22FT+saOr/lNZd93gkJtS0dOwiE5eQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@adonisjs/events/-/events-5.0.3.tgz", + "integrity": "sha512-OhTzN2Vknm98X//SOhs6yaYKsieiFFj0ae5y1DqpwJtEudgYcK64cJ8x6uRnZoFqEUPvrCB9rp4IKIZyR/queg==", "dev": true, "requires": { "emittery": "^0.7.1" } }, "@adonisjs/fold": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@adonisjs/fold/-/fold-6.4.1.tgz", - "integrity": "sha512-xlilWpTbLMKb8wKrHEqhmXkCZMv8cjosz3zvIxH71htWFfTwccVeOtQRxZP+e8zkB/c/y9tmBTCnf9mGgONLGg==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/@adonisjs/fold/-/fold-7.0.7.tgz", + "integrity": "sha512-caPLxcFvCjAGZIjWmGsIXDVkMKKLEAQynfZRrkZ0Nu5jbjivecFMW1kQUnZ5JVn94mbir0BoPIjU3XIo1SwrKQ==", "dev": true, "requires": { "@poppinss/utils": "^2.5.7" } }, "@adonisjs/hash": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@adonisjs/hash/-/hash-5.0.0.tgz", - "integrity": "sha512-FjuwTgtnlQopz1eBaeJwVVcxllqaWKXwc9bHQSBC4K8AGavY1fUeFL6KQ20Fw4fISCh5QspWr6+UlPyiipdJmQ==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@adonisjs/hash/-/hash-6.0.4.tgz", + "integrity": "sha512-uf+YY27JtG2gzIaxAeXloHzEWEcVq3TZZy26PaFJa4MqGZp13CyyBaWocXI22hIJkbyr57yJ4a476dr8rLlQZQ==", "dev": true, "requires": { "@phc/format": "^1.0.0", - "@poppinss/manager": "^3.0.4", - "@poppinss/utils": "^2.3.0" + "@poppinss/manager": "^3.0.7", + "@poppinss/utils": "^2.5.7" } }, "@adonisjs/http-server": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@adonisjs/http-server/-/http-server-3.0.3.tgz", - "integrity": "sha512-Gx4VIhWcqJK/CFbSVOzRLoJKk0GP2RQjYEQWOqtKajWrrVZ11mXTZNR7DxtpYPM08TW16szxbm13qiJZO+9MGw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@adonisjs/http-server/-/http-server-4.0.5.tgz", + "integrity": "sha512-rPE29Ys4OCPl8eM6kUzzzPfXqXWte/sZpvNMS5rljUVLFoVOgWRWJCv63EeazCTNsmCvT1areyCi9CpUEYv8KA==", "dev": true, "requires": { - "@poppinss/utils": "^2.5.5", + "@poppinss/utils": "^2.5.7", "accepts": "^1.3.7", - "co-compose": "^6.0.1", + "co-compose": "^6.0.3", "content-disposition": "^0.5.3", "cookie": "^0.4.1", "cuid": "^2.1.8", @@ -224,7 +215,7 @@ "etag": "^1.8.1", "fresh": "^0.5.2", "haye": "^2.0.2", - "macroable": "^5.0.1", + "macroable": "^5.0.3", "matchit": "git+https://github.com/thetutlage/matchit.git", "mime-types": "^2.1.27", "ms": "^2.1.2", @@ -252,15 +243,15 @@ } }, "@adonisjs/logger": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@adonisjs/logger/-/logger-2.1.0.tgz", - "integrity": "sha512-BLaIdN17RD9wP/X1vl/5P9onnH3gkROCIPQpC8/mtvbMmUbE1NrYaRBCobH2r05AOMu/BfNKgvEDzgfqA8TVcg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@adonisjs/logger/-/logger-3.0.2.tgz", + "integrity": "sha512-X43wg0WcKUfFkYZgSSeXPxHVLKBQB9ies+MNwUC21hJBbVxcptCo0l4sLcnGRe+yUw4a5pibze79+5w2qd3cyA==", "dev": true, "requires": { - "@poppinss/utils": "^2.3.0", - "@types/pino": "^6.3.0", + "@poppinss/utils": "^2.5.7", + "@types/pino": "^6.3.2", "abstract-logging": "^2.0.0", - "pino": "^6.4.0" + "pino": "^6.7.0" } }, "@adonisjs/mrm-preset": { @@ -282,33 +273,32 @@ } }, "@adonisjs/profiler": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@adonisjs/profiler/-/profiler-4.0.1.tgz", - "integrity": "sha512-Gn5pRfd6Ne+KQ+ExRFkGDiNUQWBmjHssG5gnVJUraF788upgtnU5dE/zqRuFolqlGVHcnkKEQT1nDkD9QeRIhA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@adonisjs/profiler/-/profiler-5.0.2.tgz", + "integrity": "sha512-G89oSHeFBP/6oa74s/1aTSITQcK0bqtMijH6yFSZqypNBJDwhPOQBTlSz3PEswgZwGpaVNNp8KtaE5tKQh7vTQ==", "dev": true, "requires": { - "@poppinss/utils": "^2.3.0", + "@poppinss/utils": "^2.5.7", "cuid": "^2.1.8", - "jest-worker": "^26.1.0" + "jest-worker": "^26.5.0" } }, "@adonisjs/sink": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@adonisjs/sink/-/sink-3.0.3.tgz", - "integrity": "sha512-UsoPJC/PoGuUm+zpbysQLOlyNJBRiyFwgmTMRJzVB3OEnfY2F80cAPAW35+D/oRC0WxHZHXsI+1kGBsvGYYOug==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@adonisjs/sink/-/sink-4.1.3.tgz", + "integrity": "sha512-6JFAH7f9LJsZZzistLRFkP2TcyscfZxqbfmFjzKXiDRavpEifPQgvFynCMjxdPEeR4QiJJMuKF5jY4Xq3lPdhw==", "dev": true, "requires": { - "@poppinss/colors": "^2.0.1", - "@poppinss/fancy-logs": "^1.3.7", - "@poppinss/prompts": "^1.1.3", - "@poppinss/utils": "^2.5.5", + "@poppinss/cliui": "^2.0.2", + "@poppinss/prompts": "^1.1.7", + "@poppinss/utils": "^2.5.7", "cp-file": "^9.0.0", "fs-extra": "^9.0.1", - "marked": "^1.1.1", + "marked": "^1.2.0", "marked-terminal": "^4.1.0", "mrm-core": "^4.1.2", "mustache": "^4.0.1", - "open": "^7.2.0" + "open": "^7.3.0" }, "dependencies": { "fs-extra": { @@ -342,25 +332,26 @@ } }, "@adonisjs/validator": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@adonisjs/validator/-/validator-7.4.2.tgz", - "integrity": "sha512-1wnoQeKHht8xWoF3RQ7DsXyL6y60jcRYHuXq7hM/aEAyds7IfczbqAfa7OTnDOqISsi+I0XeyqPYd/Uz4rgtPg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@adonisjs/validator/-/validator-8.0.4.tgz", + "integrity": "sha512-ZmMJObM04eg1MeIcJU8TqNDY63TMb4p84riGyUkUdvIV39M2Uq9V1BLoSA1JjB2wA5xfH3QPUImOT0ETTBqHww==", "dev": true, "requires": { - "@poppinss/utils": "^2.5.5", - "@types/luxon": "^1.24.4", + "@poppinss/utils": "^2.5.7", + "@types/luxon": "^1.25.0", "@types/validator": "^13.1.0", "luxon": "^1.25.0", - "validator": "^13.1.1" + "tmp-cache": "^1.1.0", + "validator": "^13.1.17" } }, "@adonisjs/view": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@adonisjs/view/-/view-2.0.9.tgz", - "integrity": "sha512-tsDMQNxsYQ9qoTl13mAb/6y8LL4b3g3d1lGKQZW/PG82tc8VWbvbFqB4PAQ553hiUCczm6+nIMQOqAfsHjPKOw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@adonisjs/view/-/view-3.0.4.tgz", + "integrity": "sha512-XS6ACiAUPbGVBPogWNt8hF+XI+FevvPjXXKFZ8+gT17KwNWjSK39M4MypaRKh1zs6Iw/JQdWHwt7bh8NfIL2mA==", "dev": true, "requires": { - "edge.js": "^3.1.1" + "edge.js": "^3.2.0" } }, "@arr/every": { @@ -597,6 +588,63 @@ "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", "dev": true }, + "@poppinss/cliui": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@poppinss/cliui/-/cliui-2.0.2.tgz", + "integrity": "sha512-fO4HRZcxHLHsfTXTK/DgRTPL+qh29vSCgluDLikbeDiXrghDAOYH9RZDXWa3GlVQnEHJ/j+tIwo/+tahWn6xmw==", + "dev": true, + "requires": { + "@poppinss/colors": "^2.0.3", + "cli-boxes": "^2.2.1", + "cli-table3": "^0.6.0", + "color-support": "^1.1.3", + "log-update": "^4.0.0", + "pretty-hrtime": "^1.0.3", + "string-width": "^4.2.0" + }, + "dependencies": { + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true + }, + "log-update": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", + "dev": true, + "requires": { + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + } + } + }, "@poppinss/co-body": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@poppinss/co-body/-/co-body-1.0.0.tgz", @@ -637,17 +685,6 @@ } } }, - "@poppinss/fancy-logs": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/@poppinss/fancy-logs/-/fancy-logs-1.3.9.tgz", - "integrity": "sha512-6p2xH5CWOKTPXCQs69rHz3rK1zEeLNwGEm+FPKOxjnVvulc1zZgr3YjYY8FP7VyARr7EHTwCviDTpS4YUvDkcg==", - "dev": true, - "requires": { - "@poppinss/colors": "^2.0.3", - "figures": "^3.2.0", - "string-width": "^4.2.0" - } - }, "@poppinss/inspect": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@poppinss/inspect/-/inspect-1.0.1.tgz", @@ -825,15 +862,6 @@ "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==", "dev": true }, - "@types/find-package-json": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/find-package-json/-/find-package-json-1.1.1.tgz", - "integrity": "sha512-XMCocYkg6VUpkbOQMKa3M5cgc3MvU/LJKQwd3VUJrWZbLr2ARUggupsCAF8DxjEEIuSO6HlnH+vl+XV4bgVeEQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -3893,12 +3921,6 @@ "merge": "^1.2.1" } }, - "find-package-json": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/find-package-json/-/find-package-json-1.2.0.tgz", - "integrity": "sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==", - "dev": true - }, "find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", @@ -7727,6 +7749,12 @@ "react-is": "^16.12.0" } }, + "pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", + "dev": true + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -9089,6 +9117,12 @@ "os-tmpdir": "~1.0.2" } }, + "tmp-cache": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tmp-cache/-/tmp-cache-1.1.0.tgz", + "integrity": "sha512-j040fkL/x+XAZQ9K3bKGEPwgYhOZNBQLa3NXEADUiuno9C+3N2JJA4bVPDREixp604G3/vTXWA3DIPpA9lu1RQ==", + "dev": true + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", diff --git a/package.json b/package.json index f47024a..b56e302 100644 --- a/package.json +++ b/package.json @@ -43,12 +43,10 @@ }, "homepage": "https://github.com/wahyubucil/adonis-mix-asset#readme", "devDependencies": { - "@adonisjs/ace": "^6.9.4", - "@adonisjs/core": "^5.0.0-preview-rc-1.12", - "@adonisjs/fold": "^6.4.1", + "@adonisjs/core": "^5.0.2-beta-rc-8", "@adonisjs/mrm-preset": "^2.4.0", - "@adonisjs/sink": "^3.0.3", - "@adonisjs/view": "^2.0.9", + "@adonisjs/sink": "^4.1.3", + "@adonisjs/view": "^3.0.4", "@types/node": "^14.11.8", "commitizen": "^4.2.1", "copyfiles": "^2.4.0", diff --git a/providers/MixAssetProvider.ts b/providers/MixAssetProvider.ts index fdd384c..2caf420 100644 --- a/providers/MixAssetProvider.ts +++ b/providers/MixAssetProvider.ts @@ -1,11 +1,11 @@ -import { IocContract } from '@adonisjs/fold' import { ApplicationContract } from '@ioc:Adonis/Core/Application' import { ViewContract } from '@ioc:Adonis/Core/View' import { existsSync } from 'fs' import { mixAsset } from '../src/mixAsset' export default class MixAssetProvider { - constructor(protected $container: IocContract) {} + constructor(protected app: ApplicationContract) {} + public static needsApplication = true public register() { // Register your own bindings @@ -13,17 +13,14 @@ export default class MixAssetProvider { public boot() { // IoC container is ready - this.$container.with( - ['Adonis/Core/Application', 'Adonis/Core/View'], - (application: ApplicationContract, view: ViewContract) => { - // Load manifest on boot. So it doesn't load every mixAsset function - const manifestPath = application.publicPath('mix-manifest.json') - if (existsSync(manifestPath)) { - const manifest = require(manifestPath) as Record - view.global('mix', (path: string) => mixAsset(application, manifest, path)) - } + this.app.container.with(['Adonis/Core/View'], (view: ViewContract) => { + // Load manifest on boot. So it doesn't load every mixAsset function + const manifestPath = this.app.publicPath('mix-manifest.json') + if (existsSync(manifestPath)) { + const manifest = require(manifestPath) as Record + view.global('mix', (path: string) => mixAsset(this.app, manifest, path)) } - ) + }) } public shutdown() {