From 787e7a6fee0f710f6b372eafe8fa684bef31ae2b Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 3 Oct 2023 12:15:11 -0400 Subject: [PATCH] stop using allowBrighterScriptInBrightScript brighterscript option --- bsconfig-prod.json | 65 ++++++++++++++++------------------- bsconfig-tests.json | 84 ++++++++++++++++++++------------------------- bsconfig.json | 45 ++++++++++-------------- 3 files changed, 85 insertions(+), 109 deletions(-) diff --git a/bsconfig-prod.json b/bsconfig-prod.json index 60beb933..7720b616 100644 --- a/bsconfig-prod.json +++ b/bsconfig-prod.json @@ -1,37 +1,30 @@ { - "files": [ - "manifest", - "source/**/*.*", - "components/**/*.*", - "images/**/*.*", - "locale/en_US/translations.ts", - "locale/en_GB/translations.ts", - "locale/fr_CA/translations.ts", - "locale/es_ES/translations.ts", - "locale/de_DE/translations.ts", - "locale/it_IT/translations.ts", - "locale/pt_BR/translations.ts", - "settings/**/*.*", - { - "src": "resources/branding/release/*.*", - "dest": "images" - } - ], - "plugins": [ - "@rokucommunity/bslint", - "roku-log-bsc-plugin" - ], - "rokuLog": { - "strip": true, - "insertPkgPath": false, - "removeComments": true - }, - "diagnosticFilters": [ - "node_modules/**/*", - "**/roku_modules/**/*" - ], - "allowBrighterScriptInBrightScript": true, - "autoImportComponentScript": true, - "stagingDir": "build/staging", - "retainStagingDir": true -} \ No newline at end of file + "files": [ + "manifest", + "source/**/*.*", + "components/**/*.*", + "images/**/*.*", + "locale/en_US/translations.ts", + "locale/en_GB/translations.ts", + "locale/fr_CA/translations.ts", + "locale/es_ES/translations.ts", + "locale/de_DE/translations.ts", + "locale/it_IT/translations.ts", + "locale/pt_BR/translations.ts", + "settings/**/*.*", + { + "src": "resources/branding/release/*.*", + "dest": "images" + } + ], + "plugins": ["@rokucommunity/bslint", "roku-log-bsc-plugin"], + "rokuLog": { + "strip": true, + "insertPkgPath": false, + "removeComments": true + }, + "diagnosticFilters": ["node_modules/**/*", "**/roku_modules/**/*"], + "autoImportComponentScript": true, + "stagingDir": "build/staging", + "retainStagingDir": true +} diff --git a/bsconfig-tests.json b/bsconfig-tests.json index 21247d4a..c621c68a 100644 --- a/bsconfig-tests.json +++ b/bsconfig-tests.json @@ -1,49 +1,39 @@ { - "files": [ - { - "src": "test-app/**/*" - }, - { - "src": "source/**/!(Main.brs)", - "dest": "source" - }, - { - "src": "components/**/*", - "dest": "components" - }, - { - "src": "locale/**/*", - "dest": "locale" - }, - { - "src": "settings/**/*", - "dest": "settings" - } - ], - "diagnosticFilters": [ - "node_modules/**/*", - "**/roku_modules/**/*" - ], - "autoImportComponentScript": true, - "allowBrighterScriptInBrightScript": true, - "createPackage": false, - "stagingFolderPath": "build", - "plugins": [ - "rooibos-roku" - ], - "rooibos": { - "isRecordingCodeCoverage": false, - "testsFilePattern": null, - "tags": [ - "!integration", - "!deprecated", - "!fixme" - ], - "showOnlyFailures": true, - "catchCrashes": true, - "lineWidth": 70, - "failFast": false, - "sendHomeOnFinish": false + "files": [ + { + "src": "test-app/**/*" }, - "sourceMap": true -} \ No newline at end of file + { + "src": "source/**/!(Main.brs)", + "dest": "source" + }, + { + "src": "components/**/*", + "dest": "components" + }, + { + "src": "locale/**/*", + "dest": "locale" + }, + { + "src": "settings/**/*", + "dest": "settings" + } + ], + "diagnosticFilters": ["node_modules/**/*", "**/roku_modules/**/*"], + "autoImportComponentScript": true, + "createPackage": false, + "stagingFolderPath": "build", + "plugins": ["rooibos-roku"], + "rooibos": { + "isRecordingCodeCoverage": false, + "testsFilePattern": null, + "tags": ["!integration", "!deprecated", "!fixme"], + "showOnlyFailures": true, + "catchCrashes": true, + "lineWidth": 70, + "failFast": false, + "sendHomeOnFinish": false + }, + "sourceMap": true +} diff --git a/bsconfig.json b/bsconfig.json index 907df1a7..c92bda3a 100644 --- a/bsconfig.json +++ b/bsconfig.json @@ -1,27 +1,20 @@ { - "files": [ - "manifest", - "source/**/*.*", - "components/**/*.*", - "images/**/*.*", - "resources/**/*.*", - "locale/**/*.*", - "settings/*.*" - ], - "plugins": [ - "@rokucommunity/bslint", - "roku-log-bsc-plugin" - ], - "rokuLog": { - "insertPkgPath": true - }, - "diagnosticFilters": [ - "node_modules/**/*", - "**/roku_modules/**/*" - ], - "sourceMap": true, - "autoImportComponentScript": true, - "allowBrighterScriptInBrightScript": true, - "stagingDir": "build/staging", - "retainStagingDir": true -} \ No newline at end of file + "files": [ + "manifest", + "source/**/*.*", + "components/**/*.*", + "images/**/*.*", + "resources/**/*.*", + "locale/**/*.*", + "settings/*.*" + ], + "plugins": ["@rokucommunity/bslint", "roku-log-bsc-plugin"], + "rokuLog": { + "insertPkgPath": true + }, + "diagnosticFilters": ["node_modules/**/*", "**/roku_modules/**/*"], + "sourceMap": true, + "autoImportComponentScript": true, + "stagingDir": "build/staging", + "retainStagingDir": true +}