Skip to content

Commit

Permalink
Changed back libraries to commonjs and downgraded axios
Browse files Browse the repository at this point in the history
- tsc esm output has incomplete imports (missing ".js"). This can be resolved by adding ".js" (not ".ts") to the ts files' imports but that feels icky so it's probably best to stick with cjs.
- axios@1 has broken exports axios/axios#5008 and feels overall unstable so it's probably best to stay at @0 for the foreseeable future.
  • Loading branch information
squaresmile committed Dec 22, 2022
1 parent d197b65 commit 45ab9c1
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 55 deletions.
20 changes: 7 additions & 13 deletions packages/api-connector/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/api-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@atlasacademy/api-connector",
"type": "commonjs",
"version": "4.0.2",
"description": "Library to interface with api.atlasacademy.io",
"homepage": "https://github.com/atlasacademy/apps/tree/master/packages/api-connector",
Expand All @@ -20,7 +21,7 @@
"typescript": "^4.9.4"
},
"dependencies": {
"axios": "^1.2.1"
"axios": "^0.27.2"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/api-connector/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"module": "es6",
"target": "es6",
"lib": ["esnext", "dom"],
"module": "CommonJS",
"target": "ES6",
"lib": ["ESNext"],
"declaration": true,
"declarationMap": true,
"moduleResolution": "Node",
Expand Down
1 change: 1 addition & 0 deletions packages/api-descriptor/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@atlasacademy/api-descriptor",
"module": "commonjs",
"version": "2.0.3",
"description": "Library to describe entities from api.atlasacademy.io",
"homepage": "https://github.com/atlasacademy/apps/tree/master/packages/api-descriptor",
Expand Down
6 changes: 3 additions & 3 deletions packages/api-descriptor/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"module": "es6",
"target": "es6",
"lib": ["esnext", "dom"],
"module": "CommonJS",
"target": "ES6",
"lib": ["ESNext"],
"declaration": true,
"declarationMap": true,
"moduleResolution": "Node",
Expand Down
1 change: 1 addition & 0 deletions packages/battle/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@atlasacademy/battle",
"type": "commonjs",
"version": "0.5.2",
"description": "Library to run fgo battle simulations",
"homepage": "https://github.com/atlasacademy/apps/tree/master/packages/battle",
Expand Down
6 changes: 3 additions & 3 deletions packages/battle/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"module": "es6",
"target": "es6",
"lib": ["esnext", "dom"],
"module": "CommonJS",
"target": "ES6",
"lib": ["ESNext", "DOM"],
"declaration": true,
"declarationMap": true,
"esModuleInterop": true,
Expand Down
43 changes: 26 additions & 17 deletions packages/db/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/react-cytoscapejs": "^1.2.2",
"@types/react-dom": "^18.0.9",
"@types/react-router-dom": "^5.3.3",
"axios": "^1.2.1",
"axios": "^0.27.2",
"bootstrap": "^4.6.2",
"copy-to-clipboard": "^3.3.3",
"cytoscape": "^3.23.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/db/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"target": "ES6",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"module": "esnext",
"moduleResolution": "node",
"module": "ESNext",
"moduleResolution": "Node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
Expand Down
28 changes: 18 additions & 10 deletions packages/db/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
jsonpointer "^5.0.0"
leven "^3.1.0"

"@atlasacademy/api-connector@^4.0.0":
version "4.0.0"
resolved "https://registry.npmjs.org/@atlasacademy/api-connector/-/api-connector-4.0.0.tgz"
integrity sha512-E+gzYVQkTE7OZQ+IFDN3wUBok2qe+2USBisl4z/xRxlwx1aln4QmMvmV6uxkvM8W+V3ES1yyAXHZTN4FMmSypA==
"@atlasacademy/api-connector@^4.0.2":
version "4.0.2"
resolved "https://registry.npmjs.org/@atlasacademy/api-connector/-/api-connector-4.0.2.tgz"
integrity sha512-3x49Zw0LI0s7ra+EUgijn1KSiFVfMFLm4t5abs593kjtz+wo+8Xpqt021N6ZpWK2QTz/tOkDFQM4f51mXq4Dtg==
dependencies:
axios "^1.2.1"

"@atlasacademy/api-descriptor@^2.0.1":
version "2.0.1"
resolved "https://registry.npmjs.org/@atlasacademy/api-descriptor/-/api-descriptor-2.0.1.tgz"
integrity sha512-Y1bpkQcum6ynC0DEmOrMGAwUBXphgSgVBV8yKc4pilvcAE6UTRw82yzh+gLtcCndu3fgi4lXltMoqXHw48qImw==
"@atlasacademy/api-descriptor@^2.0.3":
version "2.0.3"
resolved "https://registry.npmjs.org/@atlasacademy/api-descriptor/-/api-descriptor-2.0.3.tgz"
integrity sha512-P5p72OWYSDOwXdJaojYbJga/jmc1DLsR0/CTMAieEcaWlhQvyUC+UO6DKiujAzWHML+DDux4k9Ri8QywpiQhxg==
dependencies:
"@atlasacademy/api-connector" "^4.0.0"
"@atlasacademy/api-connector" "^4.0.2"

"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3":
version "7.18.6"
Expand Down Expand Up @@ -4421,6 +4421,14 @@ axe-core@^4.4.3:
resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz"
integrity sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w==

axios@^0.27.2:
version "0.27.2"
resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
dependencies:
follow-redirects "^1.14.9"
form-data "^4.0.0"

axios@^1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz"
Expand Down Expand Up @@ -6558,7 +6566,7 @@ flux@~4.0.1:
fbemitter "^3.0.0"
fbjs "^3.0.1"

follow-redirects@^1.0.0, follow-redirects@^1.15.0:
follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
version "1.15.2"
resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
Expand Down

0 comments on commit 45ab9c1

Please sign in to comment.