Move SDK from src/sdk to src/

packages/common/src/adapters/accessConditionsFromSDK.ts

@@ -5,7 +5,7 @@ import {
   instanceOfNftGate,
   instanceOfFollowGate,
   instanceOfPurchaseGate
-} from '@audius/sdk/src/sdk/api/generated/full'
+} from '@audius/sdk/src/api/generated/full'
 
 import {
   AccessConditions,

packages/common/src/api/tan-query/useLibraryTracks.ts

@@ -2,7 +2,7 @@ import { Id } from '@audius/sdk'
 import {
   GetUserLibraryTracksSortMethodEnum,
   GetUserLibraryTracksSortDirectionEnum
-} from '@audius/sdk/src/sdk/api/generated/full/apis/UsersApi'
+} from '@audius/sdk/src/api/generated/full/apis/UsersApi'
 import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query'
 import { useDispatch } from 'react-redux'
 

packages/common/src/services/explore/Explore.ts

@@ -3,7 +3,7 @@ import {
   FullPlaylistWithScoreResponse,
   GetBestNewReleasesWindowEnum,
   FullPlaylistWithScore
-} from '@audius/sdk/src/sdk/api/generated/full'
+} from '@audius/sdk/src/api/generated/full'
 
 import {
   trackActivityFromSDK,

packages/create-audius-app/README.md

@@ -1,6 +1,6 @@
 # Create Audius App
 
-The easiest way to start building on Audius is by using `create-audius-app`. This CLI tool enables you to quickly start building a new Audius application, with everything set up for you. You can create a new app using the default Audius react template, or by using one of the [examples](https://github.com/AudiusProject/audius-protocol/tree/main/packages/libs/src/sdk/examples). To get started, use the following command:
+The easiest way to start building on Audius is by using `create-audius-app`. This CLI tool enables you to quickly start building a new Audius application, with everything set up for you. You can create a new app using the default Audius react-hono template, or by using one of the [examples](https://github.com/AudiusProject/audius-protocol/tree/main/packages/create-audius-app/examples). To get started, use the following command:
 
 ### Interactive
 
@@ -26,7 +26,7 @@ Options:
   -e, --example [name]|[github-url]
 
     An example to bootstrap the app with. You can use an example name
-    from the Audius repo. They are found in AudiusProject/audius-protocol/packages/libs/src/sdk/examples
+    from the Audius repo. They are found in AudiusProject/audius-protocol/packages/create-audius-app/examples
 
   -h, --help                           output usage information
 ```

packages/libs/.eslintignore

@@ -1,2 +1 @@
 src/data-contracts/signatureSchemas.js
-src/sdk/examples

packages/libs/package.json

@@ -26,8 +26,8 @@
   "scripts": {
     "test": "npm run test:unit && npm run test:sdk",
     "test:libs": "./scripts/test.sh",
-    "test:unit": "export TS_NODE_PROJECT=libs.test.tsconfig.json; ts-mocha 'src/**/*.test.{js,ts}' --ignore 'src/sdk/**/*.test.{js,ts}' --exit",
-    "test:unit:watch": "ts-mocha 'src/[!sdk]**/*.test.{js,ts}' --ignore 'src/sdk/**/*.test.{js,ts}' --watch",
+    "test:unit": "export TS_NODE_PROJECT=libs.test.tsconfig.json; ts-mocha 'src/**/*.test.{js,ts}' --ignore 'src/**/*.test.{js,ts}' --exit",
+    "test:unit:watch": "ts-mocha 'src/[!sdk]**/*.test.{js,ts}' --ignore 'src/**/*.test.{js,ts}' --watch",
     "test:integration": "ts-mocha tests/index.js",
     "setup": "./scripts/migrate_contracts.sh",
     "build": "rm -rf ./dist && rollup -c --configPlugin typescript",

packages/libs/tsconfig.json

@@ -17,6 +17,6 @@
     "declarationDir": "dist",
     "noPropertyAccessFromIndexSignature": false
   },
-  "exclude": ["dist", "src/sdk/examples"],
+  "exclude": ["dist"],
   "include": ["src/**/*"]
 }

packages/sdk/.eslintignore

@@ -1,2 +1 @@
-src/sdk/examples
-src/sdk/scripts
+src/scripts

packages/sdk/jest.config.js

@@ -124,7 +124,7 @@ const config = {
   // rootDir: undefined,
 
   // A list of paths to directories that Jest should use to search for files in
-  roots: ['<rootDir>/src/sdk']
+  roots: ['<rootDir>/src']
 
   // Allows you to use a custom runner instead of Jest's default test runner
   // runner: "jest-runner",

packages/sdk/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@audius/sdk",
   "version": "8.0.1",
+  "type": "module",
   "audius": {
     "releaseSHA": "f1d70a2a0643c5c84d8ab053f70c1e0a2ec3ad49"
   },
@@ -57,18 +58,19 @@
     "lint:fix": "npm run lint -- --fix",
     "typecheck": "tsc --noEmit",
     "verify": "npm run lint && npm run typecheck",
-    "sdk:config": "tsx ./src/sdk/scripts/generateServicesConfig.ts",
-    "sdk:verify-user": "tsx ./src/sdk/scripts/verifyUser.ts",
+    "sdk:config": "tsx ./scripts/generateServicesConfig.ts",
+    "sdk:verify-user": "tsx ./scripts/verifyUser.ts",
+    "sdk:claim-rewards": "tsx ./scripts/claimRewards.ts",
     "gen": "npm run gen:prod",
     "gen:dev": "npm run gen:dev:default ; npm run gen:dev:full",
-    "gen:dev:default": "node ./src/sdk/api/generator/gen.js --env dev",
-    "gen:dev:full": "node ./src/sdk/api/generator/gen.js --env dev --api-flavor full",
+    "gen:dev:default": "node ./src/api/generator/gen.js --env dev",
+    "gen:dev:full": "node ./src/api/generator/gen.js --env dev --api-flavor full",
     "gen:stage": "npm run gen:stage:default ; npm run gen:stage:full",
-    "gen:stage:default": "node ./src/sdk/api/generator/gen.js --env stage",
-    "gen:stage:full": "node ./src/sdk/api/generator/gen.js --env stage --api-flavor full",
+    "gen:stage:default": "node ./src/api/generator/gen.js --env stage",
+    "gen:stage:full": "node ./src/api/generator/gen.js --env stage --api-flavor full",
     "gen:prod": "npm run gen:prod:default ; npm run gen:prod:full",
-    "gen:prod:default": "node ./src/sdk/api/generator/gen.js",
-    "gen:prod:full": "node ./src/sdk/api/generator/gen.js --api-flavor full",
+    "gen:prod:default": "node ./src/api/generator/gen.js",
+    "gen:prod:full": "node ./src/api/generator/gen.js --api-flavor full",
     "prepare": "patch-package",
     "prepack": "turbo run build"
   },
@@ -94,7 +96,7 @@
     "form-data": "3.0.0",
     "hashids": "2.2.10",
     "isomorphic-ws": "5.0.0",
-    "lodash": "4.17.21",
+    "lodash-es": "4.17.21",
     "micro-aes-gcm": "0.4.0",
     "multiformats": "13.3.1",
     "node-abort-controller": "3.1.1",
@@ -129,14 +131,13 @@
     "@types/expect": "24.3.0",
     "@types/form-data": "2.5.0",
     "@types/hashids": "2.0.1",
-    "@types/lodash": "4.14.149",
     "@types/node": "18.17.0",
     "@types/node-localstorage": "1.3.0",
     "@types/pify": "5.0.1",
     "@types/proper-url-join": "2.1.1",
     "@types/semver": "7.3.9",
     "babel-plugin-dynamic-import-node": "2.3.3",
-    "commander": "9.2.0",
+    "commander": "13.1.0",
     "crypto-browserify": "^3.12.0",
     "esm": "3.2.25",
     "ethereumjs-wallet": "^1.0.2",

packages/sdk/rollup.config.ts

@@ -110,7 +110,7 @@ export const outputConfigs = {
    * Used by the Audius React Native client
    */
   sdkConfigReactNative: {
-    input: 'src/sdk/index.ts',
+    input: 'src/index.ts',
     output: [
       {
         dir: 'dist',
@@ -141,7 +141,7 @@ export const outputConfigs = {
    * - Makes external ES modules internal to prevent issues w/ using require()
    */
   sdkBrowserConfigCjs: {
-    input: 'src/sdk/index.ts',
+    input: 'src/index.ts',
     output: [
       {
         dir: 'dist',
@@ -180,7 +180,7 @@ export const outputConfigs = {
    * - Includes deps that are ignored or polyfilled for browser
    */
   sdkBrowserConfigEs: {
-    input: 'src/sdk/index.ts',
+    input: 'src/index.ts',
     output: [
       {
         dir: 'dist',
@@ -221,7 +221,7 @@ export const outputConfigs = {
    * - Includes all deps/dev deps
    */
   sdkBrowserDistConfig: {
-    input: 'src/sdk/sdkBrowserDist.ts',
+    input: 'src/sdkBrowserDist.ts',
     output: [
       {
         file: 'dist/sdk.min.js',