@tamagui/cli 3.1.10 → 3.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/build.cjs CHANGED
@@ -42,11 +42,12 @@ var import_node_module = require("node:module");
42
42
  const import_meta = {};
43
43
  const cliVersion = (0, import_node_module.createRequire)(typeof __filename === "string" ? __filename : import_meta.url)("@tamagui/cli/package.json").version;
44
44
  function insertCssImport(jsContent, cssImport) {
45
- const directiveMatch = jsContent.match(/^(['"])use (client|server)\1;?\n?/);
45
+ const directiveMatch = jsContent.match(/^(['"])use (client|server)\1;?(?:\r\n|[\r\n])?/);
46
46
  if (directiveMatch) {
47
47
  const directive = directiveMatch[0];
48
- return `${directive}${cssImport}
49
- ${jsContent.slice(directive.length)}`;
48
+ const rest = jsContent.slice(directive.length);
49
+ return `${directive}${/[\r\n]$/.test(directive) ? "" : "\n"}${cssImport}
50
+ ${rest}`;
50
51
  }
51
52
  return `${cssImport}
52
53
  ${jsContent}`;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/cli",
3
- "version": "3.1.10",
3
+ "version": "3.2.1",
4
4
  "license": "MIT",
5
5
  "bin": {
6
6
  "tama": "dist/index.cjs",
@@ -52,12 +52,12 @@
52
52
  "test:web": "bun run test"
53
53
  },
54
54
  "dependencies": {
55
- "@tamagui/generate-themes": "3.1.10",
56
- "@tamagui/metro-plugin": "3.1.10",
57
- "@tamagui/static": "3.1.10",
58
- "@tamagui/to-tailwind": "3.1.10",
59
- "@tamagui/types": "3.1.10",
60
- "@tamagui/vite-plugin": "3.1.10",
55
+ "@tamagui/generate-themes": "3.2.1",
56
+ "@tamagui/metro-plugin": "3.2.1",
57
+ "@tamagui/static": "3.2.1",
58
+ "@tamagui/to-tailwind": "3.2.1",
59
+ "@tamagui/types": "3.2.1",
60
+ "@tamagui/vite-plugin": "3.2.1",
61
61
  "arg": "^5.0.2",
62
62
  "chalk": "^4.1.2",
63
63
  "change-case": "^4.1.2",
@@ -76,10 +76,10 @@
76
76
  "ts-morph": "^28.0.0",
77
77
  "typescript": "7.0.2",
78
78
  "url": "^0.11.0",
79
- "@tamagui/language-service": "3.1.10"
79
+ "@tamagui/language-service": "3.2.1"
80
80
  },
81
81
  "devDependencies": {
82
- "@tamagui/build": "3.1.10",
82
+ "@tamagui/build": "3.2.1",
83
83
  "@types/chokidar": "^2.1.3",
84
84
  "@types/marked": "^5.0.0",
85
85
  "vitest": "4.1.11"
@@ -89,5 +89,5 @@
89
89
  "url": "git+https://github.com/tamagui/tamagui.git",
90
90
  "directory": "code/core/cli"
91
91
  },
92
- "releaseSourceCommit": "667a06425e709c73431628b364929dba4aa3bca1"
92
+ "releaseSourceCommit": "5c4404ca31927ea6628af3aebf7e4ade61483b39"
93
93
  }
package/src/build.ts CHANGED
@@ -49,12 +49,13 @@ export type BuildResult = {
49
49
  export function insertCssImport(jsContent: string, cssImport: string): string {
50
50
  // Match 'use client' or 'use server' directives at the start of the file
51
51
  // Only consume one optional semicolon and one optional newline to preserve formatting
52
- const directiveMatch = jsContent.match(/^(['"])use (client|server)\1;?\n?/)
52
+ const directiveMatch = jsContent.match(/^(['"])use (client|server)\1;?(?:\r\n|[\r\n])?/)
53
53
  if (directiveMatch) {
54
54
  // Directive found at start - insert CSS import after it
55
55
  const directive = directiveMatch[0]
56
56
  const rest = jsContent.slice(directive.length)
57
- return `${directive}${cssImport}\n${rest}`
57
+ const separator = /[\r\n]$/.test(directive) ? '' : '\n'
58
+ return `${directive}${separator}${cssImport}\n${rest}`
58
59
  }
59
60
  return `${cssImport}\n${jsContent}`
60
61
  }
@@ -1 +1 @@
1
- {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AAgBxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAW5E;AAED,eAAO,MAAM,KAAK,YACP,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,KACA,OAAO,CAAC,WAAW,CAmiBrB,CAAA"}
1
+ {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AAgBxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAY5E;AAED,eAAO,MAAM,KAAK,YACP,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,KACA,OAAO,CAAC,WAAW,CAmiBrB,CAAA"}