chore: cleanup types

This commit is contained in:
Nathan Walker
2020-08-31 17:42:17 -07:00
parent 92d93fdf88
commit 57e646f512
23 changed files with 113 additions and 215 deletions

View File

@@ -30,6 +30,9 @@
"core-compat": {
"tags": []
},
"types": {
"tags": []
},
"types-ios": {
"tags": []
},

View File

@@ -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",

View File

@@ -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",

View File

@@ -1 +0,0 @@
{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

View File

@@ -1,3 +1,3 @@
# types-android
# @nativescript/types-android
This library was generated with [Nx](https://nx.dev).
NativeScript Types for Android

View File

@@ -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'
};

View File

@@ -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"
}

View File

@@ -1,7 +0,0 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["node", "jest"]
},
"include": ["**/*.ts"]
}

View File

@@ -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"]
}

View File

@@ -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"
]
}

View File

@@ -1 +0,0 @@
{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

View File

@@ -1,3 +1,3 @@
# types-ios
# @nativescript/types-ios
This library was generated with [Nx](https://nx.dev).
NativeScript Types for iOS

View File

@@ -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'
};

View File

@@ -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"
}

View File

@@ -1,7 +0,0 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["node", "jest"]
},
"include": ["**/*.ts"]
}

View File

@@ -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"]
}

View File

@@ -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"
]
}

3
packages/types/README.md Normal file
View File

@@ -0,0 +1,3 @@
# @nativescript/types
NativeScript Types for all supported platforms

2
packages/types/index.d.ts vendored Normal file
View File

@@ -0,0 +1,2 @@
/// <reference path="../types-android/index.d.ts" />
/// <reference path="../types-ios/index.d.ts" />

View File

@@ -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"
}
}

View File

@@ -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",

View File

@@ -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
}
}
}