diff --git a/.github/workflows/npm_release_tns_core.yml b/.github/workflows/npm_release_tns_core.yml index e8dc19060..5b3849e1b 100644 --- a/.github/workflows/npm_release_tns_core.yml +++ b/.github/workflows/npm_release_tns_core.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup - run: npm install + run: npm install --legacy-peer-deps - name: Generate Version run: | diff --git a/.github/workflows/npm_release_webpack.yml b/.github/workflows/npm_release_webpack.yml index ad622eb7b..b34c052f1 100644 --- a/.github/workflows/npm_release_webpack.yml +++ b/.github/workflows/npm_release_webpack.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup - run: npm install + run: npm install --legacy-peer-deps - name: Generate Version working-directory: packages/webpack diff --git a/apps/automated/package.json b/apps/automated/package.json index 9198b309f..2d7789bdb 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/NativeScript/NativeScript.git" }, "scripts": { - "clean": "npx rimraf hooks node_modules platforms package-lock.json && npm i" + "clean": "npx rimraf hooks node_modules platforms package-lock.json && npm i --legacy-peer-deps" }, "dependencies": { "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core", diff --git a/package.json b/package.json index 1b9a545ca..36891ee24 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { - "name": "nativescript", - "version": "8.0.1", - "license": "MIT", + "name": "nativescript", + "version": "8.0.1", + "license": "MIT", "config": { "npm_alias": "npm" }, - "scripts": { - "clean": "git clean -f -X -d", - "setup": "npm run clean && npm install", - "setup:yarn": "yarn run clean && yarn", - "setup:pnpm": "pnpm run clean && pnpm install", - "postinstall": "ts-patch install && husky install && nx run core:setup", - "start": "nps", + "scripts": { + "clean": "git clean -f -X -d --exclude=!.idea/ --exclude=!.vscode/*", + "setup": "npm run clean && npm install --legacy-peer-deps", + "setup:yarn": "yarn run clean && yarn", + "setup:pnpm": "pnpm run clean && pnpm install", + "postinstall": "ts-patch install && husky install && nx run core:setup", + "start": "nps", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "apps-automated:ios": "cd apps/automated && tns debug ios --no-hmr --emulator --env.testing", "apps-automated:android": "cd apps/automated && tns debug android --no-hmr --emulator --env.testing", @@ -38,72 +38,72 @@ "webpack:lint": "cd packages/webpack && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/webpack/**", "webpack:test": "cd packages/webpack && npm run tsc && npm run jasmine", "webpack:build": "cd packages/webpack npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz" - }, - "private": true, - "repository": { - "type": "git", - "url": "https://github.com/NativeScript/NativeScript.git" - }, - "dependencies": { - "nativescript-theme-core": "^1.0.4" - }, - "devDependencies": { - "@nativescript/eslint-plugin": "0.0.1", - "@nativescript/hook": "^2.0.0", - "@nrwl/cli": "11.5.2", - "@nrwl/eslint-plugin-nx": "11.5.2", - "@nrwl/jest": "11.5.2", - "@nrwl/node": "11.5.2", - "@nrwl/tao": "11.5.2", - "@nrwl/workspace": "11.5.2", - "@nstudio/focus": "~11.1.0", - "@nstudio/nps-i": "~1.1.0", - "@prettier/plugin-xml": "^0.13.1", - "@types/chai": "^4.2.11", - "@types/jest": "~26.0.8", - "@types/mocha": "^7.0.2", - "@types/node": "12.12.38", - "@typescript-eslint/eslint-plugin": "~4.16.0", - "@typescript-eslint/parser": "~4.16.0", - "chai": "^4.2.0", - "conventional-changelog-cli": "^2.1.1", - "copyfiles": "^2.4.0", + }, + "private": true, + "repository": { + "type": "git", + "url": "https://github.com/NativeScript/NativeScript.git" + }, + "dependencies": { + "nativescript-theme-core": "^1.0.4" + }, + "devDependencies": { + "@nativescript/eslint-plugin": "0.0.1", + "@nativescript/hook": "^2.0.0", + "@nrwl/cli": "11.5.2", + "@nrwl/eslint-plugin-nx": "11.5.2", + "@nrwl/jest": "11.5.2", + "@nrwl/node": "11.5.2", + "@nrwl/tao": "11.5.2", + "@nrwl/workspace": "11.5.2", + "@nstudio/focus": "~11.1.0", + "@nstudio/nps-i": "~1.1.0", + "@prettier/plugin-xml": "^0.13.1", + "@types/chai": "^4.2.11", + "@types/jest": "~26.0.8", + "@types/mocha": "^7.0.2", + "@types/node": "12.12.38", + "@typescript-eslint/eslint-plugin": "~4.16.0", + "@typescript-eslint/parser": "~4.16.0", + "chai": "^4.2.0", + "conventional-changelog-cli": "^2.1.1", + "copyfiles": "^2.4.0", "cpy-cli": "^3.1.1", - "css": "^3.0.0", - "css-tree": "^1.0.0-alpha.39", - "dotenv": "~8.2.0", - "eslint": "~7.21.0", - "eslint-config-prettier": "8.1.0", - "eslint-plugin-prettier": "^3.3.1", - "gonzales": "^1.0.7", - "husky": "^5.1.3", - "jest": "~26.2.2", - "lint-staged": "^10.5.0", - "mocha": "^8.0.1", - "mocha-typescript": "^1.1.17", - "module-alias": "^2.2.2", - "nativescript": "~7.2.0", - "parse-css": "git+https://github.com/tabatkins/parse-css.git", - "parserlib": "^1.1.1", - "prettier": "~2.2.1", - "reduce-css-calc": "~2.1.7", + "css": "^3.0.0", + "css-tree": "^1.0.0-alpha.39", + "dotenv": "~8.2.0", + "eslint": "~7.21.0", + "eslint-config-prettier": "8.1.0", + "eslint-plugin-prettier": "^3.3.1", + "gonzales": "^1.0.7", + "husky": "^5.1.3", + "jest": "~26.2.2", + "lint-staged": "^10.5.0", + "mocha": "^8.0.1", + "mocha-typescript": "^1.1.17", + "module-alias": "^2.2.2", + "nativescript": "~7.2.0", + "parse-css": "git+https://github.com/tabatkins/parse-css.git", + "parserlib": "^1.1.1", + "prettier": "~2.2.1", + "reduce-css-calc": "~2.1.7", "rimraf": "3.0.2", - "sass": "~1.32.8", - "shady-css-parser": "^0.1.0", - "terser-webpack-plugin": "~3.0.6", - "tree-kill": "^1.2.2", - "ts-jest": "26.4.0", - "ts-node": "9.1.1", - "ts-patch": "^1.3.0", + "sass": "~1.32.8", + "shady-css-parser": "^0.1.0", + "terser-webpack-plugin": "~3.0.6", + "tree-kill": "^1.2.2", + "ts-jest": "26.4.0", + "ts-node": "9.1.1", + "ts-patch": "^1.3.0", "tslib": "2.1.0", - "tslint": "6.1.3", - "typescript": "~4.0.3", - "webpack": "~4.44.1", - "webpack-cli": "~3.3.12" - }, - "lint-staged": { - "**/*": [ - "nx format:write --files" - ] - } + "tslint": "6.1.3", + "typescript": "~4.0.3", + "webpack": "~4.44.1", + "webpack-cli": "~3.3.12" + }, + "lint-staged": { + "**/*": [ + "nx format:write --files" + ] + } } diff --git a/packages/core/accessibility/index.ios.ts b/packages/core/accessibility/index.ios.ts index 3d0945eaf..758a9fb11 100644 --- a/packages/core/accessibility/index.ios.ts +++ b/packages/core/accessibility/index.ios.ts @@ -73,18 +73,18 @@ function ensureNativeClasses() { ]); nativeFocusedNotificationObserver = Application.ios.addNotificationObserver(UIAccessibilityElementFocusedNotification, (args: NSNotification) => { - const uiView = args.userInfo.objectForKey(UIAccessibilityFocusedElementKey) as UIView; - if (!uiView.tag) { + const uiView = args.userInfo?.objectForKey(UIAccessibilityFocusedElementKey) as UIView; + if (!uiView?.tag) { return; } const rootView = Application.getRootView(); // We use the UIView's tag to find the NativeScript View by its domId. - let view = rootView.getViewByDomId(uiView.tag); + let view = rootView.getViewByDomId(uiView?.tag); if (!view) { for (const modalView of >rootView._getRootModalViews()) { - view = modalView.getViewByDomId(uiView.tag); + view = modalView.getViewByDomId(uiView?.tag); if (view) { break; } diff --git a/packages/core/platforms/android/native-api-usage.json b/packages/core/platforms/android/native-api-usage.json index 565255a8e..52a7ae42c 100644 --- a/packages/core/platforms/android/native-api-usage.json +++ b/packages/core/platforms/android/native-api-usage.json @@ -24,6 +24,7 @@ "androidx.core*:*", "androidx.viewpager.widget*:*", "androidx.fragment*:*", - "androidx.transition*:*" + "androidx.transition*:*", + "android.inputmethodservice*:*" ] -} \ No newline at end of file +} diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 5517f223d..9874380a6 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -32,7 +32,7 @@ "npm_alias":"npm" }, "scripts": { - "clean": "npx rimraf -- node_modules package-lock.json && $npm_package_config_npm_alias i --ignore-scripts", + "clean": "npx rimraf -- node_modules package-lock.json && $npm_package_config_npm_alias i --ignore-scripts --legacy-peer-deps", "tsc": "tsc", "postinstall": "node postinstall.js", "preuninstall": "node preuninstall.js", diff --git a/workspace.json b/workspace.json index baf7de078..fefef721d 100644 --- a/workspace.json +++ b/workspace.json @@ -26,7 +26,7 @@ "clean": { "builder": "@nrwl/workspace:run-commands", "options": { - "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"], + "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i --legacy-peer-deps", "npx rimraf -- package-lock.json"], "cwd": "apps/automated", "parallel": false } @@ -58,7 +58,7 @@ "clean": { "builder": "@nrwl/workspace:run-commands", "options": { - "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"], + "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i --legacy-peer-deps", "npx rimraf -- package-lock.json"], "cwd": "apps/toolbox", "parallel": false } @@ -90,7 +90,7 @@ "clean": { "builder": "@nrwl/workspace:run-commands", "options": { - "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"], + "commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i --legacy-peer-deps", "npx rimraf -- package-lock.json"], "cwd": "apps/ui", "parallel": false }