diff --git a/package-lock.json b/package-lock.json index 892bdb27a1be39ead78dd4657e039c0d059ff7eb..802230e1e189afe39ba704135ee1dfd5d7b2190c 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 3bae1edc9e9e157f8e1e99e986ccc8a2ea285109..b02d97ebc03da4fe92d176b916d780811937c99c 100644 --- a/package.json +++ b/package.json @@ -83,68 +83,65 @@ ], "license": "MIT", "devDependencies": { - "@graphql-codegen/add": "^1.13.3", - "@graphql-codegen/cli": "^1.13.3", - "@graphql-codegen/time": "^1.13.3", - "@graphql-codegen/typescript": "^1.13.3", - "@graphql-codegen/typescript-graphql-files-modules": "^1.13.3", - "@graphql-codegen/typescript-graphql-request": "^1.13.3", - "@graphql-codegen/typescript-operations": "^1.13.3", + "@graphql-codegen/add": "^1.13.5", + "@graphql-codegen/cli": "^1.13.5", + "@graphql-codegen/time": "^1.13.5", + "@graphql-codegen/typescript": "^1.13.5", + "@graphql-codegen/typescript-graphql-files-modules": "^1.13.5", + "@graphql-codegen/typescript-graphql-request": "^1.13.5", + "@graphql-codegen/typescript-operations": "^1.13.5", "@types/cors": "^2.8.6", - "@typescript-eslint/eslint-plugin": "^2.29.0", - "@typescript-eslint/parser": "^2.29.0", + "@typescript-eslint/eslint-plugin": "^2.32.0", + "@typescript-eslint/parser": "^2.32.0", "benchmark": "^2.1.4", - "circular-dependency-plugin": "^5.2.0", - "concurrently": "^5.1.0", + "concurrently": "^5.2.0", "cpx2": "^2.0.0", "css-loader": "^3.5.3", - "eslint": "^6.8.0", + "eslint": "^7.0.0", "extra-watch-webpack-plugin": "^1.0.3", "file-loader": "^6.0.0", "fs-extra": "^9.0.0", "graphql": "^15.0.0", - "http-server": "^0.12.1", - "jest": "^25.4.0", - "jest-raw-loader": "^1.0.1", + "http-server": "^0.12.3", + "jest": "^26.0.1", "mini-css-extract-plugin": "^0.9.0", - "node-sass": "^4.14.0", + "node-sass": "^4.14.1", "raw-loader": "^4.0.1", - "resolve-url-loader": "^3.1.1", "sass-loader": "^8.0.2", - "simple-git": "^1.132.0", - "style-loader": "^1.2.0", - "ts-jest": "^25.4.0", + "simple-git": "^2.4.0", + "style-loader": "^1.2.1", + "ts-jest": "^25.5.1", "typescript": "^3.8.3", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", "webpack-version-file-plugin": "^0.4.0" }, "dependencies": { - "@material-ui/core": "^4.9.11", + "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.9.1", "@types/argparse": "^1.0.38", "@types/benchmark": "^1.0.31", "@types/compression": "1.7.0", "@types/express": "^4.17.6", "@types/jest": "^25.2.1", - "@types/node": "^13.13.2", + "@types/node": "^13.13.5", "@types/node-fetch": "^2.5.7", - "@types/react": "^16.9.34", - "@types/react-dom": "^16.9.6", + "@types/react": "^16.9.35", + "@types/react-dom": "^16.9.8", "@types/swagger-ui-dist": "3.0.5", "argparse": "^1.0.10", "body-parser": "^1.19.0", "compression": "^1.7.4", "cors": "^2.8.5", "express": "^4.17.1", - "immer": "^6.0.3", + "immer": "^6.0.5", "immutable": "^3.8.2", "node-fetch": "^2.6.0", "react": "^16.13.1", "react-dom": "^16.13.1", "rxjs": "^6.5.5", - "swagger-ui-dist": "^3.25.0", - "tslib": "^1.11.1", + "swagger-ui-dist": "^3.25.2", + "tslib": "^1.11.2", "util.promisify": "^1.0.1", "xhr2": "^0.2.0" } diff --git a/src/mol-plugin-ui/skin/base/base.scss b/src/mol-plugin-ui/skin/base/base.scss index 9d76a99e3fa1fdf8c05989343214958632d0a4bf..af5fc9c766568ab07dfb6220b72022395b2eb283 100644 --- a/src/mol-plugin-ui/skin/base/base.scss +++ b/src/mol-plugin-ui/skin/base/base.scss @@ -1,5 +1,4 @@ -// @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700); - + @mixin user-select($select) { -webkit-user-select: $select; -moz-user-select: $select; diff --git a/webpack.config.common.js b/webpack.config.common.js index b97efd4fa7d8ff61fe5599214e3da3dc22b28c47..a2e035daec4c7407859a9b972a2958c18e870bd4 100644 --- a/webpack.config.common.js +++ b/webpack.config.common.js @@ -3,7 +3,6 @@ const webpack = require('webpack'); const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const VersionFile = require('webpack-version-file-plugin'); -// const CircularDependencyPlugin = require('circular-dependency-plugin'); const sharedConfig = { module: { @@ -20,18 +19,12 @@ const sharedConfig = { use: [ MiniCssExtractPlugin.loader, { loader: 'css-loader', options: { sourceMap: false } }, - { loader: 'resolve-url-loader', options: { sourceMap: false } }, { loader: 'sass-loader', options: { sourceMap: false } }, ] } ] }, plugins: [ - // new CircularDependencyPlugin({ - // include: [ path.resolve(__dirname, 'lib/') ], - // failOnError: false, - // cwd: process.cwd(), - // }), new ExtraWatchWebpackPlugin({ files: [ './lib/**/*.scss', @@ -39,8 +32,6 @@ const sharedConfig = { ], }), new webpack.DefinePlugin({ - // __VERSION__: webpack.DefinePlugin.runtimeValue(() => JSON.stringify(require('./package.json').version), true), - // __VERSION_TIMESTAMP__: webpack.DefinePlugin.runtimeValue(() => `${new Date().valueOf()}`, true), 'process.env.DEBUG': JSON.stringify(process.env.DEBUG) }), new MiniCssExtractPlugin({ filename: 'molstar.css', }),