Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade dependencies, delete labs package #3679

Merged
merged 12 commits into from
Jul 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ aliases:

- &restore-node-modules-cache
name: Restore node_modules cache
key: v1-yarn-deps-{{ checksum "yarn.lock" }}
key: v2-yarn-deps-{{ checksum "yarn.lock" }}

- &restore-yarn-cache
name: Restore yarnpkg cache
key: v1-yarn-cache
key: v2-yarn-cache

- &save-node-modules-cache
name: Save node_modules cache
paths:
- node_modules
key: v1-yarn-deps-{{ checksum "yarn.lock" }}
key: v2-yarn-deps-{{ checksum "yarn.lock" }}

- &save-yarn-cache
name: Save yarnpkg cache
paths:
- ~/.cache/yarn
key: v1-yarn-cache
key: v2-yarn-cache

references:
reports_path: &reports_path
Expand Down Expand Up @@ -88,8 +88,7 @@ jobs:
- checkout
- restore_cache: *restore-node-modules-cache
- attach_workspace: { at: '.' }
- run: yarn dist:libs
- run: yarn dist:apps
- run: yarn dist
- persist_to_workspace:
root: '.'
paths: [packages/*/lib, packages/*/dist]
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ These are the component libraries we publish to NPM.
- [![npm](https://img.shields.io/npm/v/@blueprintjs/select.svg?label=@blueprintjs/select)](https://www.npmjs.com/package/@blueprintjs/select) – Components for selecting items from a list.
- [![npm](https://img.shields.io/npm/v/@blueprintjs/table.svg?label=@blueprintjs/table)](https://www.npmjs.com/package/@blueprintjs/table) – Scalable interactive table component.
- [![npm](https://img.shields.io/npm/v/@blueprintjs/timezone.svg?label=@blueprintjs/timezone)](https://www.npmjs.com/package/@blueprintjs/timezone) – Components for picking timezones.
- [![npm](https://img.shields.io/npm/v/@blueprintjs/labs.svg?label=@blueprintjs/labs)](https://www.npmjs.com/package/@blueprintjs/labs) – Incubator and staging area for new components still under initial development.

### Applications

Expand Down
26 changes: 11 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
"dev:core": "lerna run dev --parallel --scope \"@blueprintjs/{core,icons,docs-app}\"",
"dev:docs": "lerna run dev --parallel --scope \"@blueprintjs/{core,docs-app,docs-theme}\"",
"dev:datetime": "lerna run dev --parallel --scope \"@blueprintjs/{core,datetime,timezone,docs-app}\"",
"dev:labs": "lerna run dev --parallel --scope \"@blueprintjs/{core,labs,select,docs-app}\"",
"dev:landing": "lerna run dev --parallel --scope \"@blueprintjs/{core,landing-app}\"",
"dev:select": "lerna run dev --parallel --scope \"@blueprintjs/{core,select,docs-app}\"",
"dev:table": "lerna run dev --parallel --scope \"@blueprintjs/table-dev-app\"",
"dist": "run-s dist:libs dist:apps",
"dist:libs": "lerna run dist --parallel --scope \"@blueprintjs/{core,datetime,docs-theme,icons,labs,select,table,timezone}\"",
"dist:libs": "lerna run dist --parallel --scope \"@blueprintjs/{core,datetime,docs-theme,icons,select,table,timezone}\"",
"dist:apps": "lerna run dist --parallel --scope \"@blueprintjs/{docs-app,landing-app,table-dev-app}\"",
"docs-data": "lerna run compile --scope \"@blueprintjs/docs-data\"",
"lint": "lerna run --parallel lint",
Expand All @@ -36,33 +35,30 @@
"dependencies": {
"@types/chai": "4.1.7",
"@types/classnames": "2.2.9",
"@types/enzyme": "3.10.2",
"@types/enzyme": "3.10.3",
"@types/enzyme-adapter-react-16": "1.0.5",
"@types/mocha": "5.2.7",
"@types/prop-types": "15.7.1",
"@types/react": "16.4.18",
"@types/react-dom": "16.0.11",
"@types/react-transition-group": "2.0.14",
"@types/react": "16.8.23",
"@types/react-dom": "16.8.5",
"@types/react-transition-group": "4.2.0",
"@types/sinon": "7.0.13",
"@types/webpack": "4.4.34",
"@types/webpack": "4.32.1",
"chai": "^4.2.0",
"circle-github-bot": "^2.0.1",
"cross-env": "^5.2.0",
"gh-pages": "^2.0.1",
"http-server": "^0.11.1",
"lerna": "^2.11.0",
"npm-run-all": "^4.1.3",
"sinon": "^7.2.4",
"stylelint-config-palantir": "^3.1.1",
"stylelint-scss": "^3.8.0",
"npm-run-all": "^4.1.5",
"sinon": "^7.3.2",
"stylelint-config-palantir": "^4.0.0",
"stylelint-scss": "^3.9.2",
"typescript": "~3.5.3",
"yarn-deduplicate": "^1.1.1"
},
"resolutions": {
"@types/enzyme": "3.1.15",
"@types/react": "16.4.18",
"js-yaml": "3.13.1",
"node-gyp": "3.8.0"
"js-yaml": "3.13.1"
},
"engines": {
"node": ">=6.1"
Expand Down
28 changes: 14 additions & 14 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
"@blueprintjs/icons": "^3.8.0",
"@types/dom4": "^2.0.1",
"classnames": "^2.2",
"dom4": "^2.0.1",
"normalize.css": "^8.0.0",
"popper.js": "^1.14.1",
"react-popper": "^1.0.0",
"react-transition-group": "^2.2.1",
"resize-observer-polyfill": "^1.5.0",
"dom4": "^2.1.5",
"normalize.css": "^8.0.1",
"popper.js": "^1.15.0",
"react-popper": "^1.3.3",
"react-transition-group": "^2.9.0",
"resize-observer-polyfill": "^1.5.1",
"tslib": "~1.9.0"
},
"peerDependencies": {
Expand All @@ -59,16 +59,16 @@
"@blueprintjs/karma-build-scripts": "^0.11.0",
"@blueprintjs/node-build-scripts": "^0.10.0",
"@blueprintjs/test-commons": "^0.9.0",
"enzyme": "^3.9.0",
"karma": "^4.1.0",
"mocha": "^5.2.0",
"npm-run-all": "^4.1.2",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"enzyme": "^3.10.0",
"karma": "^4.2.0",
"mocha": "^6.2.0",
"npm-run-all": "^4.1.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "^16.8.6",
"sass-inline-svg": "^1.2.0",
"typescript": "~3.5.3",
"webpack-cli": "^3.1.2"
"webpack-cli": "^3.3.6"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/toast/toasterTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ describe("Toaster", () => {
setTimeout(() => {
assert.equal(testsContainerElement.querySelector(`.${Classes.TOAST}`), document.activeElement);
done();
}, 10);
}, 100);
});
});

Expand Down
16 changes: 8 additions & 8 deletions packages/datetime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
"@blueprintjs/karma-build-scripts": "^0.11.0",
"@blueprintjs/node-build-scripts": "^0.10.0",
"@blueprintjs/test-commons": "^0.9.0",
"enzyme": "^3.9.0",
"karma": "^4.1.0",
"mocha": "^5.2.0",
"npm-run-all": "^4.1.2",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"enzyme": "^3.10.0",
"karma": "^4.2.0",
"mocha": "^6.2.0",
"npm-run-all": "^4.1.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "^16.8.6",
"typescript": "~3.5.3",
"webpack-cli": "^3.1.2"
"webpack-cli": "^3.3.6"
},
"repository": {
"type": "git",
Expand Down
37 changes: 18 additions & 19 deletions packages/docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,35 @@
"verify": "run-p dist lint"
},
"dependencies": {
"@blueprintjs/core": "^3.17.0",
"@blueprintjs/datetime": "^3.10.1",
"@blueprintjs/core": "^3.17.1",
"@blueprintjs/datetime": "^3.11.0",
"@blueprintjs/docs-data": "^3.0.0",
"@blueprintjs/docs-theme": "^3.2.0",
"@blueprintjs/icons": "^3.8.0",
"@blueprintjs/labs": "^0.16.2",
"@blueprintjs/icons": "^3.9.1",
"@blueprintjs/select": "^3.9.0",
"@blueprintjs/table": "^3.6.0",
"@blueprintjs/test-commons": "^0.9.0",
"@blueprintjs/timezone": "^3.4.0",
"@types/downloadjs": "^1.4.0",
"chroma-js": "^1.3.4",
"classnames": "^2.2.5",
"dom4": "^2.0.1",
"@types/downloadjs": "^1.4.1",
"chroma-js": "^2.0.4",
"classnames": "^2.2.6",
"dom4": "^2.1.5",
"downloadjs": "^1.4.7",
"moment": "^2.18.1",
"normalize.css": "^8.0.0",
"popper.js": "^1.14.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-transition-group": "^2.2.1",
"tslib": "~1.9.0"
"moment": "^2.24.0",
"normalize.css": "^8.0.1",
"popper.js": "^1.15.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-transition-group": "^4.2.1",
"tslib": "~1.10.0"
},
"devDependencies": {
"@blueprintjs/node-build-scripts": "^0.10.0",
"@blueprintjs/webpack-build-scripts": "^0.8.0",
"@types/chroma-js": "^1.3.3",
"npm-run-all": "^4.1.2",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.0"
"@types/chroma-js": "^1.4.1",
"npm-run-all": "^4.1.5",
"webpack-cli": "^3.3.6",
"webpack-dev-server": "^3.7.2"
},
"repository": {
"type": "git",
Expand Down
1 change: 0 additions & 1 deletion packages/docs-app/src/_nav.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ This file enumerates the exact order of root pages in the left sidebar.
@page select
@page table
@page timezone
@page labs
@page resources
10 changes: 0 additions & 10 deletions packages/docs-app/src/components/navIcons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ const ICON_CONTENTS: Record<string, JSX.Element> = {
</g>
),

labs: (
<g fillRule="evenodd">
<path
d="M10 9V7h-.5a.5.5 0 0 1 0-1h5a.5.5 0 0 1 0 1H14v2l3.927 5.89A2 2 0 0 1 16.263 18H7.737a2 2 0 0 1-1.664-3.11L10 9z"
opacity={OPACITY}
/>
<path d="M17.281 13.917l.649.974A2 2 0 0 1 16.266 18H7.74a2 2 0 0 1-1.664-3.11l2.25-3.375c1.363-.21 2.755.165 4.177 1.124 1.255.847 2.848 1.273 4.778 1.278z" />
</g>
),

resources: (
<g fillRule="evenodd">
<path d="M5 11l7 7 7-7H5z" />
Expand Down
1 change: 0 additions & 1 deletion packages/docs-app/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Licensed under the Apache License, Version 2.0.
@import "~@blueprintjs/core/lib/css/blueprint.css";
@import "~@blueprintjs/datetime/lib/css/blueprint-datetime.css";
@import "~@blueprintjs/icons/lib/css/blueprint-icons.css";
@import "~@blueprintjs/labs/lib/css/blueprint-labs.css";
@import "~@blueprintjs/select/lib/css/blueprint-select.css";
@import "~@blueprintjs/table/lib/css/table.css";
@import "~@blueprintjs/timezone/lib/css/blueprint-timezone.css";
Expand Down
2 changes: 0 additions & 2 deletions packages/docs-app/src/styles/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ $package-colors: (
"select": ($cobalt3, $cobalt2),
"table": ($forest3, $forest2),
"timezone": ($vermilion4, $vermilion3),
"labs": ($indigo3, $indigo2),
"resources": ($orange3, $orange2),
);

Expand All @@ -23,7 +22,6 @@ $dark-package-colors: (
"select": ($cobalt4, $cobalt5),
"table": ($forest4, $forest5),
"timezone": ($vermilion5, $vermilion5),
"labs": ($indigo4, $indigo5),
"resources": ($orange5, $orange5),
);

Expand Down
12 changes: 6 additions & 6 deletions packages/docs-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"test": "exit 0"
},
"dependencies": {
"@blueprintjs/core": "^3.15.0",
"@blueprintjs/docs-theme": "^3.1.0",
"@blueprintjs/core": "^3.17.1",
"@blueprintjs/docs-theme": "^3.2.0",
"@documentalist/compiler": "^2.2.0",
"better-handlebars": "github:wmeldon/better-handlebars",
"glob": "^7.1.3",
"highlights": "^3.1.1",
"glob": "^7.1.4",
"highlights": "^3.1.4",
"language-less": "github:atom/language-less",
"marked": "^0.7.0",
"semver": "^6.0.0",
"tree-sitter-typescript": "^0.13.6"
"semver": "^6.3.0",
"tree-sitter-typescript": "^0.15.1"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/docs-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"@blueprintjs/node-build-scripts": "^0.10.0",
"@types/fuzzaldrin-plus": "^0.6.0",
"npm-run-all": "^4.1.5",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"typescript": "~3.5.3",
"webpack-cli": "^3.3.0"
"webpack-cli": "^3.3.6"
},
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class TypeAliasTable extends React.PureComponent<ITypeAliasTableProps> {
const { data } = this.props;
const { renderBlock, renderType } = this.context;
const aliases = data.type.split(" | ").map((type, i) => (
<div>
<div key={i}>
{i === 0 ? "=" : "|"} {renderType(type)}
</div>
));
Expand Down
14 changes: 7 additions & 7 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"devDependencies": {
"@blueprintjs/node-build-scripts": "^0.10.0",
"@blueprintjs/test-commons": "^0.9.0",
"enzyme": "^3.9.0",
"mocha": "^5.2.0",
"npm-run-all": "^4.1.2",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"enzyme": "^3.10.0",
"mocha": "^6.2.0",
"npm-run-all": "^4.1.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "^16.8.6",
"typescript": "~3.5.3",
"webpack-cli": "^3.1.2"
"webpack-cli": "^3.3.6"
},
"repository": {
"type": "git",
Expand Down
5 changes: 5 additions & 0 deletions packages/icons/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@ module.exports = Object.assign({}, baseConfig, {
libraryTarget: "umd",
path: path.resolve(__dirname, "./dist")
},

performance: {
maxAssetSize: 500000,
maxEntrypointSize: 500000,
},
});
6 changes: 3 additions & 3 deletions packages/karma-build-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dependencies": {
"@blueprintjs/webpack-build-scripts": "^0.8.0",
"istanbul-instrumenter-loader": "^3.0.1",
"karma": "^4.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma": "^4.2.0",
"karma-chrome-launcher": "^3.0.0",
"karma-coverage": "^1.1.2",
"karma-firefox-launcher": "^1.1.0",
"karma-junit-reporter": "^1.2.0",
Expand All @@ -18,7 +18,7 @@
"karma-remap-coverage": "^0.1.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^4.0.2",
"mocha": "^5.2.0"
"mocha": "^6.2.0"
},
"repository": {
"type": "git",
Expand Down
5 changes: 0 additions & 5 deletions packages/labs/.npmignore

This file was deleted.

Loading