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.

Sign up for GitHub

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

Jump to bottom

bump to @bentley/react-scripts@4.0.3, eslint@^7.11.0 #942

Merged
merged 22 commits into from
Jul 2, 2021
Merged

bump to @bentley/react-scripts@4.0.3, eslint@^7.11.0 #942

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a356ddf
bump to our cra 4.0 fork
aruniverse Mar 11, 2021
f3e1e3f
Merge branch 'master' into cra-4
mergify[bot] Mar 11, 2021
38147ca
readd some deps that were removed becasue theyre used by the backend.…
aruniverse Mar 11, 2021
3a93407
Merge branch 'cra-4' of https://github.com/imodeljs/imodeljs into cra-4
aruniverse Mar 11, 2021
8f6503c
merge with master
calebmshafer Jun 12, 2021
7168127
rush change
calebmshafer Jun 14, 2021
8953cb9
revert the scripts changes
calebmshafer Jun 14, 2021
9e6e5ae
bump to 4.0.3-dev.1
aruniverse Jun 16, 2021
a18f6d3
Merge branch 'master' into cra-4
aruniverse Jun 28, 2021
b269574
bump cra to 4.0.3-dev.2 and update the .env
aruniverse Jun 28, 2021
470363c
bump max heap size for building test apps
aruniverse Jun 29, 2021
569c140
Merge remote-tracking branch 'origin/master' into cra-4
aruniverse Jun 29, 2021
f03c231
cleanup
aruniverse Jun 29, 2021
a7288b5
lock file, rush change, revert bad commit to settings file
aruniverse Jun 29, 2021
83ff57d
Merge remote-tracking branch 'origin/master' into cra-4
aruniverse Jun 29, 2021
9d4a50c
bump to cra 4.0.3
aruniverse Jun 29, 2021
33a51bc
add missing disable from presentation-test-app
calebmshafer Jul 1, 2021
9cf55f7
add back few missing deps of dta
calebmshafer Jul 1, 2021
464f385
remove all .env files and revert back to old way of setting overrides
calebmshafer Jul 1, 2021
717ded9
fix lint error
calebmshafer Jul 1, 2021
7040d74
revert changes to .env.template
aruniverse Jul 2, 2021
92ec48e
Merge branch 'cra-4' of https://github.com/imodeljs/imodeljs into cra-4
aruniverse Jul 2, 2021
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ package-deps.json
# Mac specfic
.DS_Store

.env
.env.*.local

debug.log
5,591 changes: 4,291 additions & 1,300 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion extensions/map-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@bentley/imodeljs-quantity": "2.14.0-dev.16",
"@bentley/itwin-client": "2.14.0-dev.16",
"@bentley/presentation-common": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
aruniverse marked this conversation as resolved.
Show resolved Hide resolved
"@bentley/ui-abstract": "2.14.0-dev.16",
"@bentley/ui-components": "2.14.0-dev.16",
"@bentley/ui-core": "2.14.0-dev.16",
Expand Down
9 changes: 9 additions & 0 deletions test-apps/display-performance-test-app/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
SKIP_PREFLIGHT_CHECK=true
calebmshafer marked this conversation as resolved.
Show resolved Hide resolved

# advanced cra config: https://create-react-app.dev/docs/advanced-configuration
DISABLE_ESLINT_PLUGIN=true
DISABLE_NEW_JSX_TRANSFORM=true

# advanced imjs cra config: https://github.com/imodeljs/create-react-app/blob/imodeljs/packages/react-scripts/README-imodeljs.md
USE_FAST_SASS=true
TRANSPILE_DEPS=false
7 changes: 3 additions & 4 deletions test-apps/display-performance-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"compile": "npm run build:backend & tsc",
"build": "npm run build:backend & npm run build:frontend",
"build:backend": "tsc -p tsconfig.backend.json",
"build:frontend": "cross-env DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true react-scripts build",
"build:frontend": "react-scripts build",
"clean": "rimraf lib build .rush/temp/package-deps*.json",
"docs": "",
"lint": "eslint -f visualstudio --config package.json --no-eslintrc ./src/**/*.ts 1>&2",
"mobile": "tsc 1>&2 && webpack --config mobile.backend.webpack.config.js 1>&2 && webpack --config mobile.frontend.webpack.config.js 1>&2 && cpx \"public/**/*\" ./lib/mobile/public && cpx \"assets/**/*\" ./lib/mobile/assets ",
"start": "npm run start:electron",
"start:webserver": "cross-env BROWSER=none DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true react-scripts start",
"start:webserver": "cross-env BROWSER=none react-scripts start",
"start:electron": "electron ./lib/backend/ElectronMain.js",
"start:web": "node lib/backend/WebMain.js",
"test:chrome": "node ./lib/common/npmCommands.js chrome",
Expand Down Expand Up @@ -57,7 +57,7 @@
"@bentley/config-loader": "2.14.0-dev.16",
"@bentley/build-tools": "2.14.0-dev.16",
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@types/body-parser": "^1.17.0",
"@types/express": "^4.16.1",
"@types/node": "10.14.1",
Expand All @@ -66,7 +66,6 @@
"cross-env": "^5.1.4",
"cpx": "^1.5.0",
"electron": "^11.1.0",
"eslint": "^6.8.0",
"express": "^4.16.3",
"npm-run-all": "^4.1.5",
"null-loader": "^0.1.1",
Expand Down
3 changes: 2 additions & 1 deletion test-apps/display-performance-test-app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true
"noEmit": true,
"jsx": "react"
},
"include": [
"./src/**/*.ts"
Expand Down
10 changes: 10 additions & 0 deletions test-apps/display-test-app/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SKIP_PREFLIGHT_CHECK=true

# advanced cra config: https://create-react-app.dev/docs/advanced-configuration
DISABLE_ESLINT_PLUGIN=true
DISABLE_NEW_JSX_TRANSFORM=true

# advanced imjs cra config: https://github.com/imodeljs/create-react-app/blob/imodeljs/packages/react-scripts/README-imodeljs.md
USE_FAST_SASS=true
TRANSPILE_DEPS=false
DISABLE_TERSER=true
8 changes: 3 additions & 5 deletions test-apps/display-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"compile": "npm run build:backend & tsc",
"build": "npm run build:backend & npm run build:frontend",
"build:backend": "tsc -p tsconfig.backend.json",
"build:frontend": "cross-env DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true DISABLE_TERSER=true NODE_OPTIONS=--max_old_space_size=4096 react-scripts build",
"build:frontend": "cross-env NODE_OPTIONS=--max_old_space_size=4096 react-scripts build",
"clean": "rimraf build lib .rush/temp/package-deps*.json",
"copy:assets": "cpx \"./node_modules/@bentley/icons-generic-webfont/dist/**/*\" ./build",
"docs": "",
"lint": "eslint -f visualstudio --config package.json --no-eslintrc ./src/**/*.ts 1>&2",
"start": "cross-env NODE_ENV=development run-p start:webserver start:electron",
"start:electron": "electron ./lib/backend/DtaElectronMain.js",
"start:webserver": "cross-env BROWSER=none USE_FULL_SOURCEMAP=true DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true react-scripts start",
"start:webserver": "cross-env BROWSER=none USE_FULL_SOURCEMAP=true react-scripts start",
"start:backend": "node --max-http-header-size=16000 lib/backend/WebMain.js",
"start:servers": "run-p \"start:webserver\" \"start:backend\"",
"test": "",
Expand Down Expand Up @@ -65,7 +65,7 @@
"@bentley/config-loader": "2.14.0-dev.16",
"@bentley/build-tools": "2.14.0-dev.16",
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@types/body-parser": "^1.17.0",
"@types/express": "^4.16.1",
"@types/fs-extra": "^4.0.7",
Expand All @@ -74,15 +74,13 @@
"cpx": "^1.5.0",
"cross-env": "^5.1.4",
"electron": "^11.1.0",
"eslint": "^6.8.0",
calebmshafer marked this conversation as resolved.
Show resolved Hide resolved
calebmshafer marked this conversation as resolved.
Show resolved Hide resolved
"express": "^4.16.3",
"fs-extra": "^8.1.0",
"internal-tools": "0.0.0",
"npm-run-all": "^4.1.5",
"null-loader": "^0.1.1",
"rimraf": "^3.0.2",
"react": "^16.8.0",
"sass": "^1.29.0",
"typescript": "~4.1.0",
"webpack": "4.42.0",
"semver": "^5.5.0"
Expand Down
3 changes: 2 additions & 1 deletion test-apps/display-test-app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true
"noEmit": true,
"jsx": "react"
},
"include": [
"./src/**/*.ts"
Expand Down
2 changes: 1 addition & 1 deletion test-apps/ninezone-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"@bentley/build-tools": "2.14.0-dev.16",
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@types/classnames": "^2.2.3",
"@types/react": "16.9.43",
"@types/react-dom": "^16.8.0",
Expand Down
12 changes: 12 additions & 0 deletions test-apps/presentation-test-app/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SKIP_PREFLIGHT_CHECK=true

# advanced cra config: https://create-react-app.dev/docs/advanced-configuration
GENERATE_SOURCEMAP=false
DISABLE_ESLINT_PLUGIN=true
DISABLE_NEW_JSX_TRANSFORM=true

# advanced imjs cra config: https://github.com/imodeljs/create-react-app/blob/imodeljs/packages/react-scripts/README-imodeljs.md
USE_FAST_SASS=true
TRANSPILE_DEPS=false
DISABLE_TERSER=true

8 changes: 3 additions & 5 deletions test-apps/presentation-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"compile": "npm run build:backend & tsc",
"build": "npm run build:backend && npm run build:frontend",
"build:backend": "npm run copy:assets && tsc -p tsconfig.backend.json",
"build:frontend": "cross-env GENERATE_SOURCEMAP=false DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true DISABLE_TERSER=true react-scripts build",
"build:frontend": "react-scripts build",
"copy:assets": "symlink-dir \"./assets\" ./lib/assets",
"clean": "rimraf build lib .rush/temp/package-deps*.json",
"docs": "npm run extract",
"extract": "betools extract --fileExt=ts,tsx --extractFrom=./src --recursive --out=../../generated-docs/extract",
"lint": "eslint -f visualstudio --config package.json --no-eslintrc ./src/**/*.{ts,tsx} 1>&2",
"electron": "run-p start:webserver start:electron",
"start:electron": "electron ./lib/backend/main.js",
"start:webserver": "cross-env BROWSER=none USE_FULL_SOURCEMAP=true DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true react-scripts start",
"start:webserver": "cross-env BROWSER=none USE_FULL_SOURCEMAP=true react-scripts start",
"start:backend": "node --inspect --max-http-header-size=16000 lib/backend/main.js",
"start:servers": "run-p start:webserver start:backend",
"test": "",
Expand Down Expand Up @@ -56,7 +56,7 @@
"@bentley/config-loader": "2.14.0-dev.16",
"@bentley/build-tools": "2.14.0-dev.16",
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@types/bunyan": "^1.8.4",
"@types/react": "16.9.43",
"@types/react-dom": "^16.8.0",
Expand All @@ -65,12 +65,10 @@
"cpx": "^1.5.0",
"cross-env": "^5.1.4",
"electron": "^11.1.0",
"eslint": "^6.8.0",
"npm-run-all": "^4.1.5",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-loader": "3.0.0",
"rimraf": "^3.0.2",
"sass": "^1.29.0",
"symlink-dir": "~4.0.3",
"typescript": "~4.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion test-apps/presentation-test-app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"exclude": [
"./src/backend/**/*.ts"
]
}
}
11 changes: 11 additions & 0 deletions test-apps/ui-test-app/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SKIP_PREFLIGHT_CHECK=true
calebmshafer marked this conversation as resolved.
Show resolved Hide resolved

# advanced cra config: https://create-react-app.dev/docs/advanced-configuration
GENERATE_SOURCEMAP=false
DISABLE_ESLINT_PLUGIN=true
DISABLE_NEW_JSX_TRANSFORM=true

# advanced imjs cra config: https://github.com/imodeljs/create-react-app/blob/imodeljs/packages/react-scripts/README-imodeljs.md
USE_FAST_SASS=true
TRANSPILE_DEPS=false
DISABLE_TERSER=true
10 changes: 3 additions & 7 deletions test-apps/ui-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"compile": "npm run build:backend & tsc",
"build": "npm run build:backend && npm run build:frontend",
"build:backend": "npm run copy:assets && tsc -p tsconfig.backend.json",
"build:frontend": "npm run pseudolocalize && cross-env GENERATE_SOURCEMAP=false DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true DISABLE_TERSER=true react-scripts build",
"build:frontend": "npm run pseudolocalize && react-scripts build",
"clean": "rimraf lib build .rush/temp/package-deps*.json",
"copy:assets": "cpx ./src/backend/web/BackendServer.config.json ./lib/backend/web",
"lint": "eslint -f visualstudio --config package.json --no-eslintrc ./src/**/*.{ts,tsx} 1>&2",
"start": "run-p start:webserver start:electron",
"start:electron": "electron ./lib/backend/main.js",
"start:electron:prod": "cross-env NODE_ENV=production electron ./lib/backend/main.js",
"start:webserver": "npm run pseudolocalize && cross-env BROWSER=none DISABLE_ESLINT=true TRANSPILE_DEPS=false USE_FAST_SASS=true react-scripts start",
"start:webserver": "npm run pseudolocalize && cross-env BROWSER=none react-scripts start",
"start:backend": "node --max-http-header-size=16000 lib/backend/main.js",
"start:servers": "run-p \"start:webserver\" \"start:backend\"",
"pseudolocalize": "betools pseudolocalize --englishDir ./public/locales/en --out ./build/public/locales/en-PSEUDO",
Expand Down Expand Up @@ -50,7 +50,7 @@
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/imodeljs-markup": "2.14.0-dev.16",
"@bentley/frontend-devtools": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@types/classnames": "^2.2.3",
"@types/lorem-ipsum": "^1.0.2",
"@types/node": "10.14.1",
Expand All @@ -62,14 +62,10 @@
"@types/react-beautiful-dnd": "^12.1.2",
"cpx": "^1.5.0",
"cross-env": "^5.1.4",
"dotenv": "^8.2.0",
aruniverse marked this conversation as resolved.
Show resolved Hide resolved
"dotenv-expand": "^5.1.0",
"electron": "^11.1.0",
"eslint": "^6.8.0",
"internal-tools": "0.0.0",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"sass": "^1.29.0",
"typescript": "~4.1.0",
"fs-extra": "^8.1.0",
"webpack": "4.42.0",
Expand Down
2 changes: 1 addition & 1 deletion test-apps/ui-test-app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"exclude": [
"./src/backend/**/*.ts"
]
}
}
2 changes: 1 addition & 1 deletion ui/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@bentley/eslint-plugin": "2.14.0-dev.16",
"@bentley/geometry-core": "2.14.0-dev.16",
"@bentley/imodeljs-i18n": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@bentley/ui-abstract": "2.14.0-dev.16",
"@testing-library/react": "^8.0.1",
"@testing-library/react-hooks": "^3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion ui/framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@bentley/presentation-testing": "2.14.0-dev.16",
"@bentley/product-settings-client": "2.14.0-dev.16",
"@bentley/rbac-client": "2.14.0-dev.16",
"@bentley/react-scripts": "3.4.9",
"@bentley/react-scripts": "4.0.3-dev.0",
"@bentley/telemetry-client": "2.14.0-dev.16",
"@bentley/ui-abstract": "2.14.0-dev.16",
"@bentley/ui-components": "2.14.0-dev.16",
Expand Down