Skip to content

Commit

Permalink
Upgrade styles config, remove unnesessary packages (#137)
Browse files Browse the repository at this point in the history
  • Loading branch information
talyguryn authored Feb 7, 2020
1 parent 47a3e61 commit 1e486e7
Show file tree
Hide file tree
Showing 10 changed files with 2,294 additions and 2,464 deletions.
8 changes: 4 additions & 4 deletions capella/.env.sample
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
### Project's token from Hawk
# Read more https://hawk.so/docs
HAWK_TOKEN = ""
HAWK_TOKEN=

### Cache server connection params
# If you ARE NOT using docker: CACHE_HOST = localhost
CACHE_HOST = memcached
CACHE_PORT = 11211
DISABLE_CACHE = False
CACHE_HOST=memcached
CACHE_PORT=11211
DISABLE_CACHE=True
16 changes: 0 additions & 16 deletions capella/.postcssrc

This file was deleted.

35 changes: 35 additions & 0 deletions capella/.postcssrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
plugins:
# Consumes files by @import rule
# https://github.com/postcss/postcss-import
postcss-import: {}

# Convert modern CSS into something most browsers can understand
# https://github.com/csstools/postcss-preset-env
postcss-preset-env:
# Polyfill CSS features
# https://github.com/csstools/postcss-preset-env#stage
#
# List of features with levels: https://cssdb.org/
stage: 0

# Define polyfills based on browsers you are supporting
# https://github.com/csstools/postcss-preset-env#browsers
browsers:
- 'last 2 versions'
- '> 1%'

# Instruct all plugins to omit pre-polyfilled CSS
# https://github.com/csstools/postcss-preset-env#preserve
preserve: false

# Nested rules unwrapper
# https://github.com/postcss/postcss-nested
#
# As you know 'postcss-preset-env' plugin has an ability to process
# 'postcss-nesting' feature but it does not work with BEM
# Report: https://github.com/csstools/postcss-preset-env/issues/40
postcss-nested: {}

# Compression tool
# https://github.com/cssnano/cssnano
cssnano: {}
40 changes: 16 additions & 24 deletions capella/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"author": {
"name": "CodeX",
"email": "team@ifmo.su",
"email": "team@codex.so",
"url": "https://codex.so/"
},
"license": "MIT",
Expand All @@ -20,33 +20,25 @@
},
"homepage": "https://github.com/codex-team/capella#readme",
"devDependencies": {
"@babel/core": "^7.3.3",
"@babel/preset-env": "^7.3.1",
"@codexteam/ajax": "^4.0.1",
"babel-loader": "^8.0.5",
"codex-notifier": "^1.1.1",
"css-loader": "^2.1.0",
"@babel/core": "^7.8.3",
"@babel/preset-env": "^7.8.3",
"@codexteam/ajax": "^4.1.0",
"babel-loader": "^8.0.6",
"codex-notifier": "^1.1.2",
"css-loader": "^3.4.2",
"cssnano": "^4.1.10",
"eslint": "^4.19.1",
"eslint-loader": "^2.0.0",
"eslint": "^6.8.0",
"eslint-loader": "^3.0.3",
"exports-loader": "^0.7.0",
"hawk.javascript": "^2.0.0",
"mini-css-extract-plugin": "^0.5.0",
"postcss-color-function": "^4.0.1",
"postcss-color-hex-alpha": "^3.0.0",
"postcss-cssnext": "^3.1.0",
"postcss-custom-media": "^6.0.0",
"postcss-custom-properties": "^7.0.0",
"postcss-custom-selectors": "^4.0.1",
"postcss-font-family-system-ui": "^3.0.0",
"postcss-font-variant": "^3.0.0",
"mini-css-extract-plugin": "^0.9.0",
"normalize.css": "^8.0.1",
"postcss-import": "^12.0.1",
"postcss-loader": "^2.1.5",
"postcss-media-minmax": "^3.0.0",
"postcss-nested": "^3.0.0",
"postcss-loader": "^3.0.0",
"postcss-nested": "^4.2.1",
"postcss-nested-ancestors": "^2.0.0",
"postcss-nesting": "^5.0.0",
"webpack": "^4.11.0",
"webpack-cli": "^3.0.2"
"postcss-preset-env": "^6.7.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
}
}
7 changes: 6 additions & 1 deletion capella/public/app/css/main.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
@import url('normalize.css');
/** CSS reset <https://github.com/necolas/normalize.css> */
@import 'normalize.css';

/**
* Base components
*/
@import url('variables.css');
@import url('base.css');
@import url('spaceship.css');
Expand Down
2 changes: 1 addition & 1 deletion capella/public/build/bundle.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions capella/public/build/capella.bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions capella/public/build/hawk.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions capella/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
const webpack = require('webpack');
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const MiniCssExtractPlugin = require('mini-css-extract-plugin');

module.exports = {
/**
Expand Down Expand Up @@ -89,4 +89,4 @@ module.exports = {
noEmitOnErrors: true,
splitChunks: false
}
};
};
Loading

0 comments on commit 1e486e7

Please sign in to comment.