diff --git a/package-lock.json b/package-lock.json index d912154..1ddf626 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,8 @@ } }, "@squeebot/core": { - "version": "file:../core", + "version": "3.0.0", "requires": { - "@types/semver": "^7.3.4", "dateformat": "^4.0.0", "fs-extra": "^9.0.1", "semver": "^7.3.2", @@ -63,6 +62,11 @@ "js-tokens": "^4.0.0" } }, + "@types/dateformat": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/dateformat/-/dateformat-3.0.1.tgz", + "integrity": "sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==" + }, "@types/fs-extra": { "version": "9.0.4", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.4.tgz", @@ -71,6 +75,14 @@ "@types/node": "*" } }, + "@types/minipass": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@types/minipass/-/minipass-2.2.0.tgz", + "integrity": "sha512-wuzZksN4w4kyfoOv/dlpov4NOunwutLA/q7uc00xU02ZyUY+aoM5PWIXEKBMnm0NHd4a+N71BMjq+x7+2Af1fg==", + "requires": { + "@types/node": "*" + } + }, "@types/node": { "version": "14.14.9", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz", @@ -81,6 +93,15 @@ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz", "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==" }, + "@types/tar": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.4.tgz", + "integrity": "sha512-0Xv+xcmkTsOZdIF4yCnd7RkOOyfyqPaqJ7RZFKnwdxfDbkN3eAAE9sHl8zJFqBz4VhxolW9EErbjR1oyH7jK2A==", + "requires": { + "@types/minipass": "*", + "@types/node": "*" + } + }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -291,6 +312,14 @@ } } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -357,9 +386,12 @@ } }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "requires": { + "lru-cache": "^6.0.0" + } }, "sprintf-js": { "version": "1.0.3", @@ -414,8 +446,16 @@ "minimatch": "^3.0.4", "mkdirp": "^0.5.3", "resolve": "^1.3.2", + "semver": "^5.3.0", "tslib": "^1.13.0", "tsutils": "^2.29.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "tsutils": { diff --git a/package.json b/package.json index 04e68a7..09ec82d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "typescript": "^4.0.5" }, "dependencies": { - "@squeebot/core": "file:../core", + "@squeebot/core": "^3.0.0", "fs-extra": "^9.0.1", "node-watch": "^0.7.0", "tar": "^6.0.5", diff --git a/src/core.ts b/src/core.ts index f1cf336..1ec25ab 100644 --- a/src/core.ts +++ b/src/core.ts @@ -21,8 +21,7 @@ const defaultConfiguration: {[key: string]: any} = { }; export class Squeebot implements ISqueebotCore { - // TODO: change core module after publishing to npm - public npm: NPMExecutor = new NPMExecutor(this.environment, '~/Squeebot/core'); + public npm: NPMExecutor = new NPMExecutor(this.environment, '@squeebot/core'); public stream: ScopedEventEmitter = new ScopedEventEmitter(); diff --git a/src/squeebot.ts b/src/squeebot.ts index 01df80e..278f547 100644 --- a/src/squeebot.ts +++ b/src/squeebot.ts @@ -98,7 +98,7 @@ async function newRepository( const env = dummyEnvironment(location); console.log('Creating package.json and installing base requirements'); - const executor = new NPMExecutor(env, '/home/evert/Squeebot/core'); + const executor = new NPMExecutor(env, '@squeebot/core'); await executor.loadPackageFile(); let gitIgnore = gitignore + '';