Skip to content

Commit

Permalink
Revert "Update yarn sdks"
Browse files Browse the repository at this point in the history
This reverts commit 04fed09.
  • Loading branch information
dariober committed Apr 4, 2024
1 parent 463ff6c commit 257a7c0
Show file tree
Hide file tree
Showing 32 changed files with 92 additions and 1,511 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
echo "INSTANCE_ADDRESS=$INSTANCE_ADDRESS" >> "$GITHUB_OUTPUT"
- name: Set up SSH
run: |
mkdir --parents ~/.ssh
mkdir ~/.ssh
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/staging
chmod 600 ~/.ssh/staging
cat >>~/.ssh/config <<END
Expand Down
20 changes: 0 additions & 20 deletions .yarn/sdks/eslint/lib/unsupported-api.js

This file was deleted.

12 changes: 2 additions & 10 deletions .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
{
"name": "eslint",
"version": "8.51.0-sdk",
"version": "8.45.0-sdk",
"main": "./lib/api.js",
"type": "commonjs",
"bin": {
"eslint": "./bin/eslint.js"
},
"exports": {
"./package.json": "./package.json",
".": "./lib/api.js",
"./use-at-your-own-risk": "./lib/unsupported-api.js"
}
"type": "commonjs"
}
20 changes: 0 additions & 20 deletions .yarn/sdks/prettier/bin/prettier.cjs

This file was deleted.

File renamed without changes.
7 changes: 3 additions & 4 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "prettier",
"version": "3.0.3-sdk",
"main": "./index.cjs",
"type": "commonjs",
"bin": "./bin/prettier.cjs"
"version": "3.0.0-sdk",
"main": "./index.js",
"type": "commonjs"
}
6 changes: 3 additions & 3 deletions .yarn/sdks/typescript/lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript
// Setup the environment to be able to require typescript/lib/typescript.js
require(absPnpApiPath).setup();
}
}

// Defer to the real typescript your application uses
module.exports = absRequire(`typescript`);
// Defer to the real typescript/lib/typescript.js your application uses
module.exports = absRequire(`typescript/lib/typescript.js`);
8 changes: 2 additions & 6 deletions .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"name": "typescript",
"version": "5.2.2-sdk",
"version": "5.1.6-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
"tsc": "./bin/tsc",
"tsserver": "./bin/tsserver"
}
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion packages/apollo-collaboration-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@gmod/indexedfasta": "^2.0.4",
"@jbrowse/core": "^2.7.0",
"@mui/base": "^5.0.0-alpha.118",
"@mui/material": "^5.11.14",
"@mui/material": "^5.11.10",
"@nestjs/common": "^10.1.0",
"@nestjs/config": "^3.0.0",
"@nestjs/core": "^10.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
RefSeqChunkDocument,
RefSeqDocument,
} from 'apollo-schemas'
import { makeGFF3Feature, splitStringIntoChunks } from 'apollo-shared'
import { makeGFF3Feature } from 'apollo-shared'
import { Model } from 'mongoose'
import StreamConcat from 'stream-concat'

Expand Down Expand Up @@ -94,6 +94,15 @@ class FastaTransform extends Transform {
}
}

function splitStringIntoChunks(input: string, chunkSize: number): string[] {
const chunks: string[] = []
for (let i = 0; i < input.length; i += chunkSize) {
const chunk = input.slice(i, i + chunkSize)
chunks.push(chunk)
}
return chunks
}

@Injectable()
export class ExportService {
constructor(
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"tslib": "^2.3.1"
},
"peerDependencies": {
"@mui/material": "^5.11.14",
"@mui/x-data-grid": "^7.0.0",
"@mui/material": "^5.11.10",
"@mui/x-data-grid": "^6.0.1",
"mobx": "^6.6.1",
"mobx-react": "^7.2.1",
"mobx-state-tree": "^5.1.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo-shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"typescript": "^5.1.6"
},
"peerDependencies": {
"@mui/material": "^5.11.14",
"@mui/x-data-grid": "^7.0.0",
"@mui/material": "^5.11.10",
"@mui/x-data-grid": "^6.0.1",
"mobx": "^6.6.1",
"mobx-react": "^7.2.1",
"mobx-state-tree": "^5.1.7",
Expand Down
156 changes: 0 additions & 156 deletions packages/apollo-shared/src/Changes/StrandChange.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/apollo-shared/src/Changes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { DiscontinuousLocationStartChange } from './DiscontinuousLocationStartCh
import { FeatureAttributeChange } from './FeatureAttributeChange'
import { LocationEndChange } from './LocationEndChange'
import { LocationStartChange } from './LocationStartChange'
import { StrandChange } from './StrandChange'
import { TypeChange } from './TypeChange'
import { UserChange } from './UserChange'

Expand All @@ -29,7 +28,6 @@ export const changes = {
FeatureAttributeChange,
LocationEndChange,
LocationStartChange,
StrandChange,
TypeChange,
UserChange,
}
Expand All @@ -47,6 +45,5 @@ export * from './DiscontinuousLocationStartChange'
export * from './FeatureAttributeChange'
export * from './LocationEndChange'
export * from './LocationStartChange'
export * from './StrandChange'
export * from './TypeChange'
export * from './UserChange'
12 changes: 0 additions & 12 deletions packages/apollo-shared/src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,3 @@ export function makeGFF3Feature(
: [],
}))
}

export function splitStringIntoChunks(
input: string,
chunkSize: number,
): string[] {
const chunks: string[] = []
for (let i = 0; i < input.length; i += chunkSize) {
const chunk = input.slice(i, i + chunkSize)
chunks.push(chunk)
}
return chunks
}
6 changes: 3 additions & 3 deletions packages/jbrowse-plugin-apollo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
},
"peerDependencies": {
"@jbrowse/core": "^2.7.0",
"@mui/material": "^5.11.14",
"@mui/material": "^5.11.10",
"mobx": "^6.6.1",
"mobx-react": "^7.2.1",
"mobx-state-tree": "^5.1.7",
Expand All @@ -91,8 +91,8 @@
"@jbrowse/core": "^2.7.0",
"@jbrowse/development-tools": "^2.1.1",
"@jest/globals": "^29.0.3",
"@mui/material": "^5.11.14",
"@mui/x-data-grid": "^7.0.0",
"@mui/material": "^5.11.10",
"@mui/x-data-grid": "^6.0.1",
"@types/autosuggest-highlight": "^3",
"@types/file-saver": "^2",
"@types/node": "^18.14.2",
Expand Down
Loading

0 comments on commit 257a7c0

Please sign in to comment.