diff --git a/.github/workflows/build-tools-build.yaml b/.github/workflows/build-tools-build.yaml index 7f5fa046..de456bf1 100644 --- a/.github/workflows/build-tools-build.yaml +++ b/.github/workflows/build-tools-build.yaml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 15.x, 16.x] + node-version: [12.x, 14.x, 15.x, 16.x, 18.x] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-tools-publish.yaml b/.github/workflows/build-tools-publish.yaml index a89965aa..5ee94537 100644 --- a/.github/workflows/build-tools-publish.yaml +++ b/.github/workflows/build-tools-publish.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: '14.x' + node-version: '16.x' registry-url: 'https://registry.npmjs.org' - run: npm install working-directory: packages/yoteams-build-core diff --git a/.github/workflows/deploy-tools-build.yaml b/.github/workflows/deploy-tools-build.yaml index f1d3410b..85577fca 100644 --- a/.github/workflows/deploy-tools-build.yaml +++ b/.github/workflows/deploy-tools-build.yaml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 15.x, 16.x] + node-version: [12.x, 14.x, 15.x, 16.x, 18.x] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/deploy-tools-publish.yaml b/.github/workflows/deploy-tools-publish.yaml index 439df971..1a3c2ace 100644 --- a/.github/workflows/deploy-tools-publish.yaml +++ b/.github/workflows/deploy-tools-publish.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: '14.x' + node-version: '16.x' registry-url: 'https://registry.npmjs.org' - run: npm install working-directory: packages/yoteams-deploy diff --git a/.github/workflows/generator-build.yaml b/.github/workflows/generator-build.yaml index d07f4943..6cb38dbc 100644 --- a/.github/workflows/generator-build.yaml +++ b/.github/workflows/generator-build.yaml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 15.x, 16.x] + node-version: [12.x, 14.x, 15.x, 16.x, 18.x] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/generator-integration-test.yaml b/.github/workflows/generator-integration-test.yaml index 97bb9a76..44b943c0 100644 --- a/.github/workflows/generator-integration-test.yaml +++ b/.github/workflows/generator-integration-test.yaml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 600 strategy: matrix: - node-version: [12.x, 14.x, 15.x, 16.x] + node-version: [14.x, 15.x, 16.x, 18.x] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/generator-publish.yaml b/.github/workflows/generator-publish.yaml index c09c95d3..f879e7f8 100644 --- a/.github/workflows/generator-publish.yaml +++ b/.github/workflows/generator-publish.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: '14.x' + node-version: '16.x' registry-url: 'https://registry.npmjs.org' - run: npm install working-directory: packages/generator-teams diff --git a/packages/generator-teams/src/app/GeneratorTeamsApp.ts b/packages/generator-teams/src/app/GeneratorTeamsApp.ts index 4a7b879c..4e1b79d2 100644 --- a/packages/generator-teams/src/app/GeneratorTeamsApp.ts +++ b/packages/generator-teams/src/app/GeneratorTeamsApp.ts @@ -622,7 +622,7 @@ export class GeneratorTeamsApp extends Generator { // if we have added any react based components if (this.options.reactComponents) { Yotilities.addAdditionalDeps([ - ["msteams-react-base-component", "^4.0.0-preview5"] + ["msteams-react-base-component", "^4.0.0-preview.6"] ], this.fs); } diff --git a/packages/generator-teams/src/app/templates/package.json b/packages/generator-teams/src/app/templates/package.json index 9b2fa9f4..790079f1 100644 --- a/packages/generator-teams/src/app/templates/package.json +++ b/packages/generator-teams/src/app/templates/package.json @@ -42,8 +42,8 @@ "vinyl": "2.2.1", "webpack": "~5.72.0", "yargs": "^17.4.1", - "yoteams-build-core": "^1.7.0-preview.1", - "yoteams-deploy": "^1.2.0-preview.1", + "yoteams-build-core": "^1.7.0-preview.2", + "yoteams-deploy": "^1.2.0-preview.2", "webpack-node-externals": "^3.0.0" }, "browserslist": [ diff --git a/packages/yoteams-build-core/package-lock.json b/packages/yoteams-build-core/package-lock.json index 0ede2088..fc0d0899 100644 --- a/packages/yoteams-build-core/package-lock.json +++ b/packages/yoteams-build-core/package-lock.json @@ -9,10 +9,10 @@ "version": "1.7.0-preview.1", "license": "MIT", "dependencies": { - "applicationinsights": "^2.1.8", + "applicationinsights": "^2.3.1", "autoprefixer": "^10.2.6", "axios": "^0.27.2", - "chalk": "^5.0.1", + "chalk": "^4.1.2", "del": "^6.0.0", "dotenv": "^16.0.0", "fancy-log": "^2.0.0", @@ -1993,21 +1993,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/boxen/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2279,11 +2264,15 @@ ] }, "node_modules/chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" @@ -3695,22 +3684,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/eslint/node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -11069,21 +11042,6 @@ "url": "https://github.com/yeoman/update-notifier?sponsor=1" } }, - "node_modules/update-notifier/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -13330,17 +13288,6 @@ "type-fest": "^0.20.2", "widest-line": "^3.1.0", "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } } }, "brace-expansion": { @@ -13535,9 +13482,13 @@ "integrity": "sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==" }, "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } }, "chokidar": { "version": "3.5.3", @@ -14376,16 +14327,6 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -20256,17 +20197,6 @@ "semver": "^7.3.4", "semver-diff": "^3.1.1", "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } } }, "uri-js": { diff --git a/packages/yoteams-build-core/package.json b/packages/yoteams-build-core/package.json index 54f724b8..975ecf72 100644 --- a/packages/yoteams-build-core/package.json +++ b/packages/yoteams-build-core/package.json @@ -1,6 +1,6 @@ { "name": "yoteams-build-core", - "version": "1.7.0-preview.1", + "version": "1.7.0-preview.2", "description": "Core build Gulp tasks for Yo Teams, Microsoft Teams Apps Generator (https://aka.ms/yoteams)", "main": "dist/index.js", "scripts": { @@ -30,7 +30,7 @@ "applicationinsights": "^2.3.1", "autoprefixer": "^10.2.6", "axios": "^0.27.2", - "chalk": "^5.0.1", + "chalk": "^4.1.2", "del": "^6.0.0", "dotenv": "^16.0.0", "fancy-log": "^2.0.0", diff --git a/packages/yoteams-deploy/package-lock.json b/packages/yoteams-deploy/package-lock.json index 96aa12cd..aa63772b 100644 --- a/packages/yoteams-deploy/package-lock.json +++ b/packages/yoteams-deploy/package-lock.json @@ -1,17 +1,17 @@ { "name": "yoteams-deploy", - "version": "1.2.0-preview.1", + "version": "1.2.0-preview.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "yoteams-deploy", - "version": "1.2.0-preview.1", + "version": "1.2.0-preview.2", "license": "MIT", "dependencies": { "@pnp/cli-microsoft365": "^5.2.0", - "applicationinsights": "^2.1.8", - "chalk": "^5.0.1", + "applicationinsights": "^2.3.1", + "chalk": "^4.1.2", "fancy-log": "^2.0.0", "fs-extra": "^10.0.0", "gulp": "^4.0.2", @@ -7053,11 +7053,15 @@ } }, "node_modules/chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/chalk/chalk?sponsor=1" @@ -8127,22 +8131,6 @@ "node": ">=10" } }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/eslint/node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -9586,7 +9574,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -12267,7 +12254,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -18300,9 +18286,13 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } }, "chokidar": { "version": "3.5.3", @@ -18875,16 +18865,6 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -20293,8 +20273,7 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-property-descriptors": { "version": "1.0.0", @@ -22324,7 +22303,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } diff --git a/packages/yoteams-deploy/package.json b/packages/yoteams-deploy/package.json index 2e668279..21c55344 100644 --- a/packages/yoteams-deploy/package.json +++ b/packages/yoteams-deploy/package.json @@ -1,6 +1,6 @@ { "name": "yoteams-deploy", - "version": "1.2.0-preview.1", + "version": "1.2.0-preview.2", "description": "Deployment Gulp tasks for Yo Teams, Microsoft Teams Apps Generator (https://aka.ms/yoteams)", "main": "dist/index.js", "scripts": { @@ -29,7 +29,7 @@ "dependencies": { "@pnp/cli-microsoft365": "^5.2.0", "applicationinsights": "^2.3.1", - "chalk": "^5.0.1", + "chalk": "^4.1.2", "fancy-log": "^2.0.0", "fs-extra": "^10.0.0", "gulp": "^4.0.2",