From 1e5bbd5209574cecca7f6b81c1cdae28d10ee792 Mon Sep 17 00:00:00 2001 From: Kevin Barabash Date: Wed, 12 Jul 2023 19:11:07 -0400 Subject: [PATCH 1/2] Update node scripts consume @swc-node/register via shebang --- .swcrc | 5 -- config/build/gen-flow-types.ts | 1 + package.json | 10 +-- tsconfig.json | 8 +- utils/extract-strings.ts | 2 +- utils/pre-publish-check-ci.ts | 1 + yarn.lock | 146 ++++++++++++++++----------------- 7 files changed, 88 insertions(+), 85 deletions(-) delete mode 100644 .swcrc mode change 100644 => 100755 config/build/gen-flow-types.ts mode change 100644 => 100755 utils/extract-strings.ts mode change 100644 => 100755 utils/pre-publish-check-ci.ts diff --git a/.swcrc b/.swcrc deleted file mode 100644 index ced3b217c6..0000000000 --- a/.swcrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "module": { - "type": "es6" - } -} diff --git a/config/build/gen-flow-types.ts b/config/build/gen-flow-types.ts old mode 100644 new mode 100755 index d4fa03a6a0..a540a8388d --- a/config/build/gen-flow-types.ts +++ b/config/build/gen-flow-types.ts @@ -1,3 +1,4 @@ +#!/usr/bin/env -S node -r @swc-node/register import * as fs from "fs"; import * as path from "path"; diff --git a/package.json b/package.json index d193511d5e..070bf9776e 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "@storybook/builder-webpack5": "^6.4.19", "@storybook/manager-webpack5": "^6.4.19", "@storybook/react": "^6.4.19", - "@swc-node/register": "^1.6.2", - "@swc/core": "^1.3.42", + "@swc-node/register": "^1.6.6", + "@swc/core": "^1.3.68", "@testing-library/dom": "^8.11.0", "@testing-library/jest-dom": "^5.15.0", "@testing-library/react": "^12.1.2", @@ -126,16 +126,16 @@ "gen:parsers": "yarn --cwd packages/kas gen:parsers", "build": "yarn gen:parsers && rollup -c config/build/rollup.config.js", "build:types": "yarn tsc --build tsconfig-build.json", - "build:flowtypes": "SWCRC=true node -r @swc-node/register config/build/gen-flow-types.ts", + "build:flowtypes": "config/build/gen-flow-types.ts", "build:prodsizecheck": "yarn gen:parsers && rollup -c config/build/rollup.config.js --configEnvironment='production'", "watch": "rollup -c config/build/rollup.config.js --watch", "clean": "rm -rf packages/*/dist && rm -rf packages/*/node_modules && rm -rf .nyc_output && rm -f packages/*/*.tsbuildinfo", "coverage": "cross-env NODE_OPTIONS=--max_old_space_size=4096 yarn run jest --coverage", "coverage:types": "cross-env NODE_OPTIONS=--max_old_space_size=8192 typescript-coverage-report", - "extract-strings": "SWCRC=true node -r @swc-node/register utils/extract-strings.ts", + "extract-strings": "utils/extract-strings.ts", "lint": "eslint . --ext .js --ext .jsx --ext .ts --ext .tsx", "lint:timing": "cross-env TIMING=1 yarn lint", - "publish:ci": "SWCRC=true node -r @swc-node/register utils/pre-publish-check-ci.ts && git diff --stat --exit-code HEAD && yarn build && yarn build:types && yarn build:flowtypes && yarn extract-strings && changeset publish", + "publish:ci": "utils/pre-publish-check-ci.ts && git diff --stat --exit-code HEAD && yarn build && yarn build:types && yarn build:flowtypes && yarn extract-strings && changeset publish", "sloc": "sloc packages --exclude node_modules", "test": "yarn jest", "test:no-console-mock": "cross-env GLOBAL_CONSOLE_MOCK=false yarn jest", diff --git a/tsconfig.json b/tsconfig.json index 7b74418f68..82fb009fb7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,13 @@ "hubble": ["./vendor/hubble/hubble.js"], "jsdiff": ["./vendor/jsdiff/jsdiff.js"], "raphael": ["./vendor/raphael/raphael.js"], - "@khanacademy/*": ["./packages/*/src"] + "@khanacademy/kas": ["./packages/kas/src"], + "@khanacademy/kmath": ["./packages/kmath/src"], + "@khanacademy/math-input": ["./packages/math-input/src"], + "@khanacademy/perseus": ["./packages/perseus/src"], + "@khanacademy/perseus-*": ["./packages/perseus-*/src"], + "@khanacademy/pure-markdown": ["./packages/pure-markdown/src"], + "@khanacademy/simple-markdown": ["./packages/simple-markdown/src"], }, }, } diff --git a/utils/extract-strings.ts b/utils/extract-strings.ts old mode 100644 new mode 100755 index f1a769f34e..0f1c6dc695 --- a/utils/extract-strings.ts +++ b/utils/extract-strings.ts @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/env -S node -r @swc-node/register /** * Extracts i18n strings from each package and writes them out to /dist/strings.js. * diff --git a/utils/pre-publish-check-ci.ts b/utils/pre-publish-check-ci.ts old mode 100644 new mode 100755 index 15bfd9ff6a..efa2912d6f --- a/utils/pre-publish-check-ci.ts +++ b/utils/pre-publish-check-ci.ts @@ -1,3 +1,4 @@ +#!/usr/bin/env -S node -r @swc-node/register /** * Pre-publish checks to verify that our publish will go smoothly. */ diff --git a/yarn.lock b/yarn.lock index 7e4c548dc4..6dee1de45f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4238,17 +4238,17 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" -"@swc-node/core@^1.10.1": - version "1.10.1" - resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.10.1.tgz#fa1c5730353217936903b78086786b1285f3a167" - integrity sha512-4aiqLb5Uz+zDt7oIMAtH69+l1BvKV3k7fMYNNLjgdSM7qmFwrpHwu+Ss9nOYPTCFlbKCUMP/70aD5Gt2skmJaw== +"@swc-node/core@^1.10.4": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.10.4.tgz#3cb5ddb0171bbf541c17c713c91423799e67e0ec" + integrity sha512-ixZCb4LsSUPflnOxj4a8T5yTPzKbgvP+tF0N59Rk2+68ikFRt9Qci2qy9xfuDIQbuiONzXersrNpd+p598uH0A== -"@swc-node/register@^1.6.2": - version "1.6.2" - resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.6.2.tgz#51735130a0bcbd60322a3cd71f77739ed7b34a79" - integrity sha512-7kzUOrw5RhSW23VU9RtEOlH71MQZ4cfUPgu245f3tKjYIu1CkxNJVX48FAiGJ6+3QgJMXLr1anT9FeeCmX12xw== +"@swc-node/register@^1.6.6": + version "1.6.6" + resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.6.6.tgz#dfcf092b45c76d76d45949b1be8e17561566e2d9" + integrity sha512-KgnQrWLgtJzEgPpxvhOPUDonv1xreVumGdzXDQlDVIqU3vH+spW8ZYxxyjJVMh3G/mQG8E3bFvUMHIS+E3FL2w== dependencies: - "@swc-node/core" "^1.10.1" + "@swc-node/core" "^1.10.4" "@swc-node/sourcemap-support" "^0.3.0" colorette "^2.0.19" debug "^4.3.4" @@ -4263,71 +4263,71 @@ source-map-support "^0.5.21" tslib "^2.5.0" -"@swc/core-darwin-arm64@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.42.tgz#fabb645b288199b730d846e3eda370b77f5ebe9f" - integrity sha512-hM6RrZFyoCM9mX3cj/zM5oXwhAqjUdOCLXJx7KTQps7NIkv/Qjvobgvyf2gAb89j3ARNo9NdIoLjTjJ6oALtiA== - -"@swc/core-darwin-x64@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.42.tgz#dcd434ec8dda6f2178a10da0def036a071a6e008" - integrity sha512-bjsWtHMb6wJK1+RGlBs2USvgZ0txlMk11y0qBLKo32gLKTqzUwRw0Fmfzuf6Ue2a/w//7eqMlPFEre4LvJajGw== - -"@swc/core-linux-arm-gnueabihf@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.42.tgz#59c57b15113d316e8a4a6d690a6c09429483d201" - integrity sha512-Oe0ggMz3MyqXNfeVmY+bBTL0hFSNY3bx8dhcqsh4vXk/ZVGse94QoC4dd92LuPHmKT0x6nsUzB86x2jU9QHW5g== - -"@swc/core-linux-arm64-gnu@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.42.tgz#50d026b9f4d7a5f25deacc8c8dd45fc12be70a95" - integrity sha512-ZJsa8NIW1RLmmHGTJCbM7OPSbBZ9rOMrLqDtUOGrT0uoJXZnnQqolflamB5wviW0X6h3Z3/PSTNGNDCJ3u3Lqg== - -"@swc/core-linux-arm64-musl@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.42.tgz#3c0e51b0709dcf06289949803c9a36a46a97827c" - integrity sha512-YpZwlFAfOp5vkm/uVUJX1O7N3yJDO1fDQRWqsOPPNyIJkI2ydlRQtgN6ZylC159Qv+TimfXnGTlNr7o3iBAqjg== - -"@swc/core-linux-x64-gnu@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.42.tgz#059ac0acddebd0360851871929a14dbacf74f865" - integrity sha512-0ccpKnsZbyHBzaQFdP8U9i29nvOfKitm6oJfdJzlqsY/jCqwvD8kv2CAKSK8WhJz//ExI2LqNrDI0yazx5j7+A== - -"@swc/core-linux-x64-musl@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.42.tgz#7a61093d93a3abc2f893b7d31fd6c22c4cab2212" - integrity sha512-7eckRRuTZ6+3K21uyfXXgc2ZCg0mSWRRNwNT3wap2bYkKPeqTgb8pm8xYSZNEiMuDonHEat6XCCV36lFY6kOdQ== - -"@swc/core-win32-arm64-msvc@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.42.tgz#12f92c960ea801aa26ffa5b91d369ac24c2a3cca" - integrity sha512-t27dJkdw0GWANdN4TV0lY/V5vTYSx5SRjyzzZolep358ueCGuN1XFf1R0JcCbd1ojosnkQg2L7A7991UjXingg== - -"@swc/core-win32-ia32-msvc@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.42.tgz#be022aff03838515fa5506be300f0ea15f3fb476" - integrity sha512-xfpc/Zt/aMILX4IX0e3loZaFyrae37u3MJCv1gJxgqrpeLi7efIQr3AmERkTK3mxTO6R5urSliWw2W3FyZ7D3Q== - -"@swc/core-win32-x64-msvc@1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.42.tgz#fccac26974f03234e502276389f4330e2696887f" - integrity sha512-ra2K4Tu++EJLPhzZ6L8hWUsk94TdK/2UKhL9dzCBhtzKUixsGCEqhtqH1zISXNvW8qaVLFIMUP37ULe80/IJaA== - -"@swc/core@^1.3.42": - version "1.3.42" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.42.tgz#7067c4fd9a02536f9ca7b54ed8ebc45e2df810cf" - integrity sha512-nVFUd5+7tGniM2cT3LXaqnu3735Cu4az8A9gAKK+8sdpASI52SWuqfDBmjFCK9xG90MiVDVp2PTZr0BWqCIzpw== +"@swc/core-darwin-arm64@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.68.tgz#cf7fe9550a09eb18e6ceb30362da39886dbaf9d6" + integrity sha512-Z5pNxeuP2NxpOHTzDQkJs0wAPLnTlglZnR3WjObijwvdwT/kw1Y5EPDKM/BVSIeG40SPMkDLBbI0aj0qyXzrBA== + +"@swc/core-darwin-x64@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.68.tgz#83e1077a9a0f607f2a0050db2c9b288464c885cf" + integrity sha512-ZHl42g6yXhfX4PzAQ0BNvBXpt/OcbAHfubWRN6eXELK3fiNnxL7QBW1if7iizlq6iA+Mj1pwHyyUit1pz0+fgA== + +"@swc/core-linux-arm-gnueabihf@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.68.tgz#c2f7ed599eac5f85ae2ca018cb2df6ae256256cd" + integrity sha512-Mk8f6KCOQ2CNAR4PtWajIjS6XKSSR7ZYDOCf1GXRxhS3qEyQH7V8elWvqWYqHcT4foO60NUmxA/NOM/dQrdO1A== + +"@swc/core-linux-arm64-gnu@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.68.tgz#5f10476668bf68d671d0e23f754fb7192038b6df" + integrity sha512-RhBllggh9t9sIxaRgRcGrVaS7fDk6KsIqR6b9+dwU5OyDr4ZyHWw1ZaH/1/HAebuXYhNBjoNUiRtca6lKRIPgQ== + +"@swc/core-linux-arm64-musl@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.68.tgz#141c575acd84911801da5c93e5ee1b1a90d7e04b" + integrity sha512-8K3zjU+tFgn6yGDEeD343gkKaHU9dhz77NiVkI1VzwRaT/Ag5pwl5eMQ1yStm8koNFzn3zq6rGjHfI5g2yI5Wg== + +"@swc/core-linux-x64-gnu@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.68.tgz#d9d5ceb218bea38d312e04336b37a2b312c29cc3" + integrity sha512-4xAnvsBOyeTL0AB8GWlRKDM/hsysJ5jr5qvdKKI3rZfJgnnxl/xSX6TJKPsJ8gygfUJ3BmfCbmUmEyeDZ3YPvA== + +"@swc/core-linux-x64-musl@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.68.tgz#440174a638d86f0c4d53de632bd6782a5ae61b57" + integrity sha512-RCpaBo1fcpy1EFdjF+I7N4lfzOaHXVV0iMw/ABM+0PD6tp3V/9pxsguaZyeAHyEiUlDA6PZ4TfXv5zfnXEgW4Q== + +"@swc/core-win32-arm64-msvc@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.68.tgz#c04936c621e2990ff3e88896cc435c094edd3e29" + integrity sha512-v2WZvXrSslYEpY1nqpItyamL4DyaJinmOkXvM8Bc1LLKU5rGuvmBdjUYg/5Y+o0AUynuiWubpgHNOkBWiCvfqw== + +"@swc/core-win32-ia32-msvc@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.68.tgz#d4f75ead1fe56436d7cd3676b7d7b42bfeb952c1" + integrity sha512-HH5NJrIdzkJs+1xxprie0qSCMBeL9yeEhcC1yZTzYv8bwmabOUSdtKIqS55iYP/2hLWn9CTbvKPmLOIhCopW3Q== + +"@swc/core-win32-x64-msvc@1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.68.tgz#6ac56e87d994deb1917fc1b24285599e12e7a7b9" + integrity sha512-9HZVtLQUgK8r/yXQdwe0VBexbIcrY6+fBROhs7AAPWdewpaUeLkwQEJk6TbYr9CQuHw26FFGg6SjwAiqXF+kgQ== + +"@swc/core@^1.3.68": + version "1.3.68" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.68.tgz#f1eba0b90f529b0accb7910ef742be88d285e719" + integrity sha512-njGQuJO+Wy06dEayt70cf0c/KI3HGjm4iW9LLViVLBuYNzJ4SSdNfzejludzufu6im+dsDJ0i3QjgWhAIcVHMQ== optionalDependencies: - "@swc/core-darwin-arm64" "1.3.42" - "@swc/core-darwin-x64" "1.3.42" - "@swc/core-linux-arm-gnueabihf" "1.3.42" - "@swc/core-linux-arm64-gnu" "1.3.42" - "@swc/core-linux-arm64-musl" "1.3.42" - "@swc/core-linux-x64-gnu" "1.3.42" - "@swc/core-linux-x64-musl" "1.3.42" - "@swc/core-win32-arm64-msvc" "1.3.42" - "@swc/core-win32-ia32-msvc" "1.3.42" - "@swc/core-win32-x64-msvc" "1.3.42" + "@swc/core-darwin-arm64" "1.3.68" + "@swc/core-darwin-x64" "1.3.68" + "@swc/core-linux-arm-gnueabihf" "1.3.68" + "@swc/core-linux-arm64-gnu" "1.3.68" + "@swc/core-linux-arm64-musl" "1.3.68" + "@swc/core-linux-x64-gnu" "1.3.68" + "@swc/core-linux-x64-musl" "1.3.68" + "@swc/core-win32-arm64-msvc" "1.3.68" + "@swc/core-win32-ia32-msvc" "1.3.68" + "@swc/core-win32-x64-msvc" "1.3.68" "@testing-library/dom@^8.0.0", "@testing-library/dom@^8.11.0": version "8.13.0" From 28e5e635703ddb25b61c227a30164c7a9a66b844 Mon Sep 17 00:00:00 2001 From: Kevin Barabash Date: Wed, 12 Jul 2023 19:17:44 -0400 Subject: [PATCH 2/2] add empty changeset file --- .changeset/afraid-dancers-sleep.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/afraid-dancers-sleep.md diff --git a/.changeset/afraid-dancers-sleep.md b/.changeset/afraid-dancers-sleep.md new file mode 100644 index 0000000000..a845151cc8 --- /dev/null +++ b/.changeset/afraid-dancers-sleep.md @@ -0,0 +1,2 @@ +--- +---