From 6be3dabb62e2f9a6b9241c7ca3d647c29ff86ccf Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Wed, 28 Feb 2024 19:05:18 -0800 Subject: [PATCH] Upgrade ocular-dev-tools --- .eslintignore | 1 + .eslintrc.cjs | 1 + .ocularrc.js | 5 +- babel.config.cjs | 19 ------ modules/bench/package.json | 1 - modules/bench/tsconfig.json | 2 +- modules/env/package.json | 1 - modules/env/tsconfig.json | 2 +- modules/log/package.json | 1 - modules/log/tsconfig.json | 2 +- modules/react-bench/package.json | 1 - modules/react-bench/tsconfig.json | 2 +- modules/seer/tsconfig.json | 2 +- modules/stats-widget/package.json | 1 - modules/stats-widget/tsconfig.json | 2 +- modules/stats/package.json | 1 - modules/stats/tsconfig.json | 2 +- modules/test-utils/package.json | 1 - modules/test-utils/tsconfig.json | 2 +- package.json | 8 +-- tsconfig.build.json | 24 ++++--- tsconfig.json | 2 +- tsconfig.module.json | 24 +++++++ tsconfig.modules.json | 35 ---------- webpack.config.js | 100 ---------------------------- yarn.lock | 101 +++++------------------------ 26 files changed, 77 insertions(+), 266 deletions(-) delete mode 100644 babel.config.cjs create mode 100644 tsconfig.module.json delete mode 100644 tsconfig.modules.json delete mode 100644 webpack.config.js diff --git a/.eslintignore b/.eslintignore index a66d7a1f..29bc56e4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ dist/ node_modules/ coverage/ .nyc_output/ +examples/ diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 297a920b..2f456f0d 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -3,6 +3,7 @@ const {getESLintConfig} = require('ocular-dev-tools/configuration'); module.exports = getESLintConfig({ react: '16.8.2', overrides: { + parser: '', parserOptions: { project: ['./tsconfig.json'] }, diff --git a/.ocularrc.js b/.ocularrc.js index 3e026797..065b13dd 100644 --- a/.ocularrc.js +++ b/.ocularrc.js @@ -1,6 +1,9 @@ +/* @type import('ocular-dev-tools').OcularConfig */ export default { + babel: false, + typescript: { - project: 'tsconfig.modules.json' + project: 'tsconfig.build.json' }, lint: { diff --git a/babel.config.cjs b/babel.config.cjs deleted file mode 100644 index 060e498b..00000000 --- a/babel.config.cjs +++ /dev/null @@ -1,19 +0,0 @@ -const {getBabelConfig} = require('ocular-dev-tools/configuration'); - -module.exports = getBabelConfig({ - react: true, - overrides: { - plugins: [], - ignore: [ - // babel can't process .d.ts - /\.d\.ts$/ - ], - // These settings reduce the verbosity of transpile outputs - assumptions: { - // When declaring classes, assume that methods don't shadow getters on the superclass and that the program doesn't depend on methods being non-enumerable. - setClassMethods: true, - // When using public class fields, assume that they don't shadow any getter in the current class, in its subclasses or in its superclass. - setPublicClassFields: true - } - } -}); diff --git a/modules/bench/package.json b/modules/bench/package.json index f314f04c..e2e16a1a 100644 --- a/modules/bench/package.json +++ b/modules/bench/package.json @@ -28,7 +28,6 @@ "src" ], "dependencies": { - "@babel/runtime": "^7.0.0", "@probe.gl/log": "4.0.6" }, "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284" diff --git a/modules/bench/tsconfig.json b/modules/bench/tsconfig.json index dccc13b0..d14d3c68 100644 --- a/modules/bench/tsconfig.json +++ b/modules/bench/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/env/package.json b/modules/env/package.json index d361ba2c..371d7731 100644 --- a/modules/env/package.json +++ b/modules/env/package.json @@ -33,7 +33,6 @@ "./src/lib/globals.js" ], "dependencies": { - "@babel/runtime": "^7.0.0" }, "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284" } diff --git a/modules/env/tsconfig.json b/modules/env/tsconfig.json index 122f0d6c..e2cb21a9 100644 --- a/modules/env/tsconfig.json +++ b/modules/env/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/log/package.json b/modules/log/package.json index 78b2f467..8cb23faa 100644 --- a/modules/log/package.json +++ b/modules/log/package.json @@ -33,7 +33,6 @@ ], "browser": {}, "dependencies": { - "@babel/runtime": "^7.0.0", "@probe.gl/env": "4.0.6" }, "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284" diff --git a/modules/log/tsconfig.json b/modules/log/tsconfig.json index 1d5af6b1..cbe5a860 100644 --- a/modules/log/tsconfig.json +++ b/modules/log/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/react-bench/package.json b/modules/react-bench/package.json index ff5894e0..b84546b6 100644 --- a/modules/react-bench/package.json +++ b/modules/react-bench/package.json @@ -31,7 +31,6 @@ "src" ], "dependencies": { - "@babel/runtime": "^7.0.0", "css-loader": "^2.1.1", "react-table": "^6.10.0", "style-loader": "^1.1.3" diff --git a/modules/react-bench/tsconfig.json b/modules/react-bench/tsconfig.json index af17f6e2..3ded2a3e 100644 --- a/modules/react-bench/tsconfig.json +++ b/modules/react-bench/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/seer/tsconfig.json b/modules/seer/tsconfig.json index 669495a0..a2679754 100644 --- a/modules/seer/tsconfig.json +++ b/modules/seer/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/stats-widget/package.json b/modules/stats-widget/package.json index 7c0ee4f9..06340ae0 100644 --- a/modules/stats-widget/package.json +++ b/modules/stats-widget/package.json @@ -30,7 +30,6 @@ ], "sideEffects": false, "dependencies": { - "@babel/runtime": "^7.0.0" }, "peerDependencies": { "@probe.gl/stats": "^4.0.0" diff --git a/modules/stats-widget/tsconfig.json b/modules/stats-widget/tsconfig.json index 41e7a44a..712307c6 100644 --- a/modules/stats-widget/tsconfig.json +++ b/modules/stats-widget/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/stats/package.json b/modules/stats/package.json index beeb45d6..db09f39b 100644 --- a/modules/stats/package.json +++ b/modules/stats/package.json @@ -31,7 +31,6 @@ "src" ], "dependencies": { - "@babel/runtime": "^7.0.0" }, "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284" } diff --git a/modules/stats/tsconfig.json b/modules/stats/tsconfig.json index adfefd91..3e8b54ca 100644 --- a/modules/stats/tsconfig.json +++ b/modules/stats/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json index 32c3eee2..42579a23 100644 --- a/modules/test-utils/package.json +++ b/modules/test-utils/package.json @@ -33,7 +33,6 @@ "puppeteer": false }, "dependencies": { - "@babel/runtime": "^7.0.0", "@probe.gl/log": "4.0.6", "@types/pngjs": "^6.0.1", "pixelmatch": "^4.0.2" diff --git a/modules/test-utils/tsconfig.json b/modules/test-utils/tsconfig.json index 1fde76fc..3b894e17 100644 --- a/modules/test-utils/tsconfig.json +++ b/modules/test-utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.build.json", + "extends": "../../tsconfig.module.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/package.json b/package.json index 37439fac..efcf15b3 100644 --- a/package.json +++ b/package.json @@ -24,18 +24,18 @@ "scripts": { "bootstrap": "yarn && ocular-bootstrap", "clean": "ocular-clean", - "build": "npm run clean && time ocular-build", - "lint": "tsc && ocular-lint", + "build": "ocular-build", + "lint": "ocular-lint", "publish": "ocular-publish", "test": "ocular-test", "test-fast": "ocular-test fast", - "version": "ocular-build core" + "version": "ocular-build env" }, "devDependencies": { "@types/tape-promise": "^4.0.1", "jsdoc-to-markdown": "^3.0.0", "jsdom": "^16.5.0", - "ocular-dev-tools": "2.0.0-alpha.22", + "ocular-dev-tools": "2.0.0-alpha.26", "pre-commit": "^1.2.2", "puppeteer": "^22.0.0", "react-dom": "^16.13.1", diff --git a/tsconfig.build.json b/tsconfig.build.json index f6609e82..26636970 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -3,14 +3,22 @@ "extends": "./tsconfig.json", "compilerOptions": { "build": true, - "target": "es2020", - "module": "es2020", - "esModuleInterop": true, - "declaration": true, - "declarationMap": true, - "noEmit": false, - "emitDeclarationOnly": true // Uncomment to debug // "listEmittedFiles": true - } + }, + "references": [ + {"path": "modules/bench"}, + {"path": "modules/env"}, + {"path": "modules/log"}, + {"path": "modules/react-bench"}, + {"path": "modules/seer"}, + {"path": "modules/stats"}, + {"path": "modules/stats-widget"}, + {"path": "modules/test-utils"} + ], + "include": [ + "modules/core/src" + ], + "exclude": [ + ] } diff --git a/tsconfig.json b/tsconfig.json index 228905ff..b75b035f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ }, "compilerOptions": { "target": "es2020", - "module": "esnext", + "module": "es2020", "jsx": "react", "allowJs": true, "checkJs": true, diff --git a/tsconfig.module.json b/tsconfig.module.json new file mode 100644 index 00000000..97d210d6 --- /dev/null +++ b/tsconfig.module.json @@ -0,0 +1,24 @@ +// This is a base TS config for the individual packages, mainly for building .d.ts files +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "build": true, + "declaration": true, + "declarationMap": true, + "noEmit": false, + "useDefineForClassFields": false, + "plugins": [ + { + "transform": "ocular-dev-tools/ts-transform-version-inline" + }, + { + "transform": "ocular-dev-tools/ts-transform-append-extension", + "after": true + }, + { + "transform": "ocular-dev-tools/ts-transform-append-extension", + "afterDeclarations": true + } + ] + } +} diff --git a/tsconfig.modules.json b/tsconfig.modules.json deleted file mode 100644 index 63f4a5ee..00000000 --- a/tsconfig.modules.json +++ /dev/null @@ -1,35 +0,0 @@ -// This is a base TS config for the individual packages, mainly for building .d.ts files -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "build": true, - "module": "ES2020", - "esModuleInterop": true, - "declaration": true, - // Source map for declarations... not currently needed - // "declarationMap": true, - "noEmit": true, - // "emitDeclarationOnly": true, - // Uncomment to debug - "listEmittedFiles": true - }, - "references": [ - {"path": "modules/bench"}, - {"path": "modules/env"}, - {"path": "modules/log"}, - {"path": "modules/react-bench"}, - {"path": "modules/seer"}, - {"path": "modules/stats"}, - {"path": "modules/stats-widget"}, - {"path": "modules/test-utils"} - ], - "include": [ - "modules" - ], - "exclude": [ - "examples", - "test", - "modules/*/test", - "modules/*/dist" - ] -} diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index af09b3be..00000000 --- a/webpack.config.js +++ /dev/null @@ -1,100 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const {getWebpackConfig} = require('ocular-dev-tools'); - -module.exports = (env = {}) => { - let config = getWebpackConfig(env); - - config.devtool = 'source-map'; - - config = addBabelSettings(config); - - switch (env.mode) { - case 'perf': - config.entry = { - perf: './test/perf/index.js' - }; - break; - - default: - } - - // Log regex - // eslint-disable-next-line - Object.defineProperty(RegExp.prototype, 'toJSON', { - value: RegExp.prototype.toString - }); - - // Uncomment to debug config - // console.warn(JSON.stringify(config, null, 2)); - - return [config]; -}; - -function makeBabelRule() { - return { - // Compile source using babel - test: /(\.js|\.ts|\.tsx)$/, - loader: 'babel-loader', - include: [/modules\/.*\/src/, /modules\/.*\/test/], - exclude: [/node_modules/], - options: { - presets: [ - '@babel/preset-react', - '@babel/preset-typescript', - [ - '@babel/preset-env', - { - exclude: [/transform-async-to-generator/, /transform-regenerator/] - } - ] - ], - plugins: ['@babel/plugin-proposal-class-properties'] - } - }; -} - -function addBabelSettings(config) { - return { - ...config, - module: { - ...config.module, - rules: [ - ...config.module.rules.filter(r => r.loader !== 'babel-loader'), - makeBabelRule(), - // See https://github.com/apollographql/apollo-link-state/issues/302 - { - test: /\.mjs$/, - include: /node_modules/, - type: 'javascript/auto' - } - ] - }, - resolve: { - ...config.resolve, - extensions: ['.ts', '.tsx', '.js', '.json'] - } - }; -} -// const {getWebpackConfig} = require('ocular-dev-tools'); - -// const BABEL_CONFIG = { -// presets: ['@babel/env', '@babel/react'] -// }; - -// module.exports = (env) => { -// const config = getWebpackConfig(env); - -// // TODO - this is not being used by build process -// config.module.rules.push({ -// test: /react-bench.*\.js$/, -// exclude: /node_modules/, -// use: [ -// { -// loader: 'babel-loader', -// options: BABEL_CONFIG -// } -// ] -// }); - -// return config; -// }; diff --git a/yarn.lock b/yarn.lock index 9320e757..3f82f885 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1124,7 +1124,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.16.3", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.16.3", "@babel/runtime@^7.8.4": version "7.16.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== @@ -3962,23 +3962,6 @@ b4a@^1.6.4: resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba" integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg== -babel-loader@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" - integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-plugin-add-import-extension@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-add-import-extension/-/babel-plugin-add-import-extension-1.6.0.tgz#807ce65b38d4763797c1616cb4e8372da167cdd1" - integrity sha512-JVSQPMzNzN/S4wPRoKQ7+u8PlkV//BPUMnfWVbr63zcE+6yHdU2Mblz10Vf7qe+6Rmu4svF5jG7JxdcPi9VvKg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" @@ -3986,17 +3969,6 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-istanbul@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - babel-plugin-polyfill-corejs2@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz#6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f" @@ -6097,10 +6069,6 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -"esbuild-plugin-babel@git+https://github.com/Pessimistress/esbuild-plugin-babel.git#patch-1": - version "0.2.3" - resolved "git+https://github.com/Pessimistress/esbuild-plugin-babel.git#0c081a5436ae0e703d97eff28fe77edfc1e30e4a" - esbuild-plugin-external-global@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esbuild-plugin-external-global/-/esbuild-plugin-external-global-1.0.1.tgz#e3bba0e3a561f61b395bec0984a90ed0de06c4ce" @@ -6838,7 +6806,7 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" -find-cache-dir@^3.2.0, find-cache-dir@^3.3.1: +find-cache-dir@^3.2.0: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== @@ -8575,17 +8543,6 @@ istanbul-lib-instrument@^4.0.0: istanbul-lib-coverage "^3.0.0" semver "^6.3.0" -istanbul-lib-instrument@^5.0.4: - version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" - integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - istanbul-lib-instrument@^5.1.0: version "5.2.1" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" @@ -9059,7 +9016,7 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: +loader-utils@^1.1.0, loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -9291,7 +9248,7 @@ make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -9591,6 +9548,13 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" +minimatch@^3.0.0, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -9598,13 +9562,6 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - minimatch@^5.0.1: version "5.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" @@ -10267,10 +10224,10 @@ octokit-pagination-methods@^1.1.0: resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== -ocular-dev-tools@2.0.0-alpha.22: - version "2.0.0-alpha.22" - resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-2.0.0-alpha.22.tgz#a0b46c18c6085f93f9b3f115af60673bbba09717" - integrity sha512-nNP9ZbN7EuLm4MvcWiBvOocKv+BI/j/ZIFLkhNyuZvaoiyQrallQHzd4apD7cC0PjEFDUrAXnMz5PHkTnrEJtQ== +ocular-dev-tools@2.0.0-alpha.26: + version "2.0.0-alpha.26" + resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-2.0.0-alpha.26.tgz#57995e199ff9aa641c9e3a3e59e7d08bd4ec9ad6" + integrity sha512-TaObwQPJrew2sxchf48qKXSJCXfHdiq85RoiuyrWRQAlfDZkrT/e9iKdBLu7sY7ckmxrRndl99j8jcrLqBeCNw== dependencies: "@babel/cli" "^7.14.5" "@babel/core" "^7.14.5" @@ -10282,18 +10239,14 @@ ocular-dev-tools@2.0.0-alpha.22: "@babel/runtime" "7.14.5" "@esbuild-plugins/node-globals-polyfill" "^0.2.0" "@esbuild-plugins/node-modules-polyfill" "^0.2.0" - "@probe.gl/test-utils" "^4.0.3" + "@probe.gl/test-utils" "^4.0.6" "@typescript-eslint/eslint-plugin" "^6.14.0" "@typescript-eslint/parser" "^6.14.0" - babel-loader "8.2.2" - babel-plugin-add-import-extension "^1.6.0" - babel-plugin-istanbul "^6.0.0" babel-plugin-version-inline "^1.0.0" c8 "^7.12.0" coveralls "^3.0.3" deepmerge "^4.2.2" esbuild "^0.16.7" - esbuild-plugin-babel "git+https://github.com/Pessimistress/esbuild-plugin-babel.git#patch-1" esbuild-plugin-external-global "^1.0.1" eslint "^8.52.0" eslint-config-prettier "^6.7.0" @@ -10305,6 +10258,7 @@ ocular-dev-tools@2.0.0-alpha.22: eslint-plugin-react-hooks "^4.0.0" glob "^7.1.4" lerna "^3.14.1" + minimatch "^3.0.0" prettier "3.0.3" prettier-check "2.0.0" tape "^4.11.0" @@ -10313,7 +10267,6 @@ ocular-dev-tools@2.0.0-alpha.22: ts-patch "^3.1.2" tsconfig-paths "^4.1.1" typescript "^5.2.2" - url "^0.11.0" vite "^4.0.1" vite-plugin-html "^3.2.0" @@ -11177,11 +11130,6 @@ pumpify@^1.3.3: inherits "^2.0.3" pump "^2.0.0" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -11242,11 +11190,6 @@ query-string@^6.13.8: split-on-first "^1.0.0" strict-uri-encode "^2.0.0" -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -12014,7 +11957,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0: +schema-utils@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -13704,14 +13647,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - urlpattern-polyfill@10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"