Skip to content

Commit

Permalink
chore: bump vscode to 1.78.2 (#500)
Browse files Browse the repository at this point in the history
* chore: use new dev port #478

* chore: bump vscode to 1.78.2
  • Loading branch information
conwnet committed Jun 4, 2023
1 parent b80443f commit f670b9d
Show file tree
Hide file tree
Showing 20 changed files with 231 additions and 169 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [5000],
"forwardPorts": [8080],

// Use 'postCreateCommand' to run commands after the container is created.
//"postCreateCommand": "yarn",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ out
node_modules
.yalc
yalc.lock
yarn-error.log
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tasks:
echo "Please wait for 'yarn watch' to complete compilation, then run 'yarn serve'"
echo "==========================================================================="
ports:
- port: 5000
- port: 8080
onOpen: open-browser
github:
prebuilds:
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ git clone [email protected]:conwnet/github1s.git
cd github1s
yarn
yarn watch
# The cli will automatically open http://localhost:5000 once the build is completed.
# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
# The cli will automatically open http://localhost:8080 once the build is completed.
# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
```

#### Local development with full VS Code build
Expand All @@ -84,8 +84,8 @@ After the initial successful build, you could use the watch mode:
cd github1s
yarn
yarn watch-with-vscode
# The cli will automatically open http://localhost:5000 once the build is completed.
# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
# The cli will automatically open http://localhost:8080 once the build is completed.
# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
```

### ... or ... VS Code + Docker Development
Expand All @@ -104,8 +104,8 @@ You can use the VS Code plugin [Remote-Containers](https://marketplace.visualstu
```bash
yarn
yarn watch
# The cli will automatically open http://localhost:5000 once the build is completed.
# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
# The cli will automatically open http://localhost:8080 once the build is completed.
# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
```

### Format all codes
Expand Down
2 changes: 1 addition & 1 deletion docs/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $ yarn
$ yarn watch # or yarn build, it may take minutes, wait please
```

Then, there will be a new directory named `dist` generated in the project root. The `yarn watch:dev-server` (part of `yarn watch` command) will automatically open http://localhost:5000 in the browser.
Then, there will be a new directory named `dist` generated in the project root. The `yarn watch:dev-server` (part of `yarn watch` command) will automatically open http://localhost:8080 in the browser.

If you get a 404 error for some static files, please wait a minute for the building to complete.

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lib": "lib"
},
"devDependencies": {
"@github1s/vscode-web": "0.9.0",
"@github1s/vscode-web": "0.10.0",
"@typescript-eslint/eslint-plugin": "^5.40.1",
"@typescript-eslint/parser": "^5.40.1",
"chokidar": "^3.5.3",
Expand Down Expand Up @@ -54,7 +54,7 @@
"webpack": "webpack --config webpack.config.js",
"format": "prettier --write .",
"eslint": "eslint --ext .ts --ext .js .",
"test:ci": "start-test watch:dev-server 5000 test",
"test:ci": "start-test watch:dev-server 8080 test",
"test": "cd tests && yarn && yarn jest"
},
"lint-staged": {
Expand Down
44 changes: 0 additions & 44 deletions scripts/serve-dist.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const resolvePlatformState = (): [Platform, string] => {
const repository = pathParts.length >= 2 ? pathParts.slice(0, 2).join('/') : '';
return [Platform.Bitbucket, repository];
}
if (hostname.match(/^(.*\.)?bitbucket1s\.org$/i)) {
if (hostname.match(/^(.*\.)?npmjs1s\.com$/i)) {
const trimmedParts = pathParts[0] === 'package' ? pathParts.slice(1) : pathParts;
const packageParts = trimmedParts.slice(0, trimmedParts[0] && trimmedParts[0][0] === '@' ? 2 : 1);
const repository = pathParts.length ? packageParts.join('/') || 'package' : '';
Expand Down
2 changes: 1 addition & 1 deletion tests/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const matchImageSnapshotOptions: MatchImageSnapshotOptions = {
let browser: Browser;
let page: Page;

const BASE_URL = 'http://localhost:5000';
const BASE_URL = 'http://localhost:8080';

beforeAll(async () => {
browser = await chromium.launch();
Expand Down
2 changes: 1 addition & 1 deletion tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"typescript": "^4.1.3"
},
"scripts": {
"test:ci": "start-server-and-test serve http://localhost:5000 test",
"test:ci": "start-server-and-test serve http://localhost:8080 test",
"test": "jest",
"test:watch": "jest --watchAll"
},
Expand Down
2 changes: 1 addition & 1 deletion vscode-web/.VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77.3
1.78.2
2 changes: 1 addition & 1 deletion vscode-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ yarn build # Build the GitHub1s & other extensions
yarn serve
```

And visit the http://localhost:5000 to verify the change. Please revert any changes related to `yalc` before commit, i.e. the `package.json`, the `.yalc/` and `yalc.lock` files.
And visit the http://localhost:8080 to verify the change. Please revert any changes related to `yalc` before commit, i.e. the `package.json`, the `.yalc/` and `yalc.lock` files.

## Publish

Expand Down
2 changes: 1 addition & 1 deletion vscode-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@github1s/vscode-web",
"version": "0.9.0",
"version": "0.10.0",
"description": "VS Code web for GitHub1s",
"author": "github1s",
"license": "MIT",
Expand Down
Loading

0 comments on commit f670b9d

Please sign in to comment.