diff --git a/packages/classname/index.cjs b/packages/classname/index.cjs deleted file mode 100644 index 6c5763dc..00000000 --- a/packages/classname/index.cjs +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./build/classname.production.min.cjs') -} else { - module.exports = require('./build/classname.development.cjs') -} diff --git a/packages/classname/package.json b/packages/classname/package.json index b3b4600a..468f7346 100644 --- a/packages/classname/package.json +++ b/packages/classname/package.json @@ -5,28 +5,24 @@ "homepage": "https://github.com/bem/bem-react/tree/master/packages/classname", "repository": "https://github.com/bem/bem-react", "keywords": ["bem", "naming", "classes", "notation", "core"], - "main": "index.cjs", - "typings": "classname.d.ts", - "exports": { - "development": { - "require": "./build/classname.development.cjs", - "module": "./build/classname.development.mjs" - }, - "production": { - "require": "./build/classname.production.min.cjs", - "module": "./build/classname.production.min.mjs" - }, - "require": "./index.cjs", - "default": "./build/classname.production.min.mjs" - }, "publishConfig": { "access": "public" }, - "files": ["build", "classname.d.ts"], "license": "MPL-2.0", "scripts": { "prepublishOnly": "npm run build", "build": "node ../../scripts/rollup/build.js", "unit": "../../node_modules/.bin/jest --config ../../.config/jest/jest.config.js" + }, + "files": ["build", "classname.d.ts"], + "main": "./build/classname.cjs", + "module": "./build/classname.mjs", + "types": "./classname.d.ts", + "exports": { + ".": { + "types": "./classname.d.ts", + "import": "./build/classname.mjs", + "require": "./build/classname.cjs" + } } } diff --git a/packages/classnames/index.cjs b/packages/classnames/index.cjs deleted file mode 100644 index fbc0d395..00000000 --- a/packages/classnames/index.cjs +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./build/classnames.production.min.cjs') -} else { - module.exports = require('./build/classnames.development.cjs') -} diff --git a/packages/classnames/package.json b/packages/classnames/package.json index 65c96bf9..5e9119b5 100644 --- a/packages/classnames/package.json +++ b/packages/classnames/package.json @@ -5,28 +5,24 @@ "homepage": "https://github.com/bem/bem-react/tree/master/packages/classnames", "repository": "https://github.com/bem/bem-react", "keywords": ["classes", "merge"], - "main": "index.cjs", - "typings": "classnames.d.ts", - "exports": { - "development": { - "require": "./build/classnames.development.cjs", - "module": "./build/classnames.development.mjs" - }, - "production": { - "require": "./build/classnames.production.min.cjs", - "module": "./build/classnames.production.min.mjs" - }, - "require": "./index.cjs", - "default": "./build/classnames.production.min.mjs" - }, "publishConfig": { "access": "public" }, - "files": ["build", "classnames.d.ts"], "license": "MPL-2.0", "scripts": { "prepublishOnly": "npm run build", "build": "node ../../scripts/rollup/build.js", "unit": "../../node_modules/.bin/jest --config ../../.config/jest/jest.config.js" + }, + "files": ["build", "classnames.d.ts"], + "main": "./build/classnames.cjs", + "module": "./build/classnames.mjs", + "types": "./classnames.d.ts", + "exports": { + ".": { + "types": "./classnames.d.ts", + "import": "./build/classnames.mjs", + "require": "./build/classnames.cjs" + } } } diff --git a/packages/core/index.cjs b/packages/core/index.cjs deleted file mode 100644 index 6f939f93..00000000 --- a/packages/core/index.cjs +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./build/core.production.min.cjs') -} else { - module.exports = require('./build/core.development.cjs') -} diff --git a/packages/core/package.json b/packages/core/package.json index d96206d4..2c0fa40a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -5,24 +5,9 @@ "homepage": "https://github.com/bem/bem-react/tree/master/packages/core", "repository": "https://github.com/bem/bem-react", "keywords": ["bem", "modifier", "withBemMod", "core"], - "main": "index.cjs", - "typings": "core.d.ts", - "exports": { - "development": { - "require": "./build/core.development.cjs", - "module": "./build/core.development.mjs" - }, - "production": { - "require": "./build/core.production.min.cjs", - "module": "./build/core.production.min.mjs" - }, - "require": "./index.cjs", - "default": "./build/core.production.min.mjs" - }, "publishConfig": { "access": "public" }, - "files": ["build", "core.d.ts"], "license": "MPL-2.0", "scripts": { "prepublishOnly": "npm run build", @@ -35,5 +20,16 @@ }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "files": ["build", "core.d.ts"], + "main": "./build/core.cjs", + "module": "./build/core.mjs", + "types": "./core.d.ts", + "exports": { + ".": { + "types": "./core.d.ts", + "import": "./build/core.mjs", + "require": "./build/core.cjs" + } } } diff --git a/packages/di/index.cjs b/packages/di/index.cjs deleted file mode 100644 index 25959e08..00000000 --- a/packages/di/index.cjs +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' - -if (process.env.NODE_ENV === 'production') { - module.exports = require('./build/di.production.min.js') -} else { - module.exports = require('./build/di.development.js') -} diff --git a/packages/di/package.json b/packages/di/package.json index 63bca4fb..9be8440a 100644 --- a/packages/di/package.json +++ b/packages/di/package.json @@ -5,24 +5,9 @@ "homepage": "https://github.com/bem/bem-react/tree/master/packages/di", "repository": "https://github.com/bem/bem-react", "keywords": ["bem", "level", "dependency", "di", "dependency injection", "react"], - "main": "index.cjs", - "typings": "di.d.ts", - "exports": { - "development": { - "require": "./build/di.development.cjs", - "module": "./build/di.development.mjs" - }, - "production": { - "require": "./build/di.production.min.cjs", - "module": "./build/di.production.min.mjs" - }, - "require": "./index.cjs", - "default": "./build/di.production.min.mjs" - }, "publishConfig": { "access": "public" }, - "files": ["build", "di.d.ts"], "license": "MPL-2.0", "scripts": { "prepublishOnly": "npm run build", @@ -31,5 +16,16 @@ }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "files": ["build", "di.d.ts"], + "main": "./build/di.cjs", + "module": "./build/di.mjs", + "types": "./di.d.ts", + "exports": { + ".": { + "types": "./di.d.ts", + "import": "./build/di.mjs", + "require": "./build/di.cjs" + } } } diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index 3c27cacd..d6911cef 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -7,14 +7,11 @@ const rimraf = require('rimraf') const gzipSize = require('gzip-size') const prettyBytes = require('pretty-bytes') const { rollup } = require('rollup') -const { terser } = require('rollup-plugin-terser') const typescript2 = require('rollup-plugin-typescript2') const replace = require('rollup-plugin-replace') const nodeResolve = require('rollup-plugin-node-resolve') const stripBanner = require('rollup-plugin-strip-banner') -const { getTerserConfig } = require('./terser.config') - const { log } = console const packagePath = process.cwd() @@ -28,7 +25,6 @@ function getPlugins({ isProduction, tsConfigPath }) { tsconfig: tsConfigPath, useTsconfigDeclarationDir: true, }), - isProduction && terser(getTerserConfig()), ] } @@ -78,25 +74,15 @@ function getPackageData(packagePath) { inputFile, outputs: [ { - outputFile: resolve(buildPath, `${packageName}.production.min.cjs`), + outputFile: resolve(buildPath, `${packageName}.cjs`), isProduction: true, isESM: false, }, { - outputFile: resolve(buildPath, `${packageName}.production.min.mjs`), + outputFile: resolve(buildPath, `${packageName}.mjs`), isProduction: true, isESM: true, }, - { - outputFile: resolve(buildPath, `${packageName}.development.cjs`), - isProduction: false, - isESM: false, - }, - { - outputFile: resolve(buildPath, `${packageName}.development.mjs`), - isProduction: false, - isESM: true, - }, ], } } diff --git a/scripts/rollup/terser.config.js b/scripts/rollup/terser.config.js deleted file mode 100644 index d94238b0..00000000 --- a/scripts/rollup/terser.config.js +++ /dev/null @@ -1,55 +0,0 @@ -'use strict' - -const nameCache = {} - -module.exports.getTerserConfig = () => ({ - compress: { - arrows: false, - booleans_as_integers: false, - booleans: true, - collapse_vars: true, - comparisons: true, - computed_props: true, - conditionals: true, - dead_code: true, - directives: true, - drop_console: false, - evaluate: true, - hoist_funs: true, - hoist_props: true, - inline: true, - join_vars: true, - keep_classnames: false, - keep_fnames: false, - typeofs: true, - loops: true, - pure_getters: true, - side_effects: true, - switches: true, - toplevel: true, - unused: true, - unsafe_math: true, - unsafe_proto: true, - properties: true, - passes: 3, - }, - mangle: { - eval: true, - keep_classnames: false, - keep_fnames: false, - module: true, - safari10: false, - toplevel: true, - }, - output: { - indent_level: 2, - ascii_only: false, - braces: false, - comments: false, - quote_keys: false, - quote_style: 3, - safari10: false, - ecma: 5, - }, - nameCache, -})