Skip to content

Commit da5be98

Browse files
committed
Update modules
1 parent d59d24b commit da5be98

File tree

46 files changed

+1281
-1253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1281
-1253
lines changed

.gitmodules

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "internal"]
22
path = internal
33
url = https://github.com/master-co/internal
4-
branch = main

examples/eslint/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"@angular-eslint/template-parser": "^16.3.1",
55
"@master/eslint-config-css": "workspace:^",
66
"@master/eslint-plugin-css": "workspace:^",
7-
"@master/css-shared": "workspace:^",
7+
"shared": "workspace:^",
88
"@master/styled.react": "^2.0.2",
99
"@typescript-eslint/parser": "^6.21.0",
1010
"clsx": "^2.1.0",

internal

Submodule internal added at 51f15e7

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"type": "module",
44
"scripts": {
5-
"start": "git submodule update --init --recursive && cd internal && git checkout main",
5+
"start": "git submodule update --init --recursive",
66
"postinstall": "pnpm dlx husky install",
77
"build": "cross-env NODE_OPTIONS=--max-old-space-size=16384 pnpm --filter \"./packages/*\" build",
88
"build:examples": "cross-env NODE_OPTIONS=--max-old-space-size=16384 pnpm --filter \"./examples/*\" --parallel build",
@@ -67,7 +67,7 @@
6767
"@master/css-language-service": "workspace:^",
6868
"@master/css-runtime": "workspace:^",
6969
"@master/css-server": "workspace:^",
70-
"@master/css-shared": "workspace:^",
70+
"shared": "workspace:^",
7171
"@master/css-validator": "workspace:^",
7272
"@master/css.nuxt": "workspace:^",
7373
"@master/css.react": "workspace:^",

packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
"devDependencies": {
5656
"@types/pretty-hrtime": "^1.0.3",
5757
"fast-glob": "^3.3.2",
58-
"@master/css-shared": "workspace:^"
58+
"shared": "workspace:^"
5959
}
6060
}

packages/cli/tests/extract/watch/test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import fs from 'fs'
44
import path from 'upath'
5-
import cssEscape from '@master/css-shared/utils/css-escape'
6-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
5+
import cssEscape from 'shared/utils/css-escape'
6+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
77
import dedent from 'ts-dedent'
88
import { SpawndChildProcess, spawnd } from 'spawnd'
99
import { it, beforeAll, afterAll, expect } from 'vitest'

packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@
6969
"csstype": "^3.1.3"
7070
},
7171
"devDependencies": {
72-
"@master/css-shared": "workspace:^"
72+
"shared": "workspace:^"
7373
}
7474
}

packages/core/src/config/syntaxes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import cssEscape from '@master/css-shared/utils/css-escape'
1+
import cssEscape from 'shared/utils/css-escape'
22
import type { Rule, SyntaxDefinition } from '../rule'
33
import Layer from '../layer'
44
import { BORDER_STYLE_VALUES, COLOR_VALUE_REGEX, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, VALUE_DELIMITERS } from '../common'

packages/core/src/rule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
22
import MasterCSS, { ColorVariable, type Variable } from './core'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import Layer from './layer'
55
import { type PropertiesHyphen } from 'csstype'
66
import { VALUE_DELIMITERS, BASE_UNIT_REGEX, UNIT_REGEX } from './common'

packages/create/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
"ora": "^8.0.1"
4747
},
4848
"devDependencies": {
49-
"@master/css-shared": "workspace:^"
49+
"shared": "workspace:^"
5050
}
5151
}

packages/create/tests/cjs/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test, it, expect } from 'vitest'
22
import { execSync } from 'child_process'
33
import { join } from 'node:path'
44
import { readFileSync } from 'node:fs'
5-
import { rm } from '@master/css-shared/utils/fs'
5+
import { rm } from 'shared/utils/fs'
66

77
it('init cjs', async () => {
88
rm(join(__dirname, 'master.css.js'))

packages/create/tests/esm/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test, it, expect } from 'vitest'
22
import { execSync } from 'child_process'
33
import { join } from 'node:path'
44
import { readFileSync } from 'node:fs'
5-
import { rm } from '@master/css-shared/utils/fs'
5+
import { rm } from 'shared/utils/fs'
66

77
it('init (type="module")', async () => {
88
rm(join(__dirname, 'master.css.mjs'))

packages/create/tests/new/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { test, it, expect } from 'vitest'
22
import { execSync } from 'child_process'
3-
import { rm } from '@master/css-shared/utils/fs'
3+
import { rm } from 'shared/utils/fs'
44
import { join } from 'node:path'
55
import { existsSync, readFileSync } from 'node:fs'
66

packages/create/tests/nextjs/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { test, it, expect } from 'vitest'
22
import { execSync } from 'child_process'
3-
import { rm } from '@master/css-shared/utils/fs'
3+
import { rm } from 'shared/utils/fs'
44
import { join } from 'node:path'
55
import { existsSync } from 'node:fs'
66

packages/create/tests/ts/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test, it, expect } from 'vitest'
22
import { execSync } from 'child_process'
33
import { join } from 'node:path'
44
import { readFileSync } from 'node:fs'
5-
import { rm } from '@master/css-shared/utils/fs'
5+
import { rm } from 'shared/utils/fs'
66

77
it('init by tsconfig.json', async () => {
88
rm(join(__dirname, 'master.css.ts'))

packages/eslint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"devDependencies": {
5353
"@angular-eslint/template-parser": "^17.4.1",
54-
"@master/css-shared": "workspace:^",
54+
"shared": "workspace:^",
5555
"eslint": "^9.3.0"
5656
}
5757
}

packages/eslint-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"devDependencies": {
5858
"@angular-eslint/template-parser": "^17.3.0",
5959
"@master/css-explore-config": "workspace:^",
60-
"@master/css-shared": "workspace:^",
60+
"shared": "workspace:^",
6161
"@types/node": "^20.12.7",
6262
"@typescript-eslint/rule-tester": "^7.7.0",
6363
"eslint": "^8.57.0",

packages/explore-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
"devDependencies": {
5151
"@master/css": "workspace:^",
52-
"@master/css-shared": "workspace:^"
52+
"shared": "workspace:^"
5353
},
5454
"dependencies": {
5555
"@techor/log": "^3.0.22",

packages/extractor.vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@playwright/test": "1.41.2",
6565
"@types/lodash.debounce": "^4.0.9",
6666
"@types/node": "^20.11.20",
67-
"@master/css-shared": "workspace:^",
67+
"shared": "workspace:^",
6868
"puppeteer-core": "^22.2.0"
6969
}
7070
}

packages/extractor.vite/tests/nuxt.js/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'fs'
22
import path from 'path'
33
import { execSync } from 'child_process'
4-
import { copy, rm } from '@master/css-shared/utils/fs'
4+
import { copy, rm } from 'shared/utils/fs'
55
import { explorePathSync } from '@techor/glob'
66

77
const examplePath = path.join(__dirname, '../../../../examples/nuxt.js-with-static-extraction')

packages/extractor.vite/tests/nuxt.js/dev.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import puppeteer, { type Browser, type Page } from 'puppeteer-core'
5-
import { copy } from '@master/css-shared/utils/fs'
5+
import { copy } from 'shared/utils/fs'
66
import { SpawndChildProcess, spawnd } from 'spawnd'
7-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
7+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
88

99
const examplePath = path.join(__dirname, '../../../../examples/nuxt.js-with-static-extraction')
1010
const tmpDir = path.join(__dirname, 'tmp/dev')

packages/extractor.vite/tests/react/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from 'path'
22
import { execSync } from 'child_process'
3-
import { copy, rm } from '@master/css-shared/utils/fs'
3+
import { copy, rm } from 'shared/utils/fs'
44
import fs from 'fs'
55
import { explorePathSync } from '@techor/glob'
66

packages/extractor.vite/tests/react/dev.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import puppeteer, { type Browser, type Page } from 'puppeteer-core'
5-
import { copy, rm } from '@master/css-shared/utils/fs'
5+
import { copy, rm } from 'shared/utils/fs'
66
import { SpawndChildProcess, spawnd } from 'spawnd'
7-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
8-
import delay from '@master/css-shared/utils/delay'
7+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
8+
import delay from 'shared/utils/delay'
99

1010
test.todo('react dev tests timeout in CI')
1111
if (!process.env.GITHUB_ACTIONS) {

packages/extractor.vite/tests/svelte/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs'
22
import { explorePathSync } from '@techor/glob'
33
import path from 'upath'
44
import { execSync } from 'child_process'
5-
import { copy, rm } from '@master/css-shared/utils/fs'
5+
import { copy, rm } from 'shared/utils/fs'
66

77
const examplePath = path.join(__dirname, '../../../../examples/svelte-with-static-extraction')
88
const tmpDir = path.join(__dirname, 'tmp/build')

packages/extractor.vite/tests/svelte/dev.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import puppeteer, { type Browser, type Page } from 'puppeteer-core'
5-
import { copy } from '@master/css-shared/utils/fs'
5+
import { copy } from 'shared/utils/fs'
66
import { SpawndChildProcess, spawnd } from 'spawnd'
7-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
8-
import delay from '@master/css-shared/utils/delay'
7+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
8+
import delay from 'shared/utils/delay'
99

1010
test.todo('svelte dev tests timeout in CI')
1111
if (!process.env.GITHUB_ACTIONS) {

packages/extractor.vite/tests/vite/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs'
22
import { explorePathSync } from '@techor/glob'
33
import path from 'path'
44
import { execSync } from 'child_process'
5-
import { copy, rm } from '@master/css-shared/utils/fs'
5+
import { copy, rm } from 'shared/utils/fs'
66

77
const examplePath = path.join(__dirname, '../../../../examples/vite-with-static-extraction')
88
const tmpDir = path.join(__dirname, 'tmp/build')

packages/extractor.vite/tests/vite/dev.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import puppeteer, { type Browser, type Page } from 'puppeteer-core'
5-
import { copy, rm } from '@master/css-shared/utils/fs'
5+
import { copy, rm } from 'shared/utils/fs'
66
import { SpawndChildProcess, spawnd } from 'spawnd'
7-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
8-
import delay from '@master/css-shared/utils/delay'
7+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
8+
import delay from 'shared/utils/delay'
99

1010
test.todo('vite dev tests timeout in CI')
1111
if (!process.env.GITHUB_ACTIONS) {

packages/extractor.vite/tests/vue.js/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'fs'
22
import path from 'path'
33
import { execSync } from 'child_process'
4-
import { copy, rm } from '@master/css-shared/utils/fs'
4+
import { copy, rm } from 'shared/utils/fs'
55
import { explorePathSync } from '@techor/glob'
66

77
const examplePath = path.join(__dirname, '../../../../examples/vue.js-with-static-extraction')

packages/extractor.vite/tests/vue.js/dev.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import cssEscape from '@master/css-shared/utils/css-escape'
3+
import cssEscape from 'shared/utils/css-escape'
44
import puppeteer, { type Browser, type Page } from 'puppeteer-core'
5-
import { copy, rm } from '@master/css-shared/utils/fs'
5+
import { copy, rm } from 'shared/utils/fs'
66
import { SpawndChildProcess, spawnd } from 'spawnd'
7-
import waitForDataMatch from '@master/css-shared/utils/wait-for-data-match'
8-
import delay from '@master/css-shared/utils/delay'
7+
import waitForDataMatch from 'shared/utils/wait-for-data-match'
8+
import delay from 'shared/utils/delay'
99

1010
test.todo('vue.js dev tests timeout in CI')
1111
if (!process.env.GITHUB_ACTIONS) {

packages/extractor.webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"webpack-virtual-modules": "^0.5.0"
5757
},
5858
"devDependencies": {
59-
"@master/css-shared": "workspace:^"
59+
"shared": "workspace:^"
6060
}
6161
}

packages/extractor/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@
7777
"minimatch": "^9.0.3"
7878
},
7979
"devDependencies": {
80-
"@master/css-shared": "workspace:^"
80+
"shared": "workspace:^"
8181
}
8282
}

packages/extractor/src/core.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import exploreCSSConfig from '@master/css-explore-config'
1111
import { generateValidRules } from '@master/css-validator'
1212
import chokidar from 'chokidar'
1313
import { EventEmitter } from 'node:events'
14-
import cssEscape from '@master/css-shared/utils/css-escape'
14+
import cssEscape from 'shared/utils/css-escape'
1515
import { explorePathsSync } from '@techor/glob'
1616
import path, { resolve } from 'path'
1717

packages/language-server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"vscode-uri": "^3.0.8"
3030
},
3131
"devDependencies": {
32-
"@master/css-shared": "workspace:^"
32+
"shared": "workspace:^"
3333
},
3434
"sideEffects": false,
3535
"main": "./dist/index.cjs",

packages/language-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@types/culori": "^2.1.0",
4040
"@types/lodash.escaperegexp": "^4.1.9",
4141
"@types/vscode": "^1.87.0",
42-
"@master/css-shared": "workspace:^",
42+
"shared": "workspace:^",
4343
"vscode-languageserver": "^7.0.0"
4444
},
4545
"sideEffects": false,

packages/nuxt/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@techor/log": "^3.0.22"
5858
},
5959
"devDependencies": {
60-
"@master/css-shared": "workspace:^",
60+
"shared": "workspace:^",
6161
"@nuxt/devtools": "latest",
6262
"@nuxt/eslint-config": "^0.2.0",
6363
"@nuxt/module-builder": "^0.5.5",

packages/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@master/css-runtime": "workspace:^"
6363
},
6464
"devDependencies": {
65-
"@master/css-shared": "workspace:^",
65+
"shared": "workspace:^",
6666
"@playwright/experimental-ct-react": "1.41.2",
6767
"@playwright/test": "1.41.2"
6868
}

packages/runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@master/css": "workspace:^"
5656
},
5757
"devDependencies": {
58-
"@master/css-shared": "workspace:^",
58+
"shared": "workspace:^",
5959
"@playwright/test": "1.41.2",
6060
"@types/node": "^20.11.20"
6161
}

packages/server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757
"htmlparser2": "^9.1.0"
5858
},
5959
"devDependencies": {
60-
"@master/css-shared": "workspace:^"
60+
"shared": "workspace:^"
6161
}
6262
}

packages/svelte/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@master/css-runtime": "workspace:^"
5757
},
5858
"devDependencies": {
59-
"@master/css-shared": "workspace:^",
59+
"shared": "workspace:^",
6060
"@master/css-server": "workspace:^",
6161
"@playwright/experimental-ct-svelte": "1.41.2",
6262
"@playwright/test": "1.41.2",

packages/validator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
},
5555
"devDependencies": {
5656
"@types/css-tree": "^2.3.6",
57-
"@master/css-shared": "workspace:^",
57+
"shared": "workspace:^",
5858
"ts-jest": "^29.1.2"
5959
}
6060
}

packages/vscode/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
},
263263
"devDependencies": {
264264
"@master/css-language-server": "workspace:^",
265-
"@master/css-shared": "workspace:^",
265+
"shared": "workspace:^",
266266
"@types/vscode": "^1.87.0",
267267
"@vscode/vsce": "^2.24.0",
268268
"vscode-languageclient": "^8.1.0"

0 commit comments

Comments
 (0)