-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'refs/changes/23/1799923/13' of https://chromium.googlesource.com/chromium/src into user/sasebree/css-modules [SyntheticModules] Implements CSS Modules This is the final change required for CSS Modules to be utilized by developers. Following the acceptance of this change, if you run chromium with the CSSModules runtime flag, the following is now valid syntax: <script type="module"> import sheet from "./example.css"; </script> CSS Modules Explainer: https://github.com/w3c/webcomponents/blob/gh-pages/proposals/css-modules-v1-explainer.md CSS Modules Spec PR: whatwg/html#4898 Bug: 967018 Change-Id: Ifdee5b92259fb7e4e9c8f9aa88e69a98eb55c551
- Loading branch information
1 parent
4831b37
commit c9c68d4
Showing
4 changed files
with
44 additions
and
0 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<!doctype html> | ||
|
||
<head> | ||
<title>import-css-module-worker</title> | ||
<script src="/resources/testharness.js"></script> | ||
<script src="/resources/testharnessreport.js"></script> | ||
</head> | ||
|
||
<body> | ||
<h1>import-css-module-worker</h1> | ||
<script> | ||
async_test(function (test) { | ||
const worker = new Worker("./modules/worker.js", { type: "module" }); | ||
worker.onmessage = test.step_func(() => { assert_unreached("A CSS Module within a web worker should not load.")}); | ||
worker.onerror = test.step_func_done(); | ||
}, "A CSS Module within a web worker should not load."); | ||
</script> | ||
</body> |
22 changes: 22 additions & 0 deletions
22
html/semantics/scripting-1/the-script-element/css-module/import-css-module-basic.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<!doctype html> | ||
|
||
<head> | ||
<title>import-css-module-basic</title> | ||
<script src="/resources/testharness.js"></script> | ||
<script src="/resources/testharnessreport.js"></script> | ||
</head> | ||
|
||
<body> | ||
<h1>import-css-module-basic</h1> | ||
<script type="module"> | ||
import v from "./modules/basic.css" | ||
document.adoptedStyleSheets = [v]; | ||
test(function () { | ||
assert_equals(getComputedStyle(document.querySelector('#test')).backgroundColor, "rgb(255, 0, 0)", "CSS module should import correctly on top level document"); | ||
}, "Test basic CSS module import"); | ||
</script> | ||
|
||
<div id="test"> | ||
I am a test div. | ||
</div> | ||
</body> |
3 changes: 3 additions & 0 deletions
3
html/semantics/scripting-1/the-script-element/css-module/modules/basic.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#test { | ||
background-color:red; | ||
} |
1 change: 1 addition & 0 deletions
1
html/semantics/scripting-1/the-script-element/css-module/modules/worker.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
import "./basic.css" |