Explorar el Código

housekeeping: `@kyleshockey/js-yaml` -> `js-yaml` (via #5511)

* `@kyleshockey/js-yaml` -> `js-yaml`

* externalize `esprima`
bubble
kyle hace 5 años
committed by GitHub
padre
commit
2af696dcc1
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: 4AEE18F83AFDEB23
Se han modificado 5 ficheros con 18 adiciones y 12 borrados
  1. +14
    -6
      package-lock.json
  2. +1
    -1
      package.json
  3. +1
    -1
      src/core/plugins/configs/helpers.js
  4. +1
    -1
      src/core/plugins/spec/actions.js
  5. +1
    -3
      webpack/_config-builder.js

+ 14
- 6
package-lock.json Ver fichero

@@ -1455,7 +1455,7 @@
}, },
"onetime": { "onetime": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true "dev": true
}, },
@@ -7839,8 +7839,7 @@
"esprima": { "esprima": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
"dev": true
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
}, },
"esquery": { "esquery": {
"version": "1.0.1", "version": "1.0.1",
@@ -11417,6 +11416,15 @@
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
}, },
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"jsbn": { "jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -12705,7 +12713,7 @@
}, },
"onetime": { "onetime": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true "dev": true
}, },
@@ -13091,7 +13099,7 @@
}, },
"onetime": { "onetime": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true "dev": true
}, },
@@ -14821,7 +14829,7 @@
}, },
"onetime": { "onetime": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true "dev": true
}, },


+ 1
- 1
package.json Ver fichero

@@ -49,7 +49,6 @@
"dependencies": { "dependencies": {
"@babel/runtime-corejs2": "^7.5.5", "@babel/runtime-corejs2": "^7.5.5",
"@braintree/sanitize-url": "^2.0.2", "@braintree/sanitize-url": "^2.0.2",
"@kyleshockey/js-yaml": "^1.0.1",
"@kyleshockey/object-assign-deep": "^0.4.2", "@kyleshockey/object-assign-deep": "^0.4.2",
"@kyleshockey/xml": "^1.0.2", "@kyleshockey/xml": "^1.0.2",
"base64-js": "^1.2.0", "base64-js": "^1.2.0",
@@ -61,6 +60,7 @@
"ieee754": "^1.1.8", "ieee754": "^1.1.8",
"immutable": "^3.x.x", "immutable": "^3.x.x",
"js-file-download": "^0.4.1", "js-file-download": "^0.4.1",
"js-yaml": "^3.13.1",
"lodash": "^4.17.14", "lodash": "^4.17.14",
"memoizee": "^0.4.12", "memoizee": "^0.4.12",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",


+ 1
- 1
src/core/plugins/configs/helpers.js Ver fichero

@@ -1,4 +1,4 @@
import YAML from "@kyleshockey/js-yaml"
import YAML from "js-yaml"


export const parseYamlConfig = (yaml, system) => { export const parseYamlConfig = (yaml, system) => {
try { try {


+ 1
- 1
src/core/plugins/spec/actions.js Ver fichero

@@ -1,4 +1,4 @@
import YAML from "@kyleshockey/js-yaml"
import YAML from "js-yaml"
import { Map } from "immutable" import { Map } from "immutable"
import parseUrl from "url-parse" import parseUrl from "url-parse"
import serializeError from "serialize-error" import serializeError from "serialize-error"


+ 1
- 3
webpack/_config-builder.js Ver fichero

@@ -96,6 +96,7 @@ export default function buildConfig(
? { ? {
// json-react-schema/deeper depends on buffertools, which fails. // json-react-schema/deeper depends on buffertools, which fails.
buffertools: true, buffertools: true,
esprima: true,
} }
: (context, request, cb) => { : (context, request, cb) => {
// webpack injects some stuff into the resulting file, // webpack injects some stuff into the resulting file,
@@ -114,9 +115,6 @@ export default function buildConfig(
resolve: { resolve: {
modules: [path.join(projectBasePath, "./src"), "node_modules"], modules: [path.join(projectBasePath, "./src"), "node_modules"],
extensions: [".web.js", ".js", ".jsx", ".json", ".less"], extensions: [".web.js", ".js", ".jsx", ".json", ".less"],
alias: {
"js-yaml": "@kyleshockey/js-yaml", // TODO: fix??
},
}, },


// If we're mangling, size is a concern -- so use trace-only sourcemaps // If we're mangling, size is a concern -- so use trace-only sourcemaps


Cargando…
Cancelar
Guardar