Skip to content

Commit

Permalink
Pull request #1222: AG-13306 add cross-env
Browse files Browse the repository at this point in the history
Merge in EXTENSIONS/browser-extension from feature/AG-13306 to master

Squashed commit of the following:

commit d4fa3ed
Author: Anton <a.kaprielov@adguard.com>
Date:   Wed Mar 23 16:41:29 2022 +0300

    AG-13306 add yarn version

commit f8df022
Author: Anton <a.kaprielov@adguard.com>
Date:   Wed Mar 23 14:02:42 2022 +0300

    AG-13306 up postcss

commit a5e5a84
Author: Anton <a.kaprielov@adguard.com>
Date:   Wed Mar 23 13:54:26 2022 +0300

    AG-13306 cross-env
  • Loading branch information
Anton Kaprielov committed Mar 23, 2022
1 parent 6e80228 commit 97cf1db
Show file tree
Hide file tree
Showing 4 changed files with 354 additions and 314 deletions.
5 changes: 3 additions & 2 deletions README.md
Expand Up @@ -105,8 +105,9 @@ Here is a [dedicated page](https://adguard.com/contribute.html) for those who ar
<a id="dev-requirements"></a>
### Requirements

- [nodejs](https://nodejs.org/en/download/)
- [yarn](https://yarnpkg.com/en/docs/install/)
- [node.js LTS](https://nodejs.org/en/download/)
- NPM v8
- [yarn v1.22](https://yarnpkg.com/en/docs/install/)

Install local dependencies by running:
```
Expand Down
19 changes: 10 additions & 9 deletions package.json
Expand Up @@ -3,12 +3,12 @@
"version": "4.0.145",
"description": "AdGuard Extension",
"scripts": {
"dev": "BUILD_ENV=dev babel-node tools/bundle.js",
"dev:watch": "BUILD_ENV=dev babel-node tools/bundle.js chrome --watch",
"dev:watch:ff": "BUILD_ENV=dev babel-node tools/bundle.js firefox --watch",
"beta": "BUILD_ENV=beta babel-node tools/bundle.js",
"release": "BUILD_ENV=release babel-node tools/bundle.js",
"adguard-api": "BUILD_ENV=dev babel-node tools/bundle.js adguard-api",
"dev": "cross-env BUILD_ENV=dev babel-node tools/bundle.js",
"dev:watch": "cross-env BUILD_ENV=dev babel-node tools/bundle.js chrome --watch",
"dev:watch:ff": "cross-env BUILD_ENV=dev babel-node tools/bundle.js firefox --watch",
"beta": "cross-env BUILD_ENV=beta babel-node tools/bundle.js",
"release": "cross-env BUILD_ENV=release babel-node tools/bundle.js",
"adguard-api": "cross-env BUILD_ENV=dev babel-node tools/bundle.js adguard-api",
"test": "jest",
"locales:download": "babel-node tools/locales.js download",
"locales:upload": "babel-node tools/locales.js upload",
Expand Down Expand Up @@ -50,6 +50,7 @@
"commander": "^6.2.1",
"copy-webpack-plugin": "^9.0.1",
"cpy": "^8.1.2",
"cross-env": "^7.0.3",
"crx": "^5.0.1",
"css-loader": "^6.2.0",
"css.escape": "^1.5.1",
Expand All @@ -66,10 +67,10 @@
"jest": "^27.0.6",
"lint-staged": "^11.1.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.3.6",
"postcss": "^8.4.12",
"postcss-loader": "^6.1.1",
"postcss-nested": "^5.0.6",
"postcss-preset-env": "^6.7.0",
"postcss-preset-env": "^7.4.3",
"postcss-svg": "^3.0.0",
"preprocess-loader": "^0.3.0",
"sinon-chrome": "^3.0.1",
Expand Down Expand Up @@ -118,4 +119,4 @@
"webextension-polyfill": "^0.8.0",
"xstate": "^4.23.1"
}
}
}
4 changes: 3 additions & 1 deletion postcss.config.js
@@ -1,6 +1,8 @@
const postcssPresetEnv = require('postcss-preset-env');

module.exports = {
plugins: [
['postcss-preset-env', { stage: 3, features: { 'nesting-rules': true } }],
[postcssPresetEnv, { stage: 3, features: { 'nesting-rules': true } }],
['postcss-svg', {}],
['postcss-nested', {}],
],
Expand Down

0 comments on commit 97cf1db

Please sign in to comment.