From 57e646f512022afbd763d6b3c0b2a072fd6fe5ef Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Mon, 31 Aug 2020 17:42:17 -0700 Subject: [PATCH] chore: cleanup types --- nx.json | 3 + package.json | 2 +- packages/core/package.json | 2 +- packages/types-android/.eslintrc | 1 - packages/types-android/README.md | 4 +- packages/types-android/jest.config.js | 9 - packages/types-android/package.json | 9 +- .../src/{index.ts => index.d.ts} | 0 packages/types-android/tsconfig.json | 7 - packages/types-android/tsconfig.lib.json | 12 -- packages/types-android/tsconfig.spec.json | 15 -- packages/types-ios/.eslintrc | 1 - packages/types-ios/README.md | 4 +- packages/types-ios/jest.config.js | 9 - packages/types-ios/package.json | 9 +- packages/types-ios/tsconfig.json | 7 - packages/types-ios/tsconfig.lib.json | 12 -- packages/types-ios/tsconfig.spec.json | 15 -- packages/types/README.md | 3 + packages/types/index.d.ts | 2 + packages/types/package.json | 18 ++ packages/webpack/package.json | 2 +- workspace.json | 182 ++++++------------ 23 files changed, 113 insertions(+), 215 deletions(-) delete mode 100644 packages/types-android/.eslintrc delete mode 100644 packages/types-android/jest.config.js rename packages/types-android/src/{index.ts => index.d.ts} (100%) delete mode 100644 packages/types-android/tsconfig.json delete mode 100644 packages/types-android/tsconfig.lib.json delete mode 100644 packages/types-android/tsconfig.spec.json delete mode 100644 packages/types-ios/.eslintrc delete mode 100644 packages/types-ios/jest.config.js delete mode 100644 packages/types-ios/tsconfig.json delete mode 100644 packages/types-ios/tsconfig.lib.json delete mode 100644 packages/types-ios/tsconfig.spec.json create mode 100644 packages/types/README.md create mode 100644 packages/types/index.d.ts create mode 100644 packages/types/package.json diff --git a/nx.json b/nx.json index f3fb2548d..5d47c3b81 100644 --- a/nx.json +++ b/nx.json @@ -30,6 +30,9 @@ "core-compat": { "tags": [] }, + "types": { + "tags": [] + }, "types-ios": { "tags": [] }, diff --git a/package.json b/package.json index ddace6784..a2409c0d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.0.0-rc.57", + "version": "7.0.0-rc.58", "license": "MIT", "scripts": { "setup": "npx rimraf -- hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup", diff --git a/packages/core/package.json b/packages/core/package.json index 5103904ad..f7557b334 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.0.0-rc.57", + "version": "7.0.0-rc.58", "homepage": "https://nativescript.org", "repository": { "type": "git", diff --git a/packages/types-android/.eslintrc b/packages/types-android/.eslintrc deleted file mode 100644 index ab8f38339..000000000 --- a/packages/types-android/.eslintrc +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] } diff --git a/packages/types-android/README.md b/packages/types-android/README.md index c0bf5b79a..2ca9b4b1d 100644 --- a/packages/types-android/README.md +++ b/packages/types-android/README.md @@ -1,3 +1,3 @@ -# types-android +# @nativescript/types-android -This library was generated with [Nx](https://nx.dev). +NativeScript Types for Android \ No newline at end of file diff --git a/packages/types-android/jest.config.js b/packages/types-android/jest.config.js deleted file mode 100644 index 6c52187e2..000000000 --- a/packages/types-android/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - name: 'types-android', - preset: '../../jest.config.js', - transform: { - '^.+\\.[tj]sx?$': 'ts-jest' - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '../../coverage/packages/types-android' -}; diff --git a/packages/types-android/package.json b/packages/types-android/package.json index 189d22d89..0289fe17a 100644 --- a/packages/types-android/package.json +++ b/packages/types-android/package.json @@ -1,4 +1,11 @@ { "name": "@nativescript/types-android", - "version": "0.0.1" + "version": "7.0.1", + "description": "NativeScript Types for Android.", + "homepage": "https://nativescript.org", + "repository": { + "type": "git", + "url": "https://github.com/NativeScript/NativeScript" + }, + "license": "Apache-2.0" } diff --git a/packages/types-android/src/index.ts b/packages/types-android/src/index.d.ts similarity index 100% rename from packages/types-android/src/index.ts rename to packages/types-android/src/index.d.ts diff --git a/packages/types-android/tsconfig.json b/packages/types-android/tsconfig.json deleted file mode 100644 index e5decd5e2..000000000 --- a/packages/types-android/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["node", "jest"] - }, - "include": ["**/*.ts"] -} diff --git a/packages/types-android/tsconfig.lib.json b/packages/types-android/tsconfig.lib.json deleted file mode 100644 index 7e93feb2f..000000000 --- a/packages/types-android/tsconfig.lib.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./src", - "types": ["node"] - }, - "exclude": ["**/*.spec.ts"], - "include": ["**/*.ts"] -} diff --git a/packages/types-android/tsconfig.spec.json b/packages/types-android/tsconfig.spec.json deleted file mode 100644 index 559410b96..000000000 --- a/packages/types-android/tsconfig.spec.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.spec.js", - "**/*.spec.jsx", - "**/*.d.ts" - ] -} diff --git a/packages/types-ios/.eslintrc b/packages/types-ios/.eslintrc deleted file mode 100644 index ab8f38339..000000000 --- a/packages/types-ios/.eslintrc +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] } diff --git a/packages/types-ios/README.md b/packages/types-ios/README.md index 2745e5190..1f53bad4a 100644 --- a/packages/types-ios/README.md +++ b/packages/types-ios/README.md @@ -1,3 +1,3 @@ -# types-ios +# @nativescript/types-ios -This library was generated with [Nx](https://nx.dev). +NativeScript Types for iOS diff --git a/packages/types-ios/jest.config.js b/packages/types-ios/jest.config.js deleted file mode 100644 index 6c52187e2..000000000 --- a/packages/types-ios/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - name: 'types-android', - preset: '../../jest.config.js', - transform: { - '^.+\\.[tj]sx?$': 'ts-jest' - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '../../coverage/packages/types-android' -}; diff --git a/packages/types-ios/package.json b/packages/types-ios/package.json index 752f08cd4..a753f4bf5 100644 --- a/packages/types-ios/package.json +++ b/packages/types-ios/package.json @@ -1,4 +1,11 @@ { "name": "@nativescript/types-ios", - "version": "0.0.1" + "version": "7.0.0", + "description": "NativeScript Types for iOS.", + "homepage": "https://nativescript.org", + "repository": { + "type": "git", + "url": "https://github.com/NativeScript/NativeScript" + }, + "license": "Apache-2.0" } diff --git a/packages/types-ios/tsconfig.json b/packages/types-ios/tsconfig.json deleted file mode 100644 index e5decd5e2..000000000 --- a/packages/types-ios/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["node", "jest"] - }, - "include": ["**/*.ts"] -} diff --git a/packages/types-ios/tsconfig.lib.json b/packages/types-ios/tsconfig.lib.json deleted file mode 100644 index 7e93feb2f..000000000 --- a/packages/types-ios/tsconfig.lib.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./src", - "types": ["node"] - }, - "exclude": ["**/*.spec.ts"], - "include": ["**/*.ts"] -} diff --git a/packages/types-ios/tsconfig.spec.json b/packages/types-ios/tsconfig.spec.json deleted file mode 100644 index 559410b96..000000000 --- a/packages/types-ios/tsconfig.spec.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.spec.js", - "**/*.spec.jsx", - "**/*.d.ts" - ] -} diff --git a/packages/types/README.md b/packages/types/README.md new file mode 100644 index 000000000..8760ea000 --- /dev/null +++ b/packages/types/README.md @@ -0,0 +1,3 @@ +# @nativescript/types + +NativeScript Types for all supported platforms \ No newline at end of file diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts new file mode 100644 index 000000000..c1089ccf6 --- /dev/null +++ b/packages/types/index.d.ts @@ -0,0 +1,2 @@ +/// +/// diff --git a/packages/types/package.json b/packages/types/package.json new file mode 100644 index 000000000..007eb598f --- /dev/null +++ b/packages/types/package.json @@ -0,0 +1,18 @@ +{ + "name": "@nativescript/types", + "version": "7.0.0", + "description": "NativeScript Types for all supported platforms.", + "homepage": "https://nativescript.org", + "repository": { + "type": "git", + "url": "https://github.com/NativeScript/NativeScript" + }, + "files": [ + "index.d.ts" + ], + "license": "Apache-2.0", + "dependencies": { + "@nativescript/types-ios": "~7.0.0", + "@nativescript/types-android": "~7.0.0" + } +} \ No newline at end of file diff --git a/packages/webpack/package.json b/packages/webpack/package.json index a416cf96b..b2f0f1b67 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/webpack", - "version": "3.0.0-rc.2", + "version": "3.0.0", "main": "index", "description": "Webpack plugin for NativeScript", "homepage": "https://nativescript.org", diff --git a/workspace.json b/workspace.json index 2b5141d27..f11d5a5a8 100644 --- a/workspace.json +++ b/workspace.json @@ -11,9 +11,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "tns debug ios --no-hmr --emulator --env.testing" - } + "ns debug ios --no-hmr --emulator --env.testing" ], "cwd": "apps/automated", "parallel": false @@ -23,9 +21,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "tns debug android --no-hmr --emulator --env.testing" - } + "ns debug android --no-hmr --emulator --env.testing" ], "cwd": "apps/automated", "parallel": false @@ -35,15 +31,9 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js" - }, - { - "command": "npm i" - }, - { - "command": "npx rimraf -- package-lock.json" - } + "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", + "npm i", + "npx rimraf -- package-lock.json" ], "cwd": "apps/automated", "parallel": false @@ -71,7 +61,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - "tns debug android --no-hmr --emulator --env.testing" + "ns debug android --no-hmr --emulator --env.testing" ], "cwd": "apps/toolbox", "parallel": false @@ -101,9 +91,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "tns debug ios --no-hmr --emulator --env.testing" - } + "ns debug ios --no-hmr --emulator --env.testing" ], "cwd": "apps/ui", "parallel": false @@ -113,9 +101,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "tns debug android --no-hmr --emulator --env.testing" - } + "ns debug android --no-hmr --emulator --env.testing" ], "cwd": "apps/ui", "parallel": false @@ -125,15 +111,9 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js" - }, - { - "command": "npm i" - }, - { - "command": "npx rimraf -- package-lock.json" - } + "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", + "npm i", + "npx rimraf -- package-lock.json" ], "cwd": "apps/ui", "parallel": false @@ -174,14 +154,13 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "nx run webpack:build" - } + "nx run webpack:build" ] } }, "build": { "builder": "@nrwl/node:package", + "outputs": ["dist/packages"], "options": { "outputPath": "dist/packages/core", "tsConfig": "packages/core/tsconfig.lib.json", @@ -194,21 +173,22 @@ }, "build.npm": { "builder": "@nrwl/workspace:run-commands", + "outputs": ["dist/packages"], "options": { "commands": [ - { - "command": "nx run core:build && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/**/*.d.ts\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/js-libs/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/cli-hooks/**/*.js\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/platforms/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/fetch/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css-value/**/*\" dist && cd dist/packages/core && npm pack && mv *.tgz .." - } - ] + "nx run core:build && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/**/*.d.ts\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/js-libs/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/cli-hooks/**/*.js\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/platforms/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/fetch/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css-value/**/*\" dist", + "cp LICENSE dist/packages/core", + "cd dist/packages/core && npm pack && mv *.tgz .." + ], + "cwd": ".", + "parallel": false } }, "unit": { "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --config=.mocharc.yml" - } + "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --config=.mocharc.yml" ], "cwd": "packages/core/__tests__", "parallel": false @@ -218,9 +198,7 @@ "builder": "@nrwl/workspace:run-commands", "options": { "commands": [ - { - "command": "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --watch --config=.mocharc.yml" - } + "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --watch --config=.mocharc.yml" ], "cwd": "packages/core/__tests__", "parallel": false @@ -239,18 +217,10 @@ "outputs": ["dist/packages"], "options": { "commands": [ - { - "command": "npx rimraf -- node_modules package-lock.json" - }, - { - "command": "npm i" - }, - { - "command": "../../node_modules/.bin/tsc -p tsconfig.json" - }, - { - "command": "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz" - } + "npx rimraf -- node_modules package-lock.json", + "npm i", + "../../node_modules/.bin/tsc -p tsconfig.json", + "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz" ], "cwd": "packages/core-compat", "parallel": false @@ -258,45 +228,43 @@ } } }, + "types": { + "root": "packages/types", + "sourceRoot": "packages/types", + "projectType": "library", + "schematics": {}, + "architect": { + "build": { + "builder": "@nrwl/workspace:run-commands", + "outputs": ["dist/packages"], + "options": { + "commands": [ + "mkdir -p ../../dist/packages/types", + "cp -R * ../../dist/packages/types" + ], + "cwd": "packages/types", + "parallel": false + } + } + } + }, "types-ios": { "root": "packages/types-ios", "sourceRoot": "packages/types-ios/src", "projectType": "library", "schematics": {}, "architect": { - "lint": { - "builder": "@nrwl/linter:lint", - "options": { - "linter": "eslint", - "config": "packages/types-ios/.eslintrc", - "tsConfig": [ - "packages/types-ios/tsconfig.lib.json", - "packages/types-ios/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**", - "!packages/types-ios/**" - ] - } - }, - "test": { - "builder": "@nrwl/jest:jest", - "options": { - "jestConfig": "packages/types-ios/jest.config.js", - "tsConfig": "packages/types-ios/tsconfig.spec.json", - "passWithNoTests": true - } - }, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", + "outputs": ["dist/packages"], "options": { - "outputPath": "dist/packages/types-ios", - "tsConfig": "packages/types-ios/tsconfig.lib.json", - "packageJson": "packages/types-ios/package.json", - "main": "packages/types-ios/src/index.ts", - "assets": [ - "packages/types-ios/*.md" - ] + "commands": [ + "mkdir -p ../../dist/packages/types-ios", + "cp -R src/* ../../dist/packages/types-ios", + "cp package.json *.md ../../dist/packages/types-ios" + ], + "cwd": "packages/types-ios", + "parallel": false } } } @@ -307,39 +275,17 @@ "projectType": "library", "schematics": {}, "architect": { - "lint": { - "builder": "@nrwl/linter:lint", - "options": { - "linter": "eslint", - "config": "packages/types-android/.eslintrc", - "tsConfig": [ - "packages/types-android/tsconfig.lib.json", - "packages/types-android/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**", - "!packages/types-android/**" - ] - } - }, - "test": { - "builder": "@nrwl/jest:jest", - "options": { - "jestConfig": "packages/types-android/jest.config.js", - "tsConfig": "packages/types-android/tsconfig.spec.json", - "passWithNoTests": true - } - }, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", + "outputs": ["dist/packages"], "options": { - "outputPath": "dist/packages/types-android", - "tsConfig": "packages/types-android/tsconfig.lib.json", - "packageJson": "packages/types-android/package.json", - "main": "packages/types-android/src/index.ts", - "assets": [ - "packages/types-android/*.md" - ] + "commands": [ + "mkdir -p ../../dist/packages/types-android", + "cp -R src/* ../../dist/packages/types-android", + "cp package.json *.md ../../dist/packages/types-android" + ], + "cwd": "packages/types-android", + "parallel": false } } }