fix(tags): extract tags logic to the separate package (fixes #1006)

.changeset/itchy-ears-judge.md

@@ -0,0 +1,25 @@
+---
+'@linaria/atomic': patch
+'@linaria/babel-preset': patch
+'@linaria/cli': patch
+'@linaria/core': patch
+'@linaria/esbuild': patch
+'@linaria/extractor': patch
+'@linaria/babel-plugin-interop': patch
+'linaria': patch
+'@linaria/logger': patch
+'@linaria/react': patch
+'@linaria/rollup': patch
+'@linaria/server': patch
+'@linaria/shaker': patch
+'@linaria/stylelint': patch
+'@linaria/tags': patch
+'@linaria/testkit': patch
+'@linaria/utils': patch
+'@linaria/webpack-loader': patch
+'@linaria/webpack4-loader': patch
+'@linaria/webpack5-loader': patch
+'linaria-website': patch
+---
+
+New package @linaria/tags that contains all abstract logic for tags processors.

README.md

@@ -37,13 +37,13 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 ## Setup

package.json

@@ -6,9 +6,9 @@
     "git-raw-commits": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.2",
-    "@babel/eslint-parser": "^7.18.2",
+    "@babel/cli": "^7.18.9",
+    "@babel/core": "^7.18.9",
+    "@babel/eslint-parser": "^7.18.9",
     "@babel/plugin-proposal-class-properties": ">=7",
     "@babel/plugin-syntax-jsx": ">=7",
     "@babel/preset-env": ">=7",
@@ -41,7 +41,7 @@
     "react": "^16.14.0",
     "syncpack": "^8.0.0",
     "turbo": "^1.2.16",
-    "typescript": "^4.7.3"
+    "typescript": "^4.7.4"
   },
   "engines": {
     "node": "^12.16.0 || >=13.7.0"

packages/atomic/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```

packages/atomic/package.json

@@ -7,14 +7,15 @@
     "@linaria/core": "workspace:^",
     "@linaria/logger": "workspace:^",
     "@linaria/react": "workspace:^",
+    "@linaria/tags": "workspace:^",
     "@linaria/utils": "workspace:^",
     "known-css-properties": "^0.24.0",
     "postcss": "^8.3.11",
     "stylis": "^3.5.4",
     "ts-invariant": "^0.10.3"
   },
   "devDependencies": {
-    "@babel/types": "^7.18.4"
+    "@babel/types": "^7.18.9"
   },
   "engines": {
     "node": "^12.16.0 || >=13.7.0"

packages/atomic/src/processors/css.ts

@@ -1,8 +1,8 @@
 import type { SourceLocation } from '@babel/types';
 
 import CssProcessor from '@linaria/core/processors/css';
-import type { Rules, ValueCache } from '@linaria/core/processors/types';
 import { debug } from '@linaria/logger';
+import type { Rules, ValueCache } from '@linaria/tags';
 
 import atomize from './helpers/atomize';
 

packages/atomic/src/processors/styled.ts

@@ -1,10 +1,10 @@
 import type { SourceLocation } from '@babel/types';
 
-import type { Rules, ValueCache } from '@linaria/core/processors/types';
-import hasMeta from '@linaria/core/processors/utils/hasMeta';
 import { debug } from '@linaria/logger';
 import type { IProps } from '@linaria/react/processors/styled';
 import StyledProcessor from '@linaria/react/processors/styled';
+import { hasMeta } from '@linaria/tags';
+import type { Rules, ValueCache } from '@linaria/tags';
 import { slugify } from '@linaria/utils';
 
 import atomize from './helpers/atomize';

packages/babel/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```

packages/babel/package.json

@@ -4,14 +4,15 @@
   "version": "3.0.0-beta.21",
   "bugs": "https://github.com/callstack/linaria/issues",
   "dependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/generator": ">=7",
-    "@babel/template": ">=7",
-    "@babel/traverse": ">=7",
-    "@babel/types": "^7.18.4",
+    "@babel/core": "^7.18.9",
+    "@babel/generator": "^7.18.9",
+    "@babel/template": "^7.18.6",
+    "@babel/traverse": "^7.18.9",
+    "@babel/types": "^7.18.9",
     "@linaria/core": "workspace:^",
     "@linaria/logger": "workspace:^",
     "@linaria/shaker": "workspace:^",
+    "@linaria/tags": "workspace:^",
     "@linaria/utils": "workspace:^",
     "cosmiconfig": "^5.1.0",
     "find-up": "^5.0.0",
@@ -31,7 +32,7 @@
     "jest": "^28.1.0",
     "strip-ansi": "^5.2.0",
     "ts-jest": "^28.0.4",
-    "typescript": "^4.7.3"
+    "typescript": "^4.7.4"
   },
   "engines": {
     "node": "^12.16.0 || >=13.7.0"

packages/babel/src/module.ts

@@ -18,9 +18,9 @@ import vm from 'vm';
 
 import type { BabelFileResult } from '@babel/core';
 
-import type BaseProcessor from '@linaria/core/types/processors/BaseProcessor';
 import type { CustomDebug } from '@linaria/logger';
 import { createCustomDebug } from '@linaria/logger';
+import type { BaseProcessor } from '@linaria/tags';
 import type { StrictOptions } from '@linaria/utils';
 import { getFileIdx } from '@linaria/utils';
 

packages/babel/src/transform-stages/2-eval.ts

@@ -1,5 +1,5 @@
-import type { ValueCache } from '@linaria/core/types/processors/types';
 import { createCustomDebug } from '@linaria/logger';
+import type { ValueCache } from '@linaria/tags';
 import { getFileIdx } from '@linaria/utils';
 
 import evaluate from '../evaluators';

packages/babel/src/transform-stages/4-extract.ts

@@ -4,8 +4,7 @@ import type { Mapping } from 'source-map';
 import { SourceMapGenerator } from 'source-map';
 import stylis from 'stylis';
 
-import type BaseProcessor from '@linaria/core/types/processors/BaseProcessor';
-import type { Replacements } from '@linaria/core/types/processors/types';
+import type { BaseProcessor, Replacements } from '@linaria/tags';
 
 import type { Rules, Options, PreprocessorFn } from '../types';
 

packages/babel/src/types.ts

@@ -3,7 +3,7 @@ import type { NodePath } from '@babel/traverse';
 import type { File } from '@babel/types';
 import type { RawSourceMap } from 'source-map';
 
-import type BaseProcessor from '@linaria/core/processors/BaseProcessor';
+import type { BaseProcessor } from '@linaria/tags';
 
 import type { PluginOptions } from './transform-stages/helpers/loadLinariaOptions';
 
@@ -18,9 +18,9 @@ export type {
   Serializable,
   Value,
   ValueCache,
-} from '@linaria/core/processors/types';
+} from '@linaria/tags';
 
-export { ValueType } from '@linaria/core/processors/types';
+export { ValueType } from '@linaria/tags';
 
 export interface ICSSRule {
   className: string;

packages/babel/src/utils/collectTemplateDependencies.ts

@@ -25,8 +25,8 @@ import type {
 } from '@babel/types';
 import { cloneNode } from '@babel/types';
 
-import hasMeta from '@linaria/core/processors/utils/hasMeta';
 import { debug } from '@linaria/logger';
+import { hasMeta } from '@linaria/tags';
 import {
   findIdentifiers,
   mutate,

packages/babel/src/utils/getTagProcessor.ts

@@ -10,9 +10,8 @@ import type {
 } from '@babel/types';
 import findUp from 'find-up';
 
-import BaseProcessor from '@linaria/core/processors/BaseProcessor';
-import type { Params } from '@linaria/core/processors/types';
-import type { IFileContext } from '@linaria/core/processors/utils/types';
+import { BaseProcessor } from '@linaria/tags';
+import type { Params, IFileContext } from '@linaria/tags';
 import type { IImport, StrictOptions } from '@linaria/utils';
 import {
   collectExportsAndImports,

packages/babel/src/utils/hasLinariaPreval.ts

@@ -1,4 +1,4 @@
-import type { Value } from '@linaria/core/processors/types';
+import type { Value } from '@linaria/tags';
 
 export default function hasLinariaPreval(exports: unknown): exports is {
   __linariaPreval: Record<string, () => Value> | null | undefined;

packages/babel/src/utils/processTemplateExpression.ts

@@ -1,8 +1,7 @@
 import type { NodePath } from '@babel/traverse';
 import type { TaggedTemplateExpression } from '@babel/types';
 
-import type BaseProcessor from '@linaria/core/processors/BaseProcessor';
-import type { IFileContext } from '@linaria/core/processors/utils/types';
+import type { BaseProcessor, IFileContext } from '@linaria/tags';
 import type { StrictOptions } from '@linaria/utils';
 
 import getTagProcessor from './getTagProcessor';

packages/babel/src/utils/vlueToLiteral.ts

@@ -1,7 +1,7 @@
 import type { NodePath } from '@babel/traverse';
 import type { Expression } from '@babel/types';
 
-import isSerializable from '@linaria/core/processors/utils/isSerializable';
+import { isSerializable } from '@linaria/tags';
 
 import getSource from './getSource';
 

packages/cli/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```

packages/cli/package.json

@@ -7,7 +7,7 @@
   },
   "bugs": "https://github.com/callstack/linaria/issues",
   "dependencies": {
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.9",
     "@linaria/babel-preset": "workspace:^",
     "@linaria/utils": "workspace:^",
     "glob": "^7.1.3",

packages/core/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```

packages/core/__dtslint__/styled.ts → packages/core/__dtslint__/core.ts

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { css, cx, LinariaClassName } from '../src';
+import { css, cx } from '../src';
 
 // $ExpectType LinariaClassName
 const class1 = css``;

packages/core/__dtslint__/tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "lib": ["es6"],
+    "target": "ES2015",
     "esModuleInterop": true,
     "noImplicitAny": true,
     "noImplicitThis": true,

packages/core/package.json

@@ -5,11 +5,12 @@
   "bugs": "https://github.com/callstack/linaria/issues",
   "dependencies": {
     "@linaria/logger": "workspace:^",
+    "@linaria/tags": "workspace:^",
     "@linaria/utils": "workspace:^"
   },
   "devDependencies": {
-    "@babel/traverse": ">=7",
-    "@babel/types": "^7.18.4",
+    "@babel/traverse": "^7.18.9",
+    "@babel/types": "^7.18.9",
     "@types/babel__core": "^7.1.19",
     "@types/babel__traverse": "^7.17.1",
     "@types/node": "^17.0.39"

packages/core/src/css.ts

@@ -1,5 +1,6 @@
+import type { StyledMeta } from '@linaria/tags';
+
 import type { CSSProperties } from './CSSProperties';
-import type { StyledMeta } from './StyledMeta';
 import type { LinariaClassName } from './cx';
 
 type CSS = (

packages/core/src/index.ts

@@ -1,5 +1,4 @@
 export { default as css } from './css';
 export { default as cx } from './cx';
 export type { CSSProperties } from './CSSProperties';
-export type { StyledMeta } from './StyledMeta';
 export type { LinariaClassName } from './cx';

packages/core/src/processors/css.ts

@@ -1,8 +1,7 @@
 import type { Expression, SourceLocation, StringLiteral } from '@babel/types';
 
-import type { ProcessorParams } from './BaseProcessor';
-import BaseProcessor from './BaseProcessor';
-import type { Rules, ValueCache } from './types';
+import type { ProcessorParams, Rules, ValueCache } from '@linaria/tags';
+import { BaseProcessor } from '@linaria/tags';
 
 export default class CssProcessor extends BaseProcessor {
   constructor(...args: ProcessorParams) {

packages/esbuild/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```

packages/esbuild/package.json

@@ -4,7 +4,7 @@
   "version": "3.0.0-beta.21",
   "bugs": "https://github.com/callstack/linaria/issues",
   "dependencies": {
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.9",
     "@linaria/babel-preset": "workspace:^",
     "@linaria/utils": "workspace:^",
     "esbuild": "^0.12.5"

packages/extractor/README.md

@@ -25,11 +25,11 @@ Zero-runtime CSS in JS library.
 ## Installation
 
 ```sh
-npm install @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+npm install @linaria/core @linaria/react @linaria/babel-preset
 ```
 
 or
 
 ```sh
-yarn add @linaria/core @linaria/react @linaria/babel-preset @linaria/shaker
+yarn add @linaria/core @linaria/react @linaria/babel-preset
 ```