From fdbc7bad2e1f5bd9f2bf615785ac049439e83c55 Mon Sep 17 00:00:00 2001 From: George Cook Date: Fri, 4 Nov 2022 14:23:30 +0100 Subject: [PATCH] Fix/update to bsc 0.59.0 (#192) * bump * update to bsc 0.59.0 * update to latest bsc --- bsc-plugin/CHANGELOG.md | 7 + bsc-plugin/package.json | 2 +- bsc-plugin/src/plugin.spec.ts | 16 +- bsc-plugin/src/plugin.ts | 4 +- framework/src/source/BaseTestSuite.bs | 2 +- framework/src/source/CommonUtils.bs | 8 +- framework/src/source/ConsoleTestReporter.bs | 8 +- package-lock.json | 214 ++++++++++---------- package.json | 2 +- 9 files changed, 138 insertions(+), 125 deletions(-) diff --git a/bsc-plugin/CHANGELOG.md b/bsc-plugin/CHANGELOG.md index 2432e19c..aa7cd2b2 100644 --- a/bsc-plugin/CHANGELOG.md +++ b/bsc-plugin/CHANGELOG.md @@ -4,9 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [5.2.3](https://github.com/georgejecook/rooibos/compare/5.2.2...5.2.3) + +- Make "undent" a prod dependency [`#186`](https://github.com/georgejecook/rooibos/pull/186) + #### [5.2.2](https://github.com/georgejecook/rooibos/compare/5.2.1...5.2.2) +> 15 June 2022 + - fix(asserts): fixes logic error in assertclass [`#179`](https://github.com/georgejecook/rooibos/pull/179) +- bump [`f47052f`](https://github.com/georgejecook/rooibos/commit/f47052f5844c588c58194505e94614507b7d89d3) #### [5.2.1](https://github.com/georgejecook/rooibos/compare/5.2.0...5.2.1) diff --git a/bsc-plugin/package.json b/bsc-plugin/package.json index 5a8ddeea..a9730f60 100644 --- a/bsc-plugin/package.json +++ b/bsc-plugin/package.json @@ -27,7 +27,7 @@ "@types/node": "^17.0.29", "@typescript-eslint/eslint-plugin": "^4.4.1", "@typescript-eslint/parser": "^4.4.1", - "brighterscript": "^0.52.1", + "brighterscript": "^0.59.0", "chai": "^4.2.0", "chai-subset": "^1.6.0", "coveralls": "^3.0.0", diff --git a/bsc-plugin/src/plugin.spec.ts b/bsc-plugin/src/plugin.spec.ts index e6cd96e2..a3a62136 100644 --- a/bsc-plugin/src/plugin.spec.ts +++ b/bsc-plugin/src/plugin.spec.ts @@ -2,7 +2,6 @@ import type { BrsFile, CallExpression, ClassMethodStatement, ClassStatement, Exp import { CallfuncExpression, DiagnosticSeverity, DottedGetExpression, Program, ProgramBuilder, util, standardizePath as s, PrintStatement } from 'brighterscript'; import { expect } from 'chai'; import { RooibosPlugin } from './plugin'; -import PluginInterface from 'brighterscript/dist/PluginInterface'; import * as fsExtra from 'fs-extra'; import * as path from 'path'; import * as trim from 'trim-whitespace'; @@ -621,7 +620,7 @@ describe('RooibosPlugin', () => { @it("test1") function _() b = { someValue: lib.myEnum.value} - m.assertEqual(a, { someValue: lib.myEnum.value}) + m.assertEqual(b, { someValue: lib.myEnum.value}) end function end class `); @@ -637,7 +636,7 @@ describe('RooibosPlugin', () => { } m.currentAssertLineNumber = 12 - m.assertEqual(a, { + m.assertEqual(b, { someValue: "value" }) if m.currentResult.isFail then return invalid`); @@ -889,6 +888,7 @@ describe('RooibosPlugin', () => { @describe("groupA") @it("test1") function _() + thing = {} m.expectNotCalled(thing@.getFunction()) m.expectNotCalled(thing@.getFunction("arg1", "arg2")) end function @@ -901,24 +901,26 @@ describe('RooibosPlugin', () => { expect( getTestFunctionContents() ).to.eql(undent` - m.currentAssertLineNumber = 6 + thing = {} + + m.currentAssertLineNumber = 7 m._expectNotCalled(thing, "callFunc", thing, "thing") if m.currentResult.isFail then return invalid - m.currentAssertLineNumber = 7 + m.currentAssertLineNumber = 8 m._expectNotCalled(thing, "callFunc", thing, "thing") if m.currentResult.isFail then return invalid `); //verify original code does not remain modified after the transpile cycle const testMethod = ((file.ast.statements[0] as ClassStatement).memberMap['_'] as ClassMethodStatement); - const call1 = (testMethod.func.body.statements[0] as ExpressionStatement).expression as CallExpression; + const call1 = (testMethod.func.body.statements[1] as ExpressionStatement).expression as CallExpression; expect(call1.args).to.be.lengthOf(1); expect(call1.args[0]).to.be.instanceof(CallfuncExpression); expect((call1.args[0] as CallfuncExpression).methodName.text).to.eql('getFunction'); - const call2 = (testMethod.func.body.statements[0] as ExpressionStatement).expression as CallExpression; + const call2 = (testMethod.func.body.statements[2] as ExpressionStatement).expression as CallExpression; expect(call2.args).to.be.lengthOf(1); expect(call2.args[0]).to.be.instanceof(CallfuncExpression); expect((call2.args[0] as CallfuncExpression).methodName.text).to.eql('getFunction'); diff --git a/bsc-plugin/src/plugin.ts b/bsc-plugin/src/plugin.ts index 85343856..8350d88a 100644 --- a/bsc-plugin/src/plugin.ts +++ b/bsc-plugin/src/plugin.ts @@ -93,8 +93,6 @@ export class RooibosPlugin implements CompilerPlugin { } } - beforePublish() { } - beforeProgramTranspile(program: Program, entries: TranspileObj[], editor: AstEditor) { this.session.addTestRunnerMetadata(editor); this.session.addLaunchHook(editor); @@ -126,7 +124,7 @@ export class RooibosPlugin implements CompilerPlugin { this.session.removeRooibosMain(); } - afterProgramValidate() { + afterProgramValidate(program: Program) { // console.log('bpv'); this.session.updateSessionStats(); for (let testSuite of [...this.session.sessionInfo.testSuites.values()]) { diff --git a/framework/src/source/BaseTestSuite.bs b/framework/src/source/BaseTestSuite.bs index cff1093d..6a325097 100644 --- a/framework/src/source/BaseTestSuite.bs +++ b/framework/src/source/BaseTestSuite.bs @@ -1874,10 +1874,10 @@ namespace rooibos expectedArgsValues = [] lineNumber = m.currentAssertLineNumber hasArgs = Rooibos.Common.isArray(expectedArgs) + defaultValue = m.ignoreValue if hasArgs defaultValue = m.invalidValue else - defaultValue = m.ignoreValue expectedArgs = [] end if lineNumbers = [lineNumber] diff --git a/framework/src/source/CommonUtils.bs b/framework/src/source/CommonUtils.bs index 361a692a..b7ddc009 100755 --- a/framework/src/source/CommonUtils.bs +++ b/framework/src/source/CommonUtils.bs @@ -803,26 +803,26 @@ namespace rooibos.Common contentName = parts[i] i++ if type(content) <> "roAssociativeArray" - content = {id: contentName} + content = { id: contentName } end if part = content while i < numParts and part <> invalid isIndexNumber = parts[i] = "0" or (parts[i].toInt() <> 0 and parts[i].toInt().toStr() = parts[i]) + index = invalid if isIndexNumber index = parts[i].toInt() else index = parts[i] end if + nextPart = invalid if rooibos.Common.isArray(part) and isIndexNumber nextPart = part[index] else if type(part) = "roAssociativeArray" and not isIndexNumber nextPart = part[index] - else - nextPart = invalid end if - if nextPart = invalid or type(nextPart) <> "roAssociativeArray" + if nextPart = invalid or type(nextPart) <> "roAssociativeArray" if (not isIndexNumber and type(part) = "roAssociativeArray") or (isIndexNumber and (rooibos.Common.isArray(part))) nextPart = { id: index } part[index] = nextPart diff --git a/framework/src/source/ConsoleTestReporter.bs b/framework/src/source/ConsoleTestReporter.bs index 5f85bcdf..623fc563 100644 --- a/framework/src/source/ConsoleTestReporter.bs +++ b/framework/src/source/ConsoleTestReporter.bs @@ -4,6 +4,7 @@ namespace rooibos private lineWidth = 60 function new(testRunner) + 'bs:disable-next-line super(testRunner) if m.config.lineWidth <> invalid m.lineWidth = m.config.lineWidth @@ -48,7 +49,7 @@ namespace rooibos m.printLine() m.printLine() end if - + overrallResult = "" if m.allStats.hasFailures overrallResult = "Fail" else @@ -82,6 +83,7 @@ namespace rooibos testLocationLine = StrI(test.lineNumber).trim() locationLine = invalid + testChar = "" if test.result.isCrash testChar = "|" locationLine = StrI(test.lineNumber).trim() @@ -95,10 +97,9 @@ namespace rooibos testLocationText = "file://" + test.testSuite.filePath.trim() + ":" + testLocationLine + timeText = "" if m.config.printTestTimes = true timeText = " (" + stri(test.result.time).trim() + "ms)" - else - timeText = "" end if insetText = "" @@ -119,6 +120,7 @@ namespace rooibos if test.isParamTest = true insetText = " " + rawParams = invalid if type(test.rawParams) = "roAssociativeArray" rawParams = {} for each key in test.rawParams diff --git a/package-lock.json b/package-lock.json index 134b2108..817f5c4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,10 +5,11 @@ "requires": true, "packages": { "": { + "name": "rooibos", "license": "MIT", "devDependencies": { "@rokucommunity/bslint": "^0.5.0", - "brighterscript": "^0.45.2", + "brighterscript": "^0.60.5", "ropm": "^0.5.0" } }, @@ -488,9 +489,9 @@ } }, "node_modules/brighterscript": { - "version": "0.45.2", - "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.45.2.tgz", - "integrity": "sha512-NGDpp2EKpzljSpXWNq2xELFspUos88bKNGC2jCEaybxwUdHgQi3A37dNqiPm08WIilJOb2JQZic4nx4dSp2sag==", + "version": "0.60.5", + "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.60.5.tgz", + "integrity": "sha512-3OQJ8pYqV9u0YoFMyYczpAkIW+lCVPTKXoAWxiod9Wv2MCVdscvVc1h7Nv7Uc3Jv3xR9BlEf2rgFElmUcJjKZw==", "dev": true, "dependencies": { "@rokucommunity/bslib": "^0.1.1", @@ -503,9 +504,9 @@ "cross-platform-clear-console": "^2.3.0", "debounce-promise": "^3.1.0", "eventemitter3": "^4.0.0", + "fast-glob": "^3.2.11", "file-url": "^3.0.0", - "fs-extra": "^7.0.1", - "glob": "^7.1.6", + "fs-extra": "^8.0.0", "jsonc-parser": "^2.3.0", "long": "^3.2.0", "luxon": "^1.8.3", @@ -513,7 +514,8 @@ "moment": "^2.23.0", "p-settle": "^2.1.0", "parse-ms": "^2.1.0", - "roku-deploy": "^3.5.3", + "require-relative": "^0.8.7", + "roku-deploy": "^3.9.2", "serialize-error": "^7.0.1", "source-map": "^0.7.3", "vscode-languageserver": "7.0.0", @@ -571,6 +573,20 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/brighterscript/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, "node_modules/brighterscript/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -778,6 +794,12 @@ "node": "*" } }, + "node_modules/dayjs": { + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz", + "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==", + "dev": true + }, "node_modules/debounce-promise": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz", @@ -895,9 +917,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -907,7 +929,7 @@ "micromatch": "^4.0.4" }, "engines": { - "node": ">=8" + "node": ">=8.6.0" } }, "node_modules/fast-json-stable-stringify": { @@ -1231,9 +1253,9 @@ } }, "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "dependencies": { "is-extglob": "^2.1.1" @@ -1646,16 +1668,6 @@ "node": ">=6" } }, - "node_modules/path": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", - "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", - "dev": true, - "dependencies": { - "process": "^0.11.1", - "util": "^0.10.3" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -1701,15 +1713,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -1840,6 +1843,12 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "node_modules/require-relative": { + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", + "integrity": "sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==", + "dev": true + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -1866,22 +1875,24 @@ } }, "node_modules/roku-deploy": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.5.3.tgz", - "integrity": "sha512-a9J6aI2ASCYkDS7FrKSRre532nIXTdhJIOAxHqlWUC692OHlUpMDmQXBPujWX7geNQSG9Y/uJkHNbE+dJVAqgw==", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.9.2.tgz", + "integrity": "sha512-2LZyR4EhaFrka1gVmcuJO/f42tqz4clGImboVLCNem1q/PcFV5cnXNZRfqDI+MZ/n8eJto71JlZkcc7TDLt/EQ==", "dev": true, "dependencies": { "chalk": "^2.4.2", "dateformat": "^3.0.3", + "dayjs": "^1.11.0", + "fast-glob": "^3.2.11", "fs-extra": "^7.0.1", - "glob": "^7.1.6", + "is-glob": "^4.0.3", "jsonc-parser": "^2.3.0", "jszip": "^3.6.0", - "minimatch": "^3.0.4", "moment": "^2.29.1", "parse-ms": "^2.1.0", - "path": "^0.12.7", + "picomatch": "^2.2.1", "request": "^2.88.0", + "temp-dir": "^2.0.0", "xml2js": "^0.4.23" }, "bin": { @@ -2125,6 +2136,15 @@ "node": ">=4" } }, + "node_modules/temp-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", + "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2198,27 +2218,12 @@ "punycode": "^2.1.0" } }, - "node_modules/util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, - "dependencies": { - "inherits": "2.0.3" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, - "node_modules/util/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, "node_modules/uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", @@ -2817,9 +2822,9 @@ } }, "brighterscript": { - "version": "0.45.2", - "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.45.2.tgz", - "integrity": "sha512-NGDpp2EKpzljSpXWNq2xELFspUos88bKNGC2jCEaybxwUdHgQi3A37dNqiPm08WIilJOb2JQZic4nx4dSp2sag==", + "version": "0.60.5", + "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.60.5.tgz", + "integrity": "sha512-3OQJ8pYqV9u0YoFMyYczpAkIW+lCVPTKXoAWxiod9Wv2MCVdscvVc1h7Nv7Uc3Jv3xR9BlEf2rgFElmUcJjKZw==", "dev": true, "requires": { "@rokucommunity/bslib": "^0.1.1", @@ -2832,9 +2837,9 @@ "cross-platform-clear-console": "^2.3.0", "debounce-promise": "^3.1.0", "eventemitter3": "^4.0.0", + "fast-glob": "^3.2.11", "file-url": "^3.0.0", - "fs-extra": "^7.0.1", - "glob": "^7.1.6", + "fs-extra": "^8.0.0", "jsonc-parser": "^2.3.0", "long": "^3.2.0", "luxon": "^1.8.3", @@ -2842,7 +2847,8 @@ "moment": "^2.23.0", "p-settle": "^2.1.0", "parse-ms": "^2.1.0", - "roku-deploy": "^3.5.3", + "require-relative": "^0.8.7", + "roku-deploy": "^3.9.2", "serialize-error": "^7.0.1", "source-map": "^0.7.3", "vscode-languageserver": "7.0.0", @@ -2888,6 +2894,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -3056,6 +3073,12 @@ "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", "dev": true }, + "dayjs": { + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz", + "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==", + "dev": true + }, "debounce-promise": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz", @@ -3152,9 +3175,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -3413,9 +3436,9 @@ "dev": true }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -3743,16 +3766,6 @@ "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", "dev": true }, - "path": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", - "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", - "dev": true, - "requires": { - "process": "^0.11.1", - "util": "^0.10.3" - } - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3783,12 +3796,6 @@ "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3889,6 +3896,12 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "require-relative": { + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", + "integrity": "sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==", + "dev": true + }, "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -3905,22 +3918,24 @@ } }, "roku-deploy": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.5.3.tgz", - "integrity": "sha512-a9J6aI2ASCYkDS7FrKSRre532nIXTdhJIOAxHqlWUC692OHlUpMDmQXBPujWX7geNQSG9Y/uJkHNbE+dJVAqgw==", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.9.2.tgz", + "integrity": "sha512-2LZyR4EhaFrka1gVmcuJO/f42tqz4clGImboVLCNem1q/PcFV5cnXNZRfqDI+MZ/n8eJto71JlZkcc7TDLt/EQ==", "dev": true, "requires": { "chalk": "^2.4.2", "dateformat": "^3.0.3", + "dayjs": "^1.11.0", + "fast-glob": "^3.2.11", "fs-extra": "^7.0.1", - "glob": "^7.1.6", + "is-glob": "^4.0.3", "jsonc-parser": "^2.3.0", "jszip": "^3.6.0", - "minimatch": "^3.0.4", "moment": "^2.29.1", "parse-ms": "^2.1.0", - "path": "^0.12.7", + "picomatch": "^2.2.1", "request": "^2.88.0", + "temp-dir": "^2.0.0", "xml2js": "^0.4.23" } }, @@ -4097,6 +4112,12 @@ "has-flag": "^3.0.0" } }, + "temp-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", + "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", + "dev": true + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -4152,23 +4173,6 @@ "punycode": "^2.1.0" } }, - "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, - "requires": { - "inherits": "2.0.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - } - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 960aade5..c24e0458 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ ], "devDependencies": { "@rokucommunity/bslint": "^0.5.0", - "brighterscript": "^0.45.2", + "brighterscript": "^0.60.5", "ropm": "^0.5.0" }, "repository": {