quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed resolver to mc in components

Browse Source
This commit is contained in:
Quinn Dougherty 2022-08-17 21:15:15 -07:00
parent 8625ccb1fc
commit f2aee857ae
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -76,10 +76,11 @@
}; };
# building # building
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
default = components.package-build; default = components.build;
mc-wasm = mc.pkg; mc-wasm = mc.pkg;
lang-bundle = lang.bundle; lang-bundle = lang.bundle;
components = components.package-build; components = components.build;
components-bundle = components.bundle;
}; };
# developing # developing
@ -114,8 +115,9 @@
squiggle-lang-bundle = lang.bundle; squiggle-lang-bundle = lang.bundle;
}; };
components.outputs = { components.outputs = {
squiggle-components = components.package-build;
squiggle-components-lint = components.lint; squiggle-components-lint = components.lint;
squiggle-components = components.build;
squiggle-components-bundle = components.bundle;
}; };
docs-site.outputs = { docs-site.outputs = {
docusaurus-lint = website.lint; docusaurus-lint = website.lint;

27
nix/squiggle-components.nix
View File

@ -28,8 +28,8 @@ rec {
buildPhase = "yarn lint"; buildPhase = "yarn lint";
installPhase = "mkdir -p $out"; installPhase = "mkdir -p $out";
}; };
package-build = pkgs.stdenv.mkDerivation { build = pkgs.stdenv.mkDerivation {
name = "squiggle-components-package-build"; name = "squiggle-components-build";
src = yarn-source + "/libexec/@quri/squiggle-components"; src = yarn-source + "/libexec/@quri/squiggle-components";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
@ -47,6 +47,29 @@ rec {
mv deps/@quri/squiggle-components/node_modules deps/@quri/squiggle-components/NODE_MODULES mv deps/@quri/squiggle-components/node_modules deps/@quri/squiggle-components/NODE_MODULES
mv node_modules deps/@quri/squiggle-components mv node_modules deps/@quri/squiggle-components
# patching .gitignore so flake keeps build artefacts
sed -i /dist/d deps/@quri/squiggle-components/.gitignore
cp -r deps/@quri/squiggle-components/. $out
'';
};
bundle = pkgs.stdenv.mkDerivation {
name = "squiggle-components-bundle";
src = yarn-source + "/libexec/@quri/squiggle-components";
buildInputs = common.buildInputs;
buildPhase = ''
cp -r node_modules/@quri/squiggle-lang deps/@quri
pushd deps/@quri/squiggle-components
yarn --offline bundle
popd
'';
installPhase = ''
mkdir -p $out
# annoying hack because permissions on transitive dependencies later on
mv deps/@quri/squiggle-components/node_modules deps/@quri/squiggle-components/NODE_MODULES
mv node_modules deps/@quri/squiggle-components
# patching .gitignore so flake keeps build artefacts # patching .gitignore so flake keeps build artefacts
sed -i /dist/d deps/@quri/squiggle-components/.gitignore sed -i /dist/d deps/@quri/squiggle-components/.gitignore
cp -r deps/@quri/squiggle-components/. $out cp -r deps/@quri/squiggle-components/. $out

3
packages/components/tsconfig.json
View File

@ -1,7 +1,8 @@
{ {
"compilerOptions": { "compilerOptions": {
"paths": { "paths": {
"@quri/squiggle-lang": ["../squiggle-lang/src/js"] "@quri/squiggle-lang": ["../squiggle-lang/src/js"],
"@quri/squiggle-mc": ["../mc/pkg"]
}, },
"module": "commonjs", "module": "commonjs",
"jsx": "react", "jsx": "react",

1
packages/components/webpack.config.js
View File

@ -19,6 +19,7 @@ module.exports = {
extensions: [".js", ".tsx", ".ts"], extensions: [".js", ".tsx", ".ts"],
alias: { alias: {
"@quri/squiggle-lang": path.resolve(__dirname, "../squiggle-lang/src/js"), "@quri/squiggle-lang": path.resolve(__dirname, "../squiggle-lang/src/js"),
"@quri/squiggle-mc": path.resolve(__dirname, "../mc/pkg"),
}, },
}, },
output: { output: {