From 329e86930ac4835a3baf74b6faa5d4b7de0987be Mon Sep 17 00:00:00 2001 From: Timothy Miller <46549361+timothymiller@users.noreply.github.com> Date: Wed, 13 Sep 2023 13:25:58 -0500 Subject: [PATCH] Update _nderscore vs code plugin config --- apps/expo/generate-tamagui-json.js | 6 ------ apps/expo/package.json | 1 - apps/next/tsconfig.json | 12 ++++++++++++ packages/api/wrangler.toml | 2 +- pnpm-lock.yaml | 21 ++++++++++++++++++--- tsconfig.json | 9 ++++++++- 6 files changed, 39 insertions(+), 12 deletions(-) delete mode 100644 apps/expo/generate-tamagui-json.js diff --git a/apps/expo/generate-tamagui-json.js b/apps/expo/generate-tamagui-json.js deleted file mode 100644 index 3db734361..000000000 --- a/apps/expo/generate-tamagui-json.js +++ /dev/null @@ -1,6 +0,0 @@ -const { loadTamagui } = require('@tamagui/static'); - -loadTamagui({ - config: 'tamagui.config.ts', - components: ['tamagui'], -}); \ No newline at end of file diff --git a/apps/expo/package.json b/apps/expo/package.json index 4a2f1eaa2..cdf9fad10 100755 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -20,7 +20,6 @@ "@babel/runtime": "^7.22.15", "@shopify/flash-list": "^1.5.0", "@t4/ui": "^2.0.0", - "@tamagui/static": "1.64.1", "app": "^2.0.0", "babel-plugin-module-resolver": "^4.1.0", "burnt": "^0.11.7", diff --git a/apps/next/tsconfig.json b/apps/next/tsconfig.json index 1fd412116..1fa0f77bd 100644 --- a/apps/next/tsconfig.json +++ b/apps/next/tsconfig.json @@ -24,6 +24,18 @@ "plugins": [ { "name": "next" + }, + { + "name": "@nderscore/tamagui-typescript-plugin", + "pathToApp": "apps/next", + "defaultTheme": "light", + "colorTileSize": 18, + "completionFilters": { + "showColorTokens": true, + "showTrueTokens": true, + "custom": { + } + } } ] }, diff --git a/packages/api/wrangler.toml b/packages/api/wrangler.toml index ad6a400e7..cac94b51f 100644 --- a/packages/api/wrangler.toml +++ b/packages/api/wrangler.toml @@ -1,5 +1,5 @@ name = "t4-api" -compatibility_date = "2023-08-07" +compatibility_date = "2023-09-04" send_metrics = false account_id = "719e3374c9fabba87860b809acb3c939" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c1d315847..736c6c718 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,9 +105,6 @@ importers: '@t4/ui': specifier: ^2.0.0 version: link:../../packages/ui - '@tamagui/static': - specifier: 1.64.1 - version: 1.64.1(react-dom@18.2.0)(react@18.2.0) app: specifier: ^2.0.0 version: link:../../packages/app @@ -4411,6 +4408,7 @@ packages: get-tsconfig: 4.7.0 lodash.debounce: 4.0.8 typescript: 5.2.2 + dev: true /@tamagui/button@1.64.1(react-native@0.72.4)(react@18.2.0): resolution: {integrity: sha512-d/q76FWQtduJrpYy320+sZUY/+KCQpl4x/OmY+xTikVbVVMNZZVdh4VgOcJXND5+aVYqO73kMUis7en3DHkBLw==} @@ -4462,6 +4460,7 @@ packages: /@tamagui/cli-color@1.64.1: resolution: {integrity: sha512-ygRsNWgZa4IE04e0NZLbBkuQny5/il4Q/o8ntaLBc4Thq8F18hLaSUZlnAtA//xCGFCC57Ucps8n3vt6+i6WEg==} + dev: true /@tamagui/collapsible@1.64.1(react@18.2.0): resolution: {integrity: sha512-Ctdn6d42lslzFOhhw+EAUiOY7Kba2FiNBoqeTy269GNGqx1pZ9LNKCLf2DBwKJsAl6h6ZIaqW++S1rAtajtmTQ==} @@ -4510,6 +4509,7 @@ packages: '@tamagui/shorthands': 1.64.1 transitivePeerDependencies: - react + dev: true /@tamagui/constants@1.64.1(react@18.2.0): resolution: {integrity: sha512-4qBLKNgOgmdNzkFgbAoi0CGPfQ4/TeINC7yBHTgSu0HFI31CBQ0/uTIKkA1H5ZYtcaOAiHsD/2u+NAbbdabpVw==} @@ -4665,6 +4665,7 @@ packages: - esbuild - react - supports-color + dev: true /@tamagui/get-button-sized@1.64.1(react-native@0.72.4)(react@18.2.0): resolution: {integrity: sha512-XFJQ+VPqXXIDeNiq9xJvPhYRrqJPwe3dX3hqtjbydWpPnob2QZEjhN/e9Yhr75N1jGbkFNFmNUXnsN9mU9Kucg==} @@ -4729,6 +4730,7 @@ packages: resolution: {integrity: sha512-219rbUYDztJ96017o8oQiwxYzdT1gtZH5H2y12Z9rxxKOOYAj7Z2T0W0rUm3QPcicewe9i6Wonj7NT8sSvlIsA==} dependencies: '@tamagui/types': 1.64.1 + dev: true /@tamagui/helpers-tamagui@1.64.1(react-native@0.72.4)(react@18.2.0): resolution: {integrity: sha512-omMSvCN5/rOby7yb48HsmFLwinbH7ZhZPlveglCQSi1I7GYzqPuJHvJTFiaiDUzakuGGWi5xKVBDlEQGKv/UVg==} @@ -4940,6 +4942,7 @@ packages: /@tamagui/proxy-worm@1.64.1: resolution: {integrity: sha512-+VRJCotdDsSYVvce/cEBpuKLvlA8z3AEIIJRo+RYPkBgWa88GnhLwVXjzAIoy7VkxxJqpeHED+hB4xQuQfCC9w==} + dev: true /@tamagui/radio-group@1.64.1(react-native@0.72.4)(react@18.2.0): resolution: {integrity: sha512-pCopHs7fryqBnfw9pbe4L689QwXrPTGLXIeK+Uej+K6OcpBnVSmlxwI3ypVVQuwk48qL1S3aT8XcMS1eJjkrWQ==} @@ -5172,6 +5175,7 @@ packages: - react - react-dom - supports-color + dev: true /@tamagui/switch@1.64.1(react-native@0.72.4)(react@18.2.0): resolution: {integrity: sha512-BTyGfWl3B+7uX1e3dsdm2u2W5vwWuCcfQht2jVK+V6mpqZR0kblR/RSak9MmHtkmVFX28bQJtOEhBt5IhTo/EA==} @@ -5321,6 +5325,7 @@ packages: /@tamagui/types@1.64.1: resolution: {integrity: sha512-mDsgpVI7BOPyRWCexmjR0zri0ZwruRZXPaxHuli3NMrD51akTup+Jfe5akaIklpkqXhBJ35Py9MtJuaoWLrOkQ==} + dev: true /@tamagui/use-callback-ref@1.64.1: resolution: {integrity: sha512-2lGMwNSD/6X8+v26VF/0xZcLsa8qnYchwyzHXt8xxdrTfCvVIdpIuB3PJro/6Wz0a0V2jjxlIlo8mSxAFbf1+A==} @@ -5659,6 +5664,7 @@ packages: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: '@types/node': 20.6.0 + dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} @@ -6726,6 +6732,7 @@ packages: '@babel/types': 7.22.17 transitivePeerDependencies: - supports-color + dev: true /babel-loader@9.1.3(@babel/core@7.22.17)(webpack@5.88.2): resolution: {integrity: sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==} @@ -8960,6 +8967,7 @@ packages: esbuild: 0.19.2 transitivePeerDependencies: - supports-color + dev: true /esbuild-sunos-64@0.14.47: resolution: {integrity: sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==} @@ -10069,6 +10077,7 @@ packages: commondir: 1.0.1 make-dir: 3.1.0 pkg-dir: 4.2.0 + dev: true /find-cache-dir@4.0.0: resolution: {integrity: sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==} @@ -10080,6 +10089,7 @@ packages: /find-root@1.1.0: resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} + dev: true /find-up@3.0.0: resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==} @@ -10206,6 +10216,7 @@ packages: graceful-fs: 4.2.11 jsonfile: 6.1.0 universalify: 2.0.0 + dev: true /fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} @@ -10373,6 +10384,7 @@ packages: resolution: {integrity: sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==} dependencies: resolve-pkg-maps: 1.0.0 + dev: true /getenv@1.0.0: resolution: {integrity: sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==} @@ -12171,6 +12183,7 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.1 + dev: true /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} @@ -14627,6 +14640,7 @@ packages: engines: {node: '>=8'} dependencies: find-up: 4.1.0 + dev: true /pkg-dir@7.0.0: resolution: {integrity: sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==} @@ -15577,6 +15591,7 @@ packages: /resolve-pkg-maps@1.0.0: resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true /resolve@1.22.4: resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==} diff --git a/tsconfig.json b/tsconfig.json index 1fbf44480..13465c571 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,14 @@ { "name": "@nderscore/tamagui-typescript-plugin", "pathToApp": "apps/next", - "defaultTheme": "light" + "defaultTheme": "light", + "colorTileSize": 18, + "completionFilters": { + "showColorTokens": true, + "showTrueTokens": true, + "custom": { + } + } } ] },