diff --git a/circle.yml b/circle.yml index c275c0990f2e..40daecc2e589 100644 --- a/circle.yml +++ b/circle.yml @@ -31,6 +31,14 @@ mainBuildFilters: &mainBuildFilters - 10.0-release - unify-1449-check-path-length-in-build +# uncomment & add to the branch conditions below to disable the main linux +# flow if we don't want to test it for a certain branch +linuxWorkflowExcludeFilters: &linux-workflow-exclude-filters + unless: + or: + - false + # - equal: [ 'tgriesser/chore/fix-windows-build', << pipeline.git.branch >> ] + # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing # so just add your branch to the list here to build and test on Mac @@ -49,7 +57,7 @@ windowsWorkflowFilters: &windows-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] - equal: [ '10.0-release', << pipeline.git.branch >> ] - - equal: [ unify-1449-check-path-length-in-build, << pipeline.git.branch >> ] + - equal: [ 'tgriesser/chore/fix-windows-build', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -2535,6 +2543,7 @@ windows-workflow: &windows-workflow workflows: linux: <<: *linux-workflow + <<: *linux-workflow-exclude-filters mac: <<: *mac-workflow <<: *mac-workflow-filters diff --git a/cli/scripts/post-install.js b/cli/scripts/post-install.js index 16c5b75a348a..cd680de089df 100644 --- a/cli/scripts/post-install.js +++ b/cli/scripts/post-install.js @@ -25,6 +25,8 @@ fs.ensureDirSync(join(__dirname, '..', 'types')) includeTypes.forEach((folder) => { const source = resolvePkg(`@types/${folder}`, { cwd: __dirname }) + console.log(`copying ${folder} from ${source}`) + fs.copySync(source, join(__dirname, '..', 'types', folder)) }) diff --git a/npm/webpack-dev-server-fresh/package.json b/npm/webpack-dev-server-fresh/package.json index 5569c0da81fe..b71318c9cbb5 100644 --- a/npm/webpack-dev-server-fresh/package.json +++ b/npm/webpack-dev-server-fresh/package.json @@ -20,9 +20,8 @@ "dependencies": { "html-webpack-plugin-4": "npm:html-webpack-plugin@^4", "html-webpack-plugin-5": "npm:html-webpack-plugin@^5", - "rimraf": "3.0.2", "speed-measure-webpack-plugin": "1.4.2", - "tsutils": "^3.21.0", + "tslib": "^2.3.1", "webpack-dev-server": "^4.7.4", "webpack-merge": "^5.4.0" }, diff --git a/yarn.lock b/yarn.lock index 3f0eed5d31b7..972e274b44be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42009,7 +42009,7 @@ tslib@2.1.0, tslib@~2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== -tslib@2.3.1, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@~2.3.0: +tslib@2.3.1, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -42098,7 +42098,7 @@ tsutils@^2.29.0: dependencies: tslib "^1.8.1" -tsutils@^3.17.1, tsutils@^3.21.0: +tsutils@^3.17.1: version "3.21.0" resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==