Merge dev into master

.eslintignore

@@ -0,0 +1,9 @@
+package.json
+.eslintrc.*
+
+tsconfig.json
+tsconfig.*.json
+
+dist/
+
+src/openapi/**/(!request)*

.eslintrc.cjs

@@ -0,0 +1,15 @@
+//  require('@spotify/web-scripts/config/eslintrc.js');
+module.exports = {
+  extends: ["@inferrinizzard/eslint-config"],
+  rules: {
+    "@typescript-eslint/unbound-method": "off",
+  },
+  overrides: [
+    {
+      files: "src/openapi/**/*",
+      rules: {
+        "@typescript-eslint/ban-tslint-comment": "off",
+      },
+    },
+  ],
+};

.github/workflows/pull-request-workflow.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint
       - run: yarn test

.gitignore

@@ -9,68 +9,29 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
 
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directories
 node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
 
 # Optional npm cache directory
 .npm
 
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
 # Yarn Integrity file
 .yarn-integrity
 
 # dotenv environment variables file
 .env
 
-# next.js build output
-.next
-
-# Visual Studio Code settings
-.vscode
-
 # Build output
-cjs
-esm
-types
+dist
 
 # Generated documentation
 docs

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn pre-commit

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn pre-push

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2019 Adam Grieger
+Copyright (c) 2023 inferrinizzard
+Copyright (c) 2019-2023 Adam Grieger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,23 +1,23 @@
 <p align="center">
-  <a href="https://github.com/adamgrieger/spotify-web-api-ts">
+  <a href="https://github.com/inferrinizzard/spotify-web-api">
     <img src="assets/logo.svg" height="100">
   </a>
 
-  <h3 align="center">spotify-web-api-ts</h3>
+  <h3 align="center">spotify-web-api</h3>
 
   <p align="center">
     An isomorphic TypeScript wrapper for Spotify's Web API
     <br />
-    <a href="https://adamgrieger.github.io/spotify-web-api-ts/"><strong>View the docs »</strong></a>
+    <a href="https://inferrinizzard.github.io/spotify-web-api/"><strong>View the docs »</strong></a>
     <br />
     <p align="center">
-      <img alt="npm" src="https://badgen.net/npm/v/spotify-web-api-ts"/>
-      <img alt="minzipped size" src="https://badgen.net/bundlephobia/minzip/spotify-web-api-ts">
-      <img alt="license" src="https://badgen.net/github/license/adamgrieger/spotify-web-api-ts">
+      <img alt="npm" src="https://badgen.net/npm/v/spotify-web-api"/>
+      <img alt="minzipped size" src="https://badgen.net/bundlephobia/minzip/spotify-web-api">
+      <img alt="license" src="https://badgen.net/github/license/inferrinizzard/spotify-web-api">
     </p>
     <p align="center">
-      <img alt="Master Workflow" src="https://github.com/adamgrieger/spotify-web-api-ts/workflows/Master%20Workflow/badge.svg"/>
-      <img alt="codecov" src="https://codecov.io/gh/adamgrieger/spotify-web-api-ts/branch/master/graph/badge.svg"/>
+      <img alt="Master Workflow" src="https://github.com/inferrinizzard/spotify-web-api/workflows/Master%20Workflow/badge.svg"/>
+      <img alt="codecov" src="https://codecov.io/gh/inferrinizzard/spotify-web-api/branch/master/graph/badge.svg"/>
       <img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg">
     </p>
   </p>
@@ -28,24 +28,29 @@
 ### yarn
 
 ```sh
-yarn add spotify-web-api-ts
+yarn add spotify-web-api
 ```
 
 ### npm
 
 ```sh
-npm install spotify-web-api-ts
+npm install spotify-web-api
 ```
 
 ## Basic Example
 
 ```typescript
-import { SpotifyWebApi } from 'spotify-web-api-ts';
+import { SpotifyWebApi } from "spotify-web-api";
 
-const spotify = new SpotifyWebApi({ accessToken: '<YOUR_ACCESS_TOKEN_HERE>' });
+const spotify = new SpotifyWebApi({ accessToken: "<YOUR_ACCESS_TOKEN_HERE>" });
 
-const { artists } = await spotify.albums.getAlbum('1uzfGk9vxMXfaZ2avqwxod');
+const { artists } = await spotify.albums.getAlbum("1uzfGk9vxMXfaZ2avqwxod");
 
-console.log(artists.map(artist => artist.name));
+console.log(artists.map((artist) => artist.name));
 // Array [ "Against All Logic" ]
 ```
+
+### Contributors
+
+- @inferrinizzard
+- @adamgrieger

package.json

@@ -1,43 +1,68 @@
 {
   "name": "spotify-web-api-ts",
-  "version": "1.0.0",
+  "version": "2.0.0-alpha-0",
   "description": "An isomorphic TypeScript wrapper for Spotify's Web API",
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "types": "types",
   "repository": "https://github.com/adamgrieger/spotify-web-api-ts.git",
   "author": "Adam Grieger",
   "license": "MIT",
+  "engines": {
+    "node": "^16.0.0 || >=18.0.0"
+  },
+  "type": "module",
+  "main": "dist/spotify-web-api.umd.js",
+  "module": "dist/spotify-web-api.cjs",
+  "types": "dist/spotify-web-api.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/spotify-web-api.cjs",
+      "require": "./dist/spotify-web-api.umd.js"
+    }
+  },
   "files": [
-    "cjs",
-    "esm",
-    "types",
+    "dist",
     "assets"
   ],
   "scripts": {
-    "build": "web-scripts build --project tsconfig.build.json",
-    "commit": "web-scripts commit",
-    "format": "web-scripts format",
-    "lint": "web-scripts lint",
-    "prepare": "web-scripts audit",
-    "release": "web-scripts release",
-    "test": "web-scripts test",
-    "generate-docs": "typedoc --out docs src/index.ts"
+    "build": "vite build",
+    "lint": "eslint src",
+    "lint:fix": "eslint --fix src",
+    "test:dom": "vitest run --environment jsdom",
+    "test:node": "vitest run --environment node",
+    "test": "yarn test:dom && yarn test:node",
+    "types": "tsc --project tsconfig.json",
+
+    "generate-api": "bash -c ./tools/generate-openapi.sh",
+    "generate-docs": "typedoc --out docs src/index.ts",
+
+    "pre-commit": "lint-staged",
+    "pre-push": "yarn lint:fix && yarn test"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "web-scripts commitmsg",
-      "pre-commit": "web-scripts precommit"
-    }
+  "lint-staged": {
+    "src/**/*": "eslint --fix",
+    "*.ts": "bash -c yarn types"
+  },
+  "dependencies": {
+    "axios": "^1.4.0",
+    "qs": "^6.9.4"
   },
   "devDependencies": {
-    "@spotify/web-scripts": "^8.0.2",
+    "@inferrinizzard/eslint-config": "^0.1.3",
     "@types/qs": "^6.9.4",
-    "husky": "^4.2.5",
-    "typedoc": "^0.18.0"
+    "eslint": "^8.47.0",
+    "form-data": "4.x",
+    "husky": "^8.0.3",
+    "jsdom": "^22.1.0",
+    "lint-staged": "^14.0.0",
+    "openapi-typescript-codegen": "^0.25.0",
+    "prettier": "^2.7.1",
+    "typedoc": "^0.18.0",
+    "typescript": "^5.1.6",
+    "vite": "^4.4.9",
+    "vite-plugin-dts": "^3.5.2",
+    "vitest": "^0.34.1"
   },
-  "dependencies": {
-    "axios": "^0.21.1",
-    "qs": "^6.9.4"
-  }
+  "contributors": [
+    "inferrinizzard",
+    "adamgrieger"
+  ]
 }