From 7380056dd2a1ea3b875a5bdd42e79b148ace50cd Mon Sep 17 00:00:00 2001 From: Brian Takita Date: Wed, 21 Jul 2021 17:57:12 -0400 Subject: [PATCH 1/2] mjs (ESM) & cjs builds fixes https://github.com/domingues/rollup-plugin-css-chunks/issues/24 --- package.json | 33 ++++++++++------- index.ts => src/index.ts | 5 ++- tsconfig.cjs.json | 8 +++++ tsconfig.json | 76 ++++++---------------------------------- tsconfig.mjs.json | 8 +++++ 5 files changed, 50 insertions(+), 80 deletions(-) rename index.ts => src/index.ts (97%) create mode 100644 tsconfig.cjs.json create mode 100644 tsconfig.mjs.json diff --git a/package.json b/package.json index 5624098..6ab159d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,16 @@ "name": "rollup-plugin-css-chunks", "version": "2.0.3", "description": "Rollup plugin to extract CSS into chunks", - "main": "index.js", + "type": "module", + "main": "./dist/cjs/index.js", + "module": "./dist/mjs/index.js", + "types": "./dist/mjs/index.d.ts", + "exports": { + ".": { + "require": "./dist/cjs/index.js", + "import": "./dist/mjs/index.js" + } + }, "files": [ "index.js", "index.d.ts", @@ -10,7 +19,7 @@ "LICENSE" ], "scripts": { - "build": "tsc", + "build": "rimraf dist/** && tsc -p tsconfig.cjs.json && tsc -p tsconfig.mjs.json", "lint": "eslint index.ts", "prepublishOnly": "npm run lint" }, @@ -26,18 +35,18 @@ }, "homepage": "https://github.com/domingues/rollup-plugin-css-chunks", "dependencies": { - "rollup-pluginutils": "^2.7.1", - "sourcemap-codec": "^1.4.4", - "url-join": "^4.0.1" + "rollup-pluginutils": "^2.8.2", + "sourcemap-codec": "^1.4.8" }, "devDependencies": { - "@types/node": "^14.10.3", - "@types/url-join": "^4.0.0", - "@typescript-eslint/eslint-plugin": "^4.1.1", - "@typescript-eslint/parser": "^4.1.1", - "eslint": "^7.9.0", - "rollup": "^2.29.0", - "typescript": "^4.0.2" + "@types/node": "^14.17.5", + "@types/url-join": "^4.0.1", + "@typescript-eslint/eslint-plugin": "^4.28.4", + "@typescript-eslint/parser": "^4.28.4", + "eslint": "^7.31.0", + "rimraf": "^3.0.2", + "rollup": "^2.53.3", + "typescript": "^4.3.5" }, "peerDependencies": { "rollup": ">=2.29.0" diff --git a/index.ts b/src/index.ts similarity index 97% rename from index.ts rename to src/index.ts index b7295c5..d67eb2b 100644 --- a/index.ts +++ b/src/index.ts @@ -11,8 +11,7 @@ import { } from 'rollup'; import {createFilter} from 'rollup-pluginutils'; import {encode, decode} from 'sourcemap-codec'; -import {readFileSync} from "fs"; -import urljoin from 'url-join'; +import {readFileSync} from 'fs'; function hash(content: string) { return crypto.createHmac('sha256', content) @@ -164,7 +163,7 @@ const cssChunks: PluginImpl = function (options = {}) { const css_file_name = makeFileName(chunk.name, hash(code), chunk.isEntry ? pluginOptions.entryFileNames : pluginOptions.chunkFileNames); - const css_file_url = urljoin(pluginOptions.publicPath, css_file_name); + const css_file_url = path.join(pluginOptions.publicPath, css_file_name); chunk.code = chunk.code.replace(new RegExp(`CSS_FILE_${chunk.fileName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`, 'g'), css_file_url); if (emitFiles) { diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json new file mode 100644 index 0000000..ff6f08d --- /dev/null +++ b/tsconfig.cjs.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "commonjs", + "rootDir": "src", + "outDir": "./dist/cjs" + } +} diff --git a/tsconfig.json b/tsconfig.json index 21d910e..563f370 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,69 +1,15 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "es2019", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ - // "lib": [], /* Specify library files to be included in the compilation. */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - "declaration": true, /* Generates corresponding '.d.ts' file. */ - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - - /* Advanced Options */ - "skipLibCheck": true, /* Skip type checking of declaration files. */ - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + "target": "es2019", + "module": "ESNext", + "declaration": true, + "rootDir": "src", + "outDir": "./dist/mjs", + "strict": true, + "moduleResolution": "node", + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true } } diff --git a/tsconfig.mjs.json b/tsconfig.mjs.json new file mode 100644 index 0000000..19525a1 --- /dev/null +++ b/tsconfig.mjs.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "ESNext", + "rootDir": "src", + "outDir": "./dist/mjs" + } +} From ae47c307b7bc28ce554794d58a8e3edfd260dd4e Mon Sep 17 00:00:00 2001 From: Brian Takita Date: Wed, 21 Jul 2021 19:05:03 -0400 Subject: [PATCH 2/2] update dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ab159d..031e742 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "sourcemap-codec": "^1.4.8" }, "devDependencies": { - "@types/node": "^14.17.5", + "@types/node": "^16.4.0", "@types/url-join": "^4.0.1", "@typescript-eslint/eslint-plugin": "^4.28.4", "@typescript-eslint/parser": "^4.28.4",