This is an automated email from the ASF dual-hosted git repository.
shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new 9553a14 Multiple Updates:
9553a14 is described below
commit 9553a14e4a5def3e19e5b551796825b3150c2deb
Author: Shane Dell <[email protected]>
AuthorDate: Tue Jun 28 13:38:24 2022 -0400
Multiple Updates:
- Create node script to handle pre and post build processes instead of
using OS commands
- Move location of script to download omega_edit. Also made it a static
script instead of one that is compiled.
- Remove run-script-os
- Create artifact class
Closes #121
---
.../scripts/omega_edit_download.ts | 76 +++++++++++++---------
build/scripts/process_build.ts | 56 ++++++++++++++++
package.json | 13 ++--
src/classes/artifact.ts | 62 ++++++++++++++++++
src/daffodilDebugger.ts | 43 +++++++-----
src/omega_edit/client.ts | 8 ++-
src/omega_edit/server.ts | 8 ++-
src/utils.ts | 1 +
tsconfig.json | 3 +-
yarn.lock | 44 ++++++-------
10 files changed, 230 insertions(+), 84 deletions(-)
diff --git a/src/omega_edit/download.ts b/build/scripts/omega_edit_download.ts
similarity index 68%
rename from src/omega_edit/download.ts
rename to build/scripts/omega_edit_download.ts
index d7c1718..27d50f9 100644
--- a/src/omega_edit/download.ts
+++ b/build/scripts/omega_edit_download.ts
@@ -15,40 +15,38 @@
* limitations under the License.
*/
-import * as fs from 'fs'
-import * as path from 'path'
-import * as os from 'os'
-import { HttpClient } from 'typed-rest-client/HttpClient'
-import * as crypto from 'crypto'
+// @ts-nocheck <-- This is needed as this file is basically a JavaScript script
+// but with some TypeScript niceness baked in
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const HttpClient = require('typed-rest-client/HttpClient').HttpClient
+const crypto = require('crypto')
const hashSum = crypto.createHash('sha512')
-// Method to get omega-edit version from a JSON file
-export function getOmegaEditPackageVersion(filePath: fs.PathLike) {
- return JSON.parse(fs.readFileSync(filePath).toString())['dependencies'][
- 'omega-edit'
- ]
-}
-
-// Method to get omegaEditServerHash from a JSON file
-export function getOmegaEditServerHash(filePath: fs.PathLike) {
- return
JSON.parse(fs.readFileSync(filePath).toString())['omegaEditServerHash']
-}
+/**
+ * The below classes (Backend, Artifact) are defined similarly in
src/classes/artifact.ts.
+ * However for this script to work properly they needed to be redefined in a
more JS style.
+ */
-export class Backend {
- constructor(readonly owner: string, readonly repo: string) {}
+class Backend {
+ constructor(owner, repo) {
+ this.owner = owner
+ this.repo = repo
+ }
}
-export class Artifact {
- constructor(readonly omegaEditVersion: string) {}
-
- name = `omega-edit-scala-server-${this.omegaEditVersion}`
- archive = `${this.name}.zip`
- archiveUrl = (backend: Backend) =>
-
`https://github.com/${backend.owner}/${backend.repo}/releases/download/v${this.omegaEditVersion}/${this.archive}`
-
- scriptName = os.platform().toLowerCase().startsWith('win32')
- ? 'example-grpc-server.bat'
- : './example-grpc-server'
+class Artifact {
+ constructor(omegaEditVersion) {
+ this.omegaEditVersion = omegaEditVersion
+ this.name = `omega-edit-scala-server-${this.omegaEditVersion}`
+ this.archive = `${this.name}.zip`
+ this.archiveUrl = (backend) =>
+
`https://github.com/${backend.owner}/${backend.repo}/releases/download/v${this.omegaEditVersion}/${this.archive}`
+ this.scriptName = os.platform().toLowerCase().startsWith('win32')
+ ? 'example-grpc-server.bat'
+ : './example-grpc-server'
+ }
getOsFolder() {
if (os.platform().toLowerCase().startsWith('win')) {
@@ -61,7 +59,19 @@ export class Artifact {
}
}
-export async function downloadServer() {
+// Method to get omega-edit version from a JSON file
+function getOmegaEditPackageVersion(filePath) {
+ return JSON.parse(fs.readFileSync(filePath).toString())['dependencies'][
+ 'omega-edit'
+ ]
+}
+
+// Method to get omegaEditServerHash from a JSON file
+function getOmegaEditServerHash(filePath) {
+ return
JSON.parse(fs.readFileSync(filePath).toString())['omegaEditServerHash']
+}
+
+async function downloadServer() {
// Get omegaEditVersion
const omegaEditVersion = getOmegaEditPackageVersion('./package.json')
const artifact = new Artifact(omegaEditVersion)
@@ -77,7 +87,7 @@ export async function downloadServer() {
const response = await client.get(artifactUrl)
if (response.message.statusCode !== 200) {
- const err: Error = new Error(
+ const err = new Error(
`Couldn't download the Ωedit sever backend from ${artifactUrl}.`
)
err['httpStatusCode'] = response.message.statusCode
@@ -116,3 +126,7 @@ export async function downloadServer() {
}
}
}
+
+module.exports = {
+ downloadServer: downloadServer,
+}
diff --git a/build/scripts/process_build.ts b/build/scripts/process_build.ts
new file mode 100644
index 0000000..01b8685
--- /dev/null
+++ b/build/scripts/process_build.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-nocheck <-- This is needed as this file is basically a JavaScript script
+// but with some TypeScript niceness baked in
+const fs = require('fs')
+const execSync = require('child_process').execSync
+
+function prebuild() {
+ fs.renameSync('LICENSE', 'tmp.LICENSE')
+ fs.renameSync('NOTICE', 'tmp.NOTICE')
+ fs.copyFileSync('build/bin.NOTICE', 'NOTICE')
+ fs.copyFileSync('build/bin.LICENSE', 'LICENSE')
+}
+
+function postbuild() {
+ fs.rmSync('LICENSE')
+ fs.rmSync('NOTICE')
+ fs.renameSync('tmp.LICENSE', 'LICENSE')
+ fs.renameSync('tmp.NOTICE', 'NOTICE')
+
+ // This will make sure that if the root LICENSE and NOTICE are the same as
the build LICENSE
+ // and NOTICE that they are reverted back to their original contents.
+ if (
+ fs.readFileSync('build/bin.LICENSE').toString() ===
+ fs.readFileSync('LICENSE').toString()
+ ) {
+ execSync('git checkout LICENSE')
+ }
+
+ if (
+ fs.readFileSync('build/bin.NOTICE').toString() ===
+ fs.readFileSync('NOTICE').toString()
+ ) {
+ execSync('git checkout NOTICE')
+ }
+}
+
+module.exports = {
+ postbuild: postbuild,
+ prebuild: prebuild,
+}
diff --git a/package.json b/package.json
index 8fcff4b..baeff5e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"url": "https://github.com/apache/daffodil-vscode/issues";
},
"scripts": {
- "omega-edit-download": "tsc -p ./ && node -e
\"require('./out/omega_edit/download.js').downloadServer()\"",
+ "omega-edit-download": "node -e
\"require('./build/scripts/omega_edit_download.ts').downloadServer()\"",
"vscode:prepublish": "yarn run package-ext",
"precompile": "node -p \"'export const LIB_VERSION = ' +
JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
"compile": "tsc -p ./ && yarn omega-edit-download",
@@ -37,13 +37,9 @@
"pretest": "yarn run compile",
"test": "node node_modules/mocha/bin/_mocha -u tdd --timeout 999999
--colors ./out/tests",
"sbt": "sbt universal:packageBin",
- "pre-build": "run-script-os",
- "pre-build:default": "mv LICENSE tmp.LICENSE && mv NOTICE tmp.NOTICE && cp
build/bin.LICENSE LICENSE && cp build/bin.NOTICE NOTICE",
- "pre-build:windows": "move LICENSE tmp.LICENSE && move NOTICE tmp.NOTICE
&& copy build/bin.LICENSE LICENSE && copy build/bin.NOTICE NOTICE",
- "build": "yarn pre-build && yarn sbt && yarn install && yarn compile &&
yarn package && yarn post-build",
- "post-build": "run-script-os",
- "post-build:default": "rm NOTICE && rm LICENSE && mv tmp.LICENSE LICENSE
&& mv tmp.NOTICE NOTICE",
- "post-build:windows": "del /q NOTICE && del /q LICENSE && move tmp.LICENSE
LICENSE && move tmp.NOTICE NOTICE"
+ "prebuild": "node -e
\"require('./build/scripts/process_build.ts').prebuild()\"",
+ "build": "yarn sbt && yarn install && yarn compile && yarn package",
+ "postbuild": "node -e
\"require('./build/scripts/process_build.ts').postbuild()\""
},
"dependencies": {
"@grpc/grpc-js": "^1.5.4",
@@ -54,7 +50,6 @@
"hexy": "0.3.4",
"moo": "0.5.1",
"omega-edit": "0.9.8",
- "run-script-os": "1.1.6",
"unzip-stream": "0.3.1",
"vscode-debugadapter": "1.51.0",
"xdg-app-paths": "7.3.0"
diff --git a/src/classes/artifact.ts b/src/classes/artifact.ts
new file mode 100644
index 0000000..c2fb36b
--- /dev/null
+++ b/src/classes/artifact.ts
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { LIB_VERSION } from '../version'
+import * as os from 'os'
+
+export class Backend {
+ constructor(readonly owner: string, readonly repo: string) {}
+}
+
+export class Artifact {
+ name: string
+ archive: string
+ scriptName: string
+
+ constructor(
+ readonly type: string,
+ readonly version: string,
+ readonly baseScriptName
+ ) {
+ this.name = type.includes('daffodil')
+ ? `${type}-${this.version}-${LIB_VERSION}`
+ : `${type}-${this.version}`
+ this.archive = `${this.name}.zip`
+ this.scriptName =
+ os.platform() === 'win32'
+ ? `${baseScriptName}.bat`
+ : `./${baseScriptName}`
+ }
+
+ archiveUrl = (backend: Backend) => {
+ if (this.type === 'omega-edit') {
+ return
`https://github.com/${backend.owner}/${backend.repo}/releases/download/v${this.version}/${this.archive}`
+ } else {
+ return ''
+ }
+ }
+
+ getOsFolder() {
+ if (os.platform().toLowerCase().startsWith('win')) {
+ return 'windows'
+ } else if (os.platform().toLowerCase().startsWith('darwin')) {
+ return 'macos'
+ } else {
+ return 'linux'
+ }
+ }
+}
diff --git a/src/daffodilDebugger.ts b/src/daffodilDebugger.ts
index c14add3..69abe21 100644
--- a/src/daffodilDebugger.ts
+++ b/src/daffodilDebugger.ts
@@ -26,22 +26,10 @@ import XDGAppPaths from 'xdg-app-paths'
import * as path from 'path'
import { regexp } from './utils'
import { getDaffodilVersion } from './daffodil'
+import { Artifact } from './classes/artifact'
const xdgAppPaths = XDGAppPaths({ name: 'daffodil-dap' })
-class Artifact {
- constructor(
- readonly daffodilVersion: string,
- readonly version: string = LIB_VERSION
- ) {}
-
- name = `daffodil-debugger-${this.daffodilVersion}-${this.version}`
- archive = `${this.name}.zip`
-
- scriptName =
- os.platform() === 'win32' ? 'daffodil-debugger.bat' : './daffodil-debugger'
-}
-
// Class for getting release data
export class Release {
name: string
@@ -91,7 +79,11 @@ export async function getDebugger(
const daffodilVersion = getDaffodilVersion(
context.asAbsolutePath('./package.json')
)
- const artifact = new Artifact(daffodilVersion)
+ const artifact = new Artifact(
+ 'daffodil-debugger',
+ daffodilVersion,
+ 'daffodil-debugger'
+ )
// If useExistingServer var set to false make sure version of debugger
entered is downloaded then ran
if (!config.useExistingServer) {
@@ -119,9 +111,11 @@ export async function getDebugger(
if (!filePath.includes('.vscode/extension')) {
if (!fs.existsSync(filePath)) {
let baseFolder = context.asAbsolutePath('.')
- child_process.execSync(
- `cd ${baseFolder} && sbt universal:packageBin`
- )
+ let command =
+ os.platform() === 'win32'
+ ? 'sbt universal:packageBin'
+ : '/bin/bash --login -c "sbt universal:packageBin"' // Needed
--login so it could resolve sbt command
+ child_process.execSync(command, { cwd: baseFolder })
}
}
@@ -200,11 +194,24 @@ export async function getDebugger(
: config.daffodilDebugClasspath
// Start debugger in terminal based on scriptName
+
+ /*
+ * For Mac if /bin/bash --login -c not used errors about compiled
version versus
+ * currently being used java version. Not sure if its needed for linux
but it
+ * being there will cause no issues.
+ */
+
+ let shellPath =
+ os.platform() === 'win32' ? artifact.scriptName : '/bin/bash'
+ let shellArgs =
+ os.platform() === 'win32' ? [] : ['--login', '-c', artifact.scriptName]
+
let terminal = vscode.window.createTerminal({
name: artifact.scriptName,
cwd:
`${rootPath}/daffodil-debugger-${daffodilVersion}-${LIB_VERSION}/bin/`,
hideFromUser: false,
- shellPath: artifact.scriptName,
+ shellPath: shellPath,
+ shellArgs: shellArgs,
env: {
DAFFODIL_DEBUG_CLASSPATH: daffodilDebugClasspath,
},
diff --git a/src/omega_edit/client.ts b/src/omega_edit/client.ts
index 0bf3572..510dc10 100644
--- a/src/omega_edit/client.ts
+++ b/src/omega_edit/client.ts
@@ -23,10 +23,16 @@ import * as omegaEditVersion from 'omega-edit/version'
import { startServer, stopServer } from './server'
import { randomId, viewportSubscribe } from './utils'
import { OmegaEdit } from './omega_edit'
-import { getOmegaEditPackageVersion } from './download'
let serverRunning = false
+// Method to get omega-edit version from a JSON file
+export function getOmegaEditPackageVersion(filePath: fs.PathLike) {
+ return JSON.parse(fs.readFileSync(filePath).toString())['dependencies'][
+ 'omega-edit'
+ ]
+}
+
async function cleanupViewportSession(
sessionId: string,
viewportIds: Array<string>
diff --git a/src/omega_edit/server.ts b/src/omega_edit/server.ts
index 1147b95..d52d6ed 100644
--- a/src/omega_edit/server.ts
+++ b/src/omega_edit/server.ts
@@ -21,7 +21,7 @@ import * as unzip from 'unzip-stream'
import * as child_process from 'child_process'
import * as path from 'path'
import * as os from 'os'
-import { Artifact } from './download'
+import { Artifact } from '../classes/artifact'
import XDGAppPaths from 'xdg-app-paths'
const xdgAppPaths = XDGAppPaths({ name: 'omega_edit' })
@@ -31,7 +31,11 @@ export async function startServer(
omegaEditVersion: string
) {
// Get omegaEditVersion
- const artifact = new Artifact(omegaEditVersion)
+ const artifact = new Artifact(
+ 'omega-edit-scala-server',
+ omegaEditVersion,
+ 'example-grpc-server'
+ )
const delay = (ms: number) => new Promise((res) => setTimeout(res, ms))
if (vscode.workspace.workspaceFolders) {
diff --git a/src/utils.ts b/src/utils.ts
index 2dc333e..4fbb45f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -18,6 +18,7 @@
import * as vscode from 'vscode'
const defaultConf = vscode.workspace.getConfiguration()
+// const
let currentConfig: vscode.ProviderResult<vscode.DebugConfiguration>
export const regexp = {
diff --git a/tsconfig.json b/tsconfig.json
index 75ad0fd..b3a4435 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,6 +43,7 @@
"esModuleInterop": true
},
"exclude": [
- "node_modules"
+ "node_modules",
+ "build/scripts"
]
}
diff --git a/yarn.lock b/yarn.lock
index e9a5f84..3f5e08e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36,9 +36,9 @@
"@jridgewell/trace-mapping" "^0.3.9"
"@jridgewell/resolve-uri@^3.0.3":
- version "3.0.8"
- resolved
"https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz#687cc2bbf243f4e9a868ecf2262318e2658873a1";
- integrity
sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w==
+ version "3.1.0"
+ resolved
"https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78";
+ integrity
sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
"@jridgewell/set-array@^1.0.1":
version "1.1.2"
@@ -120,17 +120,17 @@
integrity
sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
"@types/eslint-scope@^3.7.3":
- version "3.7.3"
- resolved
"https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224";
- integrity
sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+ version "3.7.4"
+ resolved
"https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16";
+ integrity
sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
"@types/eslint@*":
- version "8.4.3"
- resolved
"https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.3.tgz#5c92815a3838b1985c90034cd85f26f59d9d0ece";
- integrity
sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==
+ version "8.4.5"
+ resolved
"https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.5.tgz#acdfb7dd36b91cc5d812d7c093811a8f3d9b31e4";
+ integrity
sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
@@ -179,9 +179,9 @@
integrity
sha512-eXQpwnkI4Ntw5uJg6i2PINdRFWLr55dqjuYQaLHNjvqTzF14QdNWbCbml9sza0byyXNA0hZlHtcdN+VNDcgVHA==
"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0",
"@types/node@^18.0.0":
- version "18.0.0"
- resolved
"https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a";
- integrity
sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+ version "18.0.3"
+ resolved
"https://registry.yarnpkg.com/@types/node/-/node-18.0.3.tgz#463fc47f13ec0688a33aec75d078a0541a447199";
+ integrity
sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==
"@types/vscode@^1.55.0":
version "1.68.1"
@@ -532,9 +532,9 @@ camelcase@^6.0.0:
integrity
sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
caniuse-lite@^1.0.30001359:
- version "1.0.30001359"
- resolved
"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz#a1c1cbe1c2da9e689638813618b4219acbd4925e";
- integrity
sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==
+ version "1.0.30001363"
+ resolved
"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz#26bec2d606924ba318235944e1193304ea7c4f15";
+ integrity
sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==
chainsaw@~0.1.0:
version "0.1.0"
@@ -777,9 +777,9 @@ domutils@^3.0.1:
domhandler "^5.0.1"
electron-to-chromium@^1.4.172:
- version "1.4.172"
- resolved
"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.172.tgz#87335795a3dc19e7b6dd5af291038477d81dc6b1";
- integrity
sha512-yDoFfTJnqBAB6hSiPvzmsBJSrjOXJtHSJoqJdI/zSIh7DYupYnIOHt/bbPw/WE31BJjNTybDdNAs21gCMnTh0Q==
+ version "1.4.180"
+ resolved
"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.180.tgz#380b06037836055d12c7de181ee90b8ed911c3e7";
+ integrity
sha512-7at5ash3FD9U5gPa3/wPr6OdiZd/zBjvDZaaHBpcqFOFUhZiWnb7stkqk8xUFL9H9nk7Yok5vCCNK8wyC/+f8A==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -816,9 +816,9 @@ enhanced-resolve@^5.9.3:
tapable "^2.2.0"
entities@^4.2.0, entities@^4.3.0:
- version "4.3.0"
- resolved
"https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656";
- integrity
sha512-/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg==
+ version "4.3.1"
+ resolved
"https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz#c34062a94c865c322f9d67b4384e4169bcede6a4";
+ integrity
sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==
entities@~2.1.0:
version "2.1.0"
@@ -1781,7 +1781,7 @@ rimraf@^3.0.0:
dependencies:
glob "^7.1.3"
[email protected], run-script-os@^1.1.6:
+run-script-os@^1.1.6:
version "1.1.6"
resolved
"https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347";
integrity
sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==
