Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/tailwind support #1466

Merged
merged 11 commits into from
Jul 7, 2021
Merged

Feature/tailwind support #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf43f31
feature(tailwind) Initial functionality for getting the Tailwind config.
seanparsons Jul 5, 2021
a504b53
feat(editor) useTwind hook, with types needed
Rheeseyb Jul 5, 2021
6425c2a
feature(editor) Support module.exports in project files.
seanparsons Jul 6, 2021
9cdc2fd
feat(editor) Trigger tailwind support when plugin is used in postcss
Rheeseyb Jul 6, 2021
921b71f
feat(editor) Check dependencies and postcss config before applying ta…
Rheeseyb Jul 6, 2021
a153973
feat(editor) Support disabling tailwind preflight in config
Rheeseyb Jul 6, 2021
6cc54a2
feat(preview) Include tailwind support in the preview
Rheeseyb Jul 6, 2021
25804e9
fix(editor) Split rules before applying css scoping to ensure all rul…
Rheeseyb Jul 6, 2021
20309fd
chore(tailwind.ts) Memoize individual rule scoping
Rheeseyb Jul 6, 2021
895c0cd
fix(tests) Updated snapshots
Rheeseyb Jul 6, 2021
977e898
Merge remote-tracking branch 'origin' into feature/tailwind-support
seanparsons Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 74 additions & 3 deletions editor/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"string-hash": "1.1.3",
"strip-ansi": "6.0.0",
"tippy.js": "6.2.6",
"typescript": "4.0.5",
"twind": "0.16.16",
"typescript": "4.1.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Twind required a slightly updated version of TS, which is the cause of some unrelated changes elsewhere. There is a much newer version, but we didn't want to introduce too much noise into this PR, so that is something we should tackle separately.

"url-join": "4.0.1",
"use-context-selector": "git://github.com/dai-shi/use-context-selector.git#3f1df8f",
"utopia-api": "file:../utopia-api",
Expand Down
4 changes: 2 additions & 2 deletions editor/src/bundled-dependencies/codeBundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import { ExportsInfo } from '../core/workers/ts/ts-worker'
export const SampleFileBuildResult = JSON.parse(`{
"/src/app.js": {
"errors": [],
"transpiledCode": "\\"use strict\\";\\n\\nvar __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {\\n if (k2 === undefined) k2 = k;\\n Object.defineProperty(o, k2, {\\n enumerable: true,\\n get: function get() {\\n return m[k];\\n }\\n });\\n} : function (o, m, k, k2) {\\n if (k2 === undefined) k2 = k;\\n o[k2] = m[k];\\n});\\n\\nvar __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {\\n Object.defineProperty(o, \\"default\\", {\\n enumerable: true,\\n value: v\\n });\\n} : function (o, v) {\\n o[\\"default\\"] = v;\\n});\\n\\nvar __importStar = this && this.__importStar || function (mod) {\\n if (mod && mod.__esModule) return mod;\\n var result = {};\\n if (mod != null) for (var k in mod) {\\n if (k !== \\"default\\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\\n }\\n\\n __setModuleDefault(result, mod);\\n\\n return result;\\n};\\n\\nObject.defineProperty(exports, \\"__esModule\\", {\\n value: true\\n});\\nexports.App = void 0;\\n\\nvar React = __importStar(require(\\"react\\"));\\n\\nexports.App = function (props) {\\n return React.createElement(\\"div\\", {\\n style: {\\n width: '100%',\\n height: '100%',\\n backgroundColor: '#FFFFFF',\\n position: 'relative'\\n }\\n });\\n}; //# sourceMappingURL=app.js.map",
"transpiledCode": "\\"use strict\\";\\n\\nvar __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {\\n if (k2 === undefined) k2 = k;\\n Object.defineProperty(o, k2, {\\n enumerable: true,\\n get: function get() {\\n return m[k];\\n }\\n });\\n} : function (o, m, k, k2) {\\n if (k2 === undefined) k2 = k;\\n o[k2] = m[k];\\n});\\n\\nvar __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {\\n Object.defineProperty(o, \\"default\\", {\\n enumerable: true,\\n value: v\\n });\\n} : function (o, v) {\\n o[\\"default\\"] = v;\\n});\\n\\nvar __importStar = this && this.__importStar || function (mod) {\\n if (mod && mod.__esModule) return mod;\\n var result = {};\\n if (mod != null) for (var k in mod) {\\n if (k !== \\"default\\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\\n }\\n\\n __setModuleDefault(result, mod);\\n\\n return result;\\n};\\n\\nObject.defineProperty(exports, \\"__esModule\\", {\\n value: true\\n});\\nexports.App = void 0;\\n\\nvar React = __importStar(require(\\"react\\"));\\n\\nvar App = function App(props) {\\n return React.createElement(\\"div\\", {\\n style: {\\n width: '100%',\\n height: '100%',\\n backgroundColor: '#FFFFFF',\\n position: 'relative'\\n }\\n });\\n};\\n\\nexports.App = App; //# sourceMappingURL=app.js.map",
"sourceMap": {
"version": 3,
"sources": [
"../../src/app.js"
],
"names": [],
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAA,KAAA,GAAA,YAAA,CAAA,OAAA,CAAA,OAAA,CAAA,CAAA;;AACW,OAAA,CAAA,GAAA,GAAM,UAAC,KAAD,EAAU;AACzB,SACE,KAAA,CAAA,aAAA,CAAA,KAAA,EAAA;AACE,IAAA,KAAK,EAAE;AAAE,MAAA,KAAK,EAAE,MAAT;AAAiB,MAAA,MAAM,EAAE,MAAzB;AAAiC,MAAA,eAAe,EAAE,SAAlD;AAA6D,MAAA,QAAQ,EAAE;AAAvE;AADT,GAAA,CADF;AAKD,CANU,C",
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAA,KAAA,GAAA,YAAA,CAAA,OAAA,CAAA,OAAA,CAAA,CAAA;;AACO,IAAI,GAAG,GAAG,SAAN,GAAM,CAAC,KAAD,EAAU;AACzB,SACE,KAAA,CAAA,aAAA,CAAA,KAAA,EAAA;AACE,IAAA,KAAK,EAAE;AAAE,MAAA,KAAK,EAAE,MAAT;AAAiB,MAAA,MAAM,EAAE,MAAzB;AAAiC,MAAA,eAAe,EAAE,SAAlD;AAA6D,MAAA,QAAQ,EAAE;AAAvE;AADT,GAAA,CADF;AAKD,CANM;;AAAI,OAAA,CAAA,GAAA,GAAG,GAAH,C",
"sourcesContent": [
"\\nimport * as React from 'react'\\nexport var App = (props) => {\\n return (\\n <div\\n style={{ width: '100%', height: '100%', backgroundColor: '#FFFFFF', position: 'relative' }}\\n />\\n )\\n}"
],
Expand Down
44 changes: 23 additions & 21 deletions editor/src/components/canvas/__snapshots__/ui-jsx-canvas-bugs.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`UiJsxCanvas #747 - DOM object constructor cannot be called as a function 1`] = `
"<div
id=\\"canvas-container\\"
style=\\"all: initial; position: absolute;\\"
data-utopia-valid-paths=\\"sb sb/scene sb/scene/app\\"
data-utopia-root-element-path=\\"sb\\"
>
"<div style=\\"all: initial;\\">
<div
data-utopia-scene-id=\\"sb/scene\\"
data-paths=\\"sb/scene sb\\"
style=\\"
position: absolute;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 1px 0px rgba(26, 26, 26, 0.3);
left: 0;
top: 0;
width: 375px;
height: 812px;
\\"
data-uid=\\"scene sb\\"
id=\\"canvas-container\\"
style=\\"position: absolute;\\"
data-utopia-valid-paths=\\"sb sb/scene sb/scene/app\\"
data-utopia-root-element-path=\\"sb\\"
>
<div
data-uid=\\"comment-root 5c5~~~1 app\\"
data-paths=\\"5c5~~~1:comment-root 5c5~~~1 sb/scene/app\\"
data-utopia-scene-id=\\"sb/scene\\"
data-paths=\\"sb/scene sb\\"
style=\\"
position: absolute;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 1px 0px rgba(26, 26, 26, 0.3);
left: 0;
top: 0;
width: 375px;
height: 812px;
\\"
data-uid=\\"scene sb\\"
>
hat
<div
data-uid=\\"comment-root 5c5~~~1 app\\"
data-paths=\\"5c5~~~1:comment-root 5c5~~~1 sb/scene/app\\"
>
hat
</div>
</div>
</div>
</div>
Expand Down
Loading