danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-11-27 04:34:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #727 from sass/static-require

Browse Source 
Require dependencies in the preamble rather than through JS-interop
This commit is contained in:
Natalie Weizenbaum 2019-06-28 14:32:18 -07:00 committed by GitHub
commit 532358d7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -27,6 +27,11 @@
* Add a top-level `warn()` function for custom functions and importers to print * Add a top-level `warn()` function for custom functions and importers to print
warning messages. warning messages.
### JavaScript API
* Avoid re-assigning the `require()` function to make the code statically
analyzable by Webpack.
## 1.20.3 ## 1.20.3
* No user-visible changes. * No user-visible changes.

6
lib/src/io/node.dart
View File

@ -87,10 +87,8 @@ class Stderr {
void flush() {} void flush() {}
} }
@JS("require") @JS("fs")
external _FS _require(String name); external _FS get _fs;
final _fs = _require("fs");
@JS("process") @JS("process")
external _Process get _process; external _Process get _process;

6
lib/src/node/chokidar.dart
View File

@ -4,9 +4,6 @@
import 'package:js/js.dart'; import 'package:js/js.dart';
@JS("require")
external Chokidar _require(String name);
@JS() @JS()
class Chokidar { class Chokidar {
external ChokidarWatcher watch(String path, ChokidarOptions options); external ChokidarWatcher watch(String path, ChokidarOptions options);
@ -30,4 +27,5 @@ class ChokidarWatcher {
/// The Chokidar module. /// The Chokidar module.
/// ///
/// See [the docs on npm](https://www.npmjs.com/package/chokidar). /// See [the docs on npm](https://www.npmjs.com/package/chokidar).
final chokidar = _require("chokidar"); @JS("chokidar")
external Chokidar get chokidar;

19
tool/grind/npm.dart
View File

@ -42,7 +42,13 @@ void _js({@required bool release}) {
// * We thoroughly test edge cases in user input. // * We thoroughly test edge cases in user input.
if (release) ...["-O4", "--fast-startup"] if (release) ...["-O4", "--fast-startup"]
]); ]);
var text = destination.readAsStringSync(); var text = destination
.readAsStringSync()
// Some dependencies dynamically invoke `require()`, which makes Webpack
// complain. We replace those with direct references to the modules, which
// we load explicitly after the preamble.
.replaceAllMapped(RegExp(r'self\.require\("([a-zA-Z0-9_-]+)"\)'),
(match) => "self.${match[1]}");
if (release) { if (release) {
// We don't ship the source map, so remove the source map comment. // We don't ship the source map, so remove the source map comment.
@ -50,7 +56,16 @@ void _js({@required bool release}) {
text.replaceFirst(RegExp(r"\n*//# sourceMappingURL=[^\n]+\n*$"), "\n"); text.replaceFirst(RegExp(r"\n*//# sourceMappingURL=[^\n]+\n*$"), "\n");
} }
destination.writeAsStringSync(preamble.getPreamble() + text); // Reassigning require() makes Webpack complain.
var preambleText =
preamble.getPreamble().replaceFirst("self.require = require;\n", "");
destination.writeAsStringSync("""
$preambleText
self.fs = require("fs");
self.chokidar = require("chokidar");
self.readline = require("readline");
$text""");
} }
@Task('Build a pure-JS dev-mode npm package.') @Task('Build a pure-JS dev-mode npm package.')