diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 684f881c..00000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM node:14-buster - -# Configure apt -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get -y install --no-install-recommends apt-utils 2>&1 - -# Verify git and process tools are installed -RUN apt-get install -y git procps - -# Install yarn -RUN apt-get install -y curl apt-transport-https lsb-release \ - && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \ - && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get -y install --no-install-recommends \ - yarn - -# Clean up -RUN apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* -ENV DEBIAN_FRONTEND=dialog diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9aec3a02..c09a29bf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,10 +1,20 @@ { "name": "xterm.js", - "dockerFile": "Dockerfile", - "appPort": 3000, - "extensions": [ - "dbaeumer.vscode-eslint", - "editorconfig.editorconfig", - "hbenl.vscode-mocha-test-adapter" - ] + "image": "mcr.microsoft.com/devcontainers/typescript-node:0-18-buster", + "features": { + "ghcr.io/devcontainers/features/node:1": {} // yarn + }, + "forwardPorts": [ + 3000 + ], + "postCreateCommand": "yarn install", + "customizations": { + "vscode": { + "extensions": [ + "dbaeumer.vscode-eslint", + "editorconfig.editorconfig", + "hbenl.vscode-mocha-test-adapter" + ] + } + } } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1bc414d1..354f72c2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,10 +1,10 @@ pr: branches: - include: ["main", "v5"] + include: ["main"] trigger: branches: - include: ["main", "v5"] + include: ["main"] jobs: - job: Linux @@ -13,7 +13,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - task: YarnInstaller@3 inputs: @@ -46,7 +46,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - task: CacheBeta@1 inputs: @@ -66,7 +66,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - task: CacheBeta@1 inputs: @@ -95,7 +95,7 @@ jobs: displayName: Install required packages - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - task: YarnInstaller@3 inputs: @@ -111,11 +111,11 @@ jobs: # Integration tests are too flaky on macOS https://github.com/xtermjs/xterm.js/issues/3590 # - job: macOS_IntegrationTests # pool: -# vmImage: 'macOS-10.15' +# vmImage: 'macOS-11' # steps: # - task: NodeTool@0 # inputs: -# versionSpec: '14.x' +# versionSpec: '18.x' # displayName: 'Install Node.js' # - script: yarn --frozen-lockfile # displayName: 'Install dependencies and build' @@ -132,7 +132,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - script: yarn --frozen-lockfile displayName: 'Install dependencies and build' @@ -155,7 +155,7 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: '14.x' + versionSpec: '18.x' displayName: 'Install Node.js' - task: YarnInstaller@3 inputs: diff --git a/package.json b/package.json index 1423cab0..70a85a71 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@types/glob": "^7.2.0", "@types/jsdom": "^16.2.13", "@types/mocha": "^9.0.0", - "@types/node": "^14.14.44", + "@types/node": "^18.16.0", "@types/utf8": "^3.0.0", "@types/webpack": "^5.28.0", "@types/ws": "^8.2.0", diff --git a/yarn.lock b/yarn.lock index 22dd31e5..ecf9507e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -425,10 +425,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.50.tgz#14ba5198f1754ffd0472a2f84ab433b45ee0b65e" integrity sha512-+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA== -"@types/node@^14.14.44": - version "14.14.44" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" - integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== +"@types/node@^18.16.0": + version "18.16.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.16.tgz#3b64862856c7874ccf7439e6bab872d245c86d8e" + integrity sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g== "@types/parse5@*": version "6.0.2"