Skip to content

Commit

Permalink
fix(atomic,core,esbuild,react,rollup): ES module (#1057)
Browse files Browse the repository at this point in the history 
Fixes #904 and #1043

* Fix dual packages ES module import bug.

* try changing package.json type only on rollup, esbuild & react packages

* remove react package duplicate exports property

* fix(atomic,core,esbuild,react,rollup): ES module

Co-authored-by: Anton Evzhakov <anton@evz.name>
  • Loading branch information
@iMoses @Anber
iMoses and Anber committed Oct 19, 2022
1 parent acadd55 commit 1e88e95
Show file tree
Hide file tree
Showing 17 changed files with 523 additions and 59 deletions.
9 changes: 9 additions & 0 deletions .changeset/lazy-zebras-sin.md
View file
@@ -0,0 +1,9 @@
---
'@linaria/atomic': minor
'@linaria/core': minor
'@linaria/esbuild': minor
'@linaria/react': minor
'@linaria/rollup': minor
---

Support for ECMAScript modules. Fixes #904 and #1043.
0 examples/vite/.linariarc.js → examples/vite/.linariarc.mjs
View file
File renamed without changes.
3 changes: 0 additions & 3 deletions examples/vite/babel.config.js
View file

This file was deleted.

2 changes: 2 additions & 0 deletions examples/vite/package.json
View file
Expand Up @@ -4,6 +4,7 @@
"version": "0.0.0",
"license": "MIT",
"main": "index.js",
"type": "module",
"dependencies": {
"linaria-website": "workspace:^"
},
Expand All @@ -20,3 +21,4 @@
},
"author": "Anton Evzhakov"
}

3 changes: 3 additions & 0 deletions examples/vite/vite.config.js
View file
Expand Up @@ -12,6 +12,9 @@ export default defineConfig(({ command }) => ({
{
...linaria({
include: ['**/*.{js,jsx}'],
babelOptions: {
presets: ['@babel/preset-react'],
},
}),
enforce: 'pre',
},
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Expand Up @@ -40,6 +40,7 @@
"prettier": "^2.7.1",
"react": "^16.14.0",
"syncpack": "^8.0.0",
"tsup": "^6.3.0",
"turbo": "^1.2.16",
"typescript": "^4.7.4"
},
Expand All @@ -64,7 +65,7 @@
"add-contributor": "all-contributors add",
"bootstrap": "pnpm install",
"check:all": "turbo run check:all --output-logs=new-only && npm run lint && npm run sp:check",
"clean": "del 'packages/*/{coverage,esm,lib,types,tsconfig.tsbuildinfo}'",
"clean": "del 'packages/*/{coverage,dist,esm,lib,types,tsconfig.tsbuildinfo}'",
"lint": "eslint --ext .js,.ts,.tsx .",
"prepare": "turbo run build --output-logs=new-only",
"release": "pnpm run prepare && pnpm changeset publish",
Expand Down
39 changes: 30 additions & 9 deletions packages/atomic/package.json
View file
Expand Up @@ -20,9 +20,21 @@
"engines": {
"node": "^12.16.0 || >=13.7.0"
},
"exports": {
"./package.json": "./package.json",
".": {
"types": "./types/index.d.ts",
"import": "./dist/index.mjs",
"default": "./dist/index.js"
},
"./*": {
"types": "./types/*.d.ts",
"import": "./dist/*.mjs",
"default": "./dist/*.js"
}
},
"files": [
"esm/",
"lib/",
"dist/",
"processors/",
"types/"
],
Expand All @@ -37,24 +49,33 @@
"license": "MIT",
"linaria": {
"tags": {
"css": "./lib/processors/css.js",
"styled": "./lib/processors/styled.js"
"css": "./dist/processors/css.js",
"styled": "./dist/processors/styled.js"
}
},
"main": "lib/index.js",
"module": "esm/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"publishConfig": {
"access": "public"
},
"repository": "git@github.com:callstack/linaria.git",
"scripts": {
"build": "npm run build:lib && npm run build:esm && npm run build:declarations",
"build": "npm run build:dist && npm run build:declarations",
"build:declarations": "tsc --emitDeclarationOnly --outDir types",
"build:esm": "babel src --out-dir esm --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:lib": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:dist": "tsup --format cjs,esm",
"typecheck": "tsc --noEmit --composite false",
"watch": "npm run build --watch"
},
"sideEffects": false,
"tsup": {
"entry": [
"src/index.ts",
"src/processors/css.ts",
"src/processors/styled.ts"
],
"splitting": false,
"sourcemap": true,
"clean": true
},
"types": "types/index.d.ts"
}
2 changes: 1 addition & 1 deletion packages/atomic/processors/css.js
View file
Expand Up @@ -2,4 +2,4 @@ Object.defineProperty(exports, '__esModule', {
value: true,
});

exports.default = require('../lib/processors/css').default;
exports.default = require('../dist/processors/css').default;
2 changes: 1 addition & 1 deletion packages/atomic/processors/styled.js
View file
Expand Up @@ -2,4 +2,4 @@ Object.defineProperty(exports, '__esModule', {
value: true,
});

exports.default = require('../lib/processors/styled').default;
exports.default = require('../dist/processors/styled').default;
31 changes: 19 additions & 12 deletions packages/core/package.json
View file
Expand Up @@ -22,18 +22,17 @@
"./package.json": "./package.json",
".": {
"types": "./types/index.d.ts",
"import": "./esm/index.js",
"default": "./lib/index.js"
"import": "./dist/index.mjs",
"default": "./dist/index.js"
},
"./*": {
"types": "./types/*.d.ts",
"import": "./esm/*.js",
"default": "./lib/*.js"
"import": "./dist/*.mjs",
"default": "./dist/*.js"
}
},
"files": [
"esm/",
"lib/",
"dist/",
"processors/",
"types/"
],
Expand All @@ -48,27 +47,35 @@
"license": "MIT",
"linaria": {
"tags": {
"css": "./lib/processors/css.js"
"css": "./dist/processors/css.js"
}
},
"main": "lib/index.js",
"module": "esm/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"publishConfig": {
"access": "public"
},
"repository": "git@github.com:callstack/linaria.git",
"scripts": {
"build": "npm run build:lib && npm run build:esm && npm run build:declarations",
"build": "npm run build:dist && npm run build:declarations",
"build:corejs-test": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --ignore \"src/processors/**/*\"",
"build:declarations": "tsc --emitDeclarationOnly --outDir types",
"build:esm": "babel src --out-dir esm --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:lib": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:dist": "tsup --format cjs,esm",
"test": "jest --config ../../jest.config.js --rootDir .",
"test:dts": "dtslint --localTs ../../node_modules/typescript/lib __dtslint__",
"typecheck": "tsc --noEmit --composite false",
"watch": "npm run build --watch"
},
"sideEffects": false,
"tsup": {
"entry": [
"src/index.ts",
"src/processors/css.ts"
],
"splitting": false,
"sourcemap": true,
"clean": true
},
"types": "types/index.d.ts",
"typesVersions": {
"*": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/processors/css.js
View file
Expand Up @@ -2,4 +2,4 @@ Object.defineProperty(exports, '__esModule', {
value: true,
});

exports.default = require('../lib/processors/css').default;
exports.default = require('../dist/processors/css').default;
27 changes: 19 additions & 8 deletions packages/esbuild/package.json
View file
Expand Up @@ -15,10 +15,14 @@
"engines": {
"node": "^12.16.0 || >=13.7.0"
},
"exports": {
"import": "./dist/index.mjs",
"require": "./dist/index.js",
"types": "./types/index.d.ts"
},
"files": [
"types/",
"lib/",
"esm/"
"dist/",
"types/"
],
"homepage": "https://github.com/callstack/linaria#readme",
"keywords": [
Expand All @@ -32,19 +36,26 @@
"styled-components"
],
"license": "MIT",
"main": "lib/index.js",
"module": "esm/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"publishConfig": {
"access": "public"
},
"repository": "git@github.com:callstack/linaria.git",
"scripts": {
"build": "npm run build:lib && npm run build:esm && npm run build:declarations",
"build": "npm run build:dist && npm run build:declarations",
"build:declarations": "tsc --emitDeclarationOnly --outDir types",
"build:esm": "babel src --out-dir esm --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:lib": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:dist": "tsup --format cjs,esm",
"typecheck": "tsc --noEmit --composite false",
"watch": "npm run build --watch"
},
"tsup": {
"entry": [
"src/index.ts"
],
"splitting": false,
"sourcemap": true,
"clean": true
},
"types": "types"
}
31 changes: 19 additions & 12 deletions packages/react/package.json
View file
Expand Up @@ -25,18 +25,17 @@
"./package.json": "./package.json",
".": {
"types": "./types/index.d.ts",
"import": "./esm/index.js",
"default": "./lib/index.js"
"import": "./dist/index.mjs",
"default": "./dist/index.js"
},
"./*": {
"types": "./types/*.d.ts",
"import": "./esm/*.js",
"default": "./lib/*.js"
"import": "./dist/*.mjs",
"default": "./dist/*.js"
}
},
"files": [
"esm/",
"lib/",
"dist/",
"processors/",
"types/"
],
Expand All @@ -51,11 +50,11 @@
"license": "MIT",
"linaria": {
"tags": {
"styled": "./lib/processors/styled.js"
"styled": "./dist/processors/styled.js"
}
},
"main": "lib/index.js",
"module": "esm/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"peerDependencies": {
"react": ">=16"
},
Expand All @@ -64,17 +63,25 @@
},
"repository": "git@github.com:callstack/linaria.git",
"scripts": {
"build": "npm run build:lib && npm run build:esm && npm run build:declarations",
"build": "npm run build:dist && npm run build:declarations",
"build:corejs-test": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --ignore \"src/processors/**/*\"",
"build:declarations": "tsc --emitDeclarationOnly --outDir types",
"build:esm": "babel src --out-dir esm --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:lib": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:dist": "tsup --format cjs,esm",
"test": "jest --config ../../jest.config.js --rootDir .",
"test:dts": "dtslint --localTs ../../node_modules/typescript/lib __dtslint__",
"typecheck": "tsc --noEmit --composite false",
"watch": "npm run build --watch"
},
"sideEffects": false,
"tsup": {
"entry": [
"src/index.ts",
"src/processors/styled.ts"
],
"splitting": false,
"sourcemap": true,
"clean": true
},
"types": "types/index.d.ts",
"typesVersions": {
"*": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/processors/styled.js
View file
Expand Up @@ -2,4 +2,4 @@ Object.defineProperty(exports, '__esModule', {
value: true,
});

exports.default = require('../lib/processors/styled').default;
exports.default = require('../dist/processors/styled').default;
29 changes: 20 additions & 9 deletions packages/rollup/package.json
View file
Expand Up @@ -17,10 +17,14 @@
"engines": {
"node": "^12.16.0 || >=13.7.0"
},
"exports": {
"import": "./dist/index.mjs",
"require": "./dist/index.js",
"types": "./types/index.d.ts"
},
"files": [
"types/",
"lib/",
"esm/"
"dist/",
"types/"
],
"homepage": "https://github.com/callstack/linaria#readme",
"keywords": [
Expand All @@ -34,19 +38,26 @@
"styled-components"
],
"license": "MIT",
"main": "lib/index.js",
"module": "esm/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"publishConfig": {
"access": "public"
},
"repository": "git@github.com:callstack/linaria.git",
"scripts": {
"build": "npm run build:lib && npm run build:esm && npm run build:declarations",
"build": "npm run build:dist && npm run build:declarations",
"build:declarations": "tsc --emitDeclarationOnly --outDir types",
"build:esm": "babel src --out-dir esm --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:lib": "cross-env NODE_ENV=legacy babel src --out-dir lib --extensions '.js,.jsx,.ts,.tsx' --source-maps --delete-dir-on-start",
"build:dist": "tsup --format cjs,esm",
"typecheck": "tsc --noEmit --composite false",
"watch": "npm run build --watch"
},
"types": "types"
"tsup": {
"entry": [
"src/index.ts"
],
"splitting": false,
"sourcemap": true,
"clean": true
},
"types": "types/index.d.ts"
}

0 comments on commit 1e88e95

Please sign in to comment.