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

build: switches to webpack to support newer syntaxes #1819

Merged
merged 2 commits into from
Nov 10, 2023
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
16 changes: 14 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@
{
"modules": false,
"useBuiltIns": "entry",
"corejs": 3
"corejs": 3,
"shippedProposals": true
}
],
"@babel/preset-react"
],
"plugins": [
["styled-components", { "displayName": true }]
["styled-components", { "displayName": true }],
"@babel/plugin-proposal-class-properties",
[
"module-resolver",
{
"alias": {
"^@/(.+)": "./src/\\1"
}
}
],
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
],
"env": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Activate fleek
run: cp .github/fleek/develop.fleek.json ./.fleek.json
- name: Install build dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Activate fleek
run: cp .github/fleek/prod.fleek.json ./.fleek.json
- name: Install build dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build Aragon
Expand Down
54 changes: 21 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"files": [
{
"path": "public/*.js",
"maxSize": "1600kb",
"maxSize": "2048kb",
"compression": "gzip"
}
]
Expand Down Expand Up @@ -75,15 +75,21 @@
},
"devDependencies": {
"@aragon/os": "^4.0.0",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/preset-env": "^7.6.3",
"@babel/preset-react": "^7.6.3",
"@babel/core": "^7.0.0-0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/preset-env": "^7.10.2",
"@babel/preset-react": "^7.10.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^25.1.0",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
"babel-plugin-styled-components": "^1.10.6",
"bundlewatch": "^0.2.6",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^5.2.0",
"dotenv-webpack": "^8.0.1",
"eslint": "^5.6.0",
"eslint-config-prettier": "^6.7.0",
"eslint-config-standard": "^12.0.0",
Expand All @@ -96,48 +102,30 @@
"eslint-plugin-react": "^7.5.1",
"eslint-plugin-react-hooks": "^1.6.0",
"eslint-plugin-standard": "^4.0.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.3",
"husky": "^1.0.1",
"jest": "^25.1.0",
"lint-staged": "^8.1.1",
"parcel-bundler": "^1.10.1",
"parcel-plugin-bundle-visualiser": "^1.2.0",
"prettier": "^1.19.1",
"ps-node": "^0.1.6",
"rimraf": "^2.6.2"
"rimraf": "^2.6.2",
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
"resolutions": {
"@aragon/wrapper/web3": "1.7.5",
"@aragon/wrapper/web3-eth-abi": "1.2.6"
},
"scripts": {
"bundlewatch": "bundlewatch",
"start": "node scripts/start",
"start:local": "node scripts/launch-local",
"start:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm start",
"start:goerli": "npm start",
"start:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm start",
"start:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm start",
"build": "node scripts/build",
"build:local": "node scripts/build-local",
"build:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm run build",
"build:goerli": "npm run build",
"build:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm run build",
"build:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm run build",
"lint": "eslint ./src",
"test": "npm run lint && npm run jest",
"jest": "jest",
"publish:major": "node scripts/publish major --only-content --files public/",
"publish:minor": "node scripts/publish minor --only-content --files public/",
"publish:patch": "node scripts/publish patch --only-content --files public/",
"publish:mainnet:major": "npm run publish:major -- --environment mainnet --build-script build:mainnet",
"publish:mainnet:minor": "npm run publish:minor -- --environment mainnet --build-script build:mainnet",
"publish:mainnet:patch": "npm run publish:patch -- --environment mainnet --build-script build:mainnet",
"publish:goerli:major": "npm run publish:major -- --environment goerli --build-script build:goerli",
"publish:goerli:minor": "npm run publish:minor -- --environment goerli --build-script build:goerli",
"publish:goerli:patch": "npm run publish:patch -- --environment goerli --build-script build:goerli",
"publish:staging:major": "npm run publish:major -- --environment staging --build-script build:staging",
"publish:staging:minor": "npm run publish:minor -- --environment staging --build-script build:staging",
"publish:staging:patch": "npm run publish:patch -- --environment staging --build-script build:staging"
"test": "jest",
"start": "npm run sync-assets & webpack-dev-server --mode development --open --hot",
"build": "rm -rf ./public/ && npm run sync-assets && webpack build --progress --mode production -o ./public",
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./public"
},
"browserslist": {
"development": ">2%, last 1 edge versions, not ie > 0, not op_mini all",
Expand Down
24 changes: 0 additions & 24 deletions scripts/build

This file was deleted.

24 changes: 0 additions & 24 deletions scripts/build-local

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/config/local.js

This file was deleted.

64 changes: 0 additions & 64 deletions scripts/launch-local

This file was deleted.

20 changes: 0 additions & 20 deletions scripts/publish

This file was deleted.

43 changes: 0 additions & 43 deletions scripts/start

This file was deleted.

Loading
Loading