From 680faf757b76b9e880a13d96898ad0195edabcb2 Mon Sep 17 00:00:00 2001 From: Warren Parad Date: Thu, 25 Jan 2024 22:43:51 +0100 Subject: [PATCH] Revert "Convert to module to make it easier to build/test/validate/import." This reverts commit b3c325e55dcbf4b86fc95508444b89cd40482eae. --- .vscode/launch.json | 28 ------------------- babel.config.cjs => babel.config.js | 0 ...st.unit.config.cjs => jest.unit.config.js} | 0 ...onfig.cjs => jest.unit.coverage.config.js} | 2 +- ...nfig.babel.cjs => browser.config.babel.js} | 22 +++++++-------- package.json | 6 ++-- 6 files changed, 14 insertions(+), 44 deletions(-) delete mode 100644 .vscode/launch.json rename babel.config.cjs => babel.config.js (100%) rename config/jest/{jest.unit.config.cjs => jest.unit.config.js} (100%) rename config/jest/{jest.unit.coverage.config.cjs => jest.unit.coverage.config.js} (83%) rename config/webpack/{browser.config.babel.cjs => browser.config.babel.js} (81%) diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index c99f363e..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Launch", - "skipFiles": [ - "/**" - ], - "program": "${workspaceFolder}/node_modules/nodemon/bin/nodemon", - "args": ["./index.ts"], - "cwd": "${workspaceFolder}/src/" - }, - { - "type": "node-terminal", - "request": "launch", - "name": "Debug tests", - "skipFiles": [ - "/**" - ], - "command": "npm test" - } - ] -} diff --git a/babel.config.cjs b/babel.config.js similarity index 100% rename from babel.config.cjs rename to babel.config.js diff --git a/config/jest/jest.unit.config.cjs b/config/jest/jest.unit.config.js similarity index 100% rename from config/jest/jest.unit.config.cjs rename to config/jest/jest.unit.config.js diff --git a/config/jest/jest.unit.coverage.config.cjs b/config/jest/jest.unit.coverage.config.js similarity index 83% rename from config/jest/jest.unit.coverage.config.cjs rename to config/jest/jest.unit.coverage.config.js index a5cdfc69..a5097f96 100644 --- a/config/jest/jest.unit.coverage.config.cjs +++ b/config/jest/jest.unit.coverage.config.js @@ -1,5 +1,5 @@ // eslint-disable-next-line import/extensions -const unitConfig = require('./jest.unit.config.cjs'); +const unitConfig = require('./jest.unit.config'); module.exports = { ...unitConfig, diff --git a/config/webpack/browser.config.babel.cjs b/config/webpack/browser.config.babel.js similarity index 81% rename from config/webpack/browser.config.babel.cjs rename to config/webpack/browser.config.babel.js index 3953be5c..967979dd 100644 --- a/config/webpack/browser.config.babel.cjs +++ b/config/webpack/browser.config.babel.js @@ -1,12 +1,12 @@ -const path = require('path'); -const webpack = require('webpack'); -const { StatsWriterPlugin } = require('webpack-stats-plugin'); -const { DuplicatesPlugin } = require('inspectpack/plugin'); -const { WebpackBundleSizeAnalyzerPlugin } = require('webpack-bundle-size-analyzer'); -const TerserPlugin = require('terser-webpack-plugin'); -const { cloneDeep } = require('lodash'); +import path from 'path'; +import webpack from 'webpack'; +import { StatsWriterPlugin } from 'webpack-stats-plugin'; +import { DuplicatesPlugin } from 'inspectpack/plugin'; +import { WebpackBundleSizeAnalyzerPlugin } from 'webpack-bundle-size-analyzer'; +import TerserPlugin from 'terser-webpack-plugin'; +import { cloneDeep } from 'lodash'; -const babelModule = { +const module = { rules: [ { test: /\.js$/, @@ -44,10 +44,10 @@ const browser = { http: require.resolve('stream-http'), https: require.resolve('https-browserify'), buffer: require.resolve('buffer'), - path: require.resolve('path-browserify'), + path: require.resolve('path-browserify') }, }, - module: babelModule, + module, plugins: [ new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }), new webpack.ProvidePlugin({ process: 'process/browser' }), @@ -104,4 +104,4 @@ browserMin.optimization = { ], }; -module.exports = [browser, browserMin]; +export default [browser, browserMin]; diff --git a/package.json b/package.json index b9383cd9..a1daa5bd 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "main": "lib/commonjs.js", "module": "es/index.js", "jsnext:main": "es/index.js", - "type": "module", "unpkg": "dist/openapi-resolver.browser.min.js", "repository": "git@github.com:Authress-Engineering/openapi-resolver.js.git", "contributors": [ @@ -27,11 +26,11 @@ "scripts": { "prepublishOnly": "npm run clean && npm run lint && npm run test && npm run build", "build": "run-s build:umd:browser build:commonjs build:es", - "build:umd:browser": "cross-env BABEL_ENV=browser webpack --progress --config config/webpack/browser.config.babel.cjs", + "build:umd:browser": "cross-env BABEL_ENV=browser webpack --progress --config config/webpack/browser.config.babel.js", "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib", "build:es": "cross-env BABEL_ENV=es babel src --out-dir es", "lint": "eslint src/ test/", - "test": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.cjs", + "test": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js", "test:unit": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.config.js", "test:unit:watch": "cross-env BABEL_ENV=commonjs jest --runInBand --watch --config ./config/jest/jest.unit.config.js", "deps:license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv", @@ -80,7 +79,6 @@ "lodash": "^4.17.21", "lodash-webpack-plugin": "=0.11.6", "node-fetch": "^3.3.0", - "nodemon": "^3.0.3", "npm-run-all": "^4.1.5", "path-browserify": "^1.0.1", "prettier": "^2.3.0",