reactivated 0.44.5 → 0.44.6
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.client.mjs
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import react from "@vitejs/plugin-react";
|
|
3
|
+
import { produce } from "immer";
|
|
3
4
|
import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
|
|
4
5
|
import { build } from "vite";
|
|
5
6
|
import { builtinModules } from "node:module";
|
|
6
7
|
import { execSync } from "child_process";
|
|
7
8
|
import path from "path";
|
|
8
|
-
import { rmSync } from "fs";
|
|
9
|
+
import { rmSync, existsSync } from "fs";
|
|
9
10
|
import { define } from "./conf.js";
|
|
10
11
|
import * as esbuild from "esbuild";
|
|
11
12
|
import { promises as fs } from "fs";
|
|
@@ -60,6 +61,13 @@ const clientConfig = {
|
|
|
60
61
|
},
|
|
61
62
|
base,
|
|
62
63
|
};
|
|
64
|
+
const adminConfig = produce(clientConfig, (draft) => {
|
|
65
|
+
draft.build.emptyOutDir = false;
|
|
66
|
+
draft.build.rollupOptions.input = "/client/django.admin.tsx";
|
|
67
|
+
draft.build.rollupOptions.output.entryFileNames = "django.admin.js";
|
|
68
|
+
draft.build.rollupOptions.output.chunkFileNames = "django.admin.js";
|
|
69
|
+
draft.build.rollupOptions.output.assetFileNames = "django.admin.[ext]";
|
|
70
|
+
});
|
|
63
71
|
const otherExternals = [];
|
|
64
72
|
const external = [
|
|
65
73
|
...otherExternals,
|
|
@@ -99,6 +107,9 @@ const rendererConfig = {
|
|
|
99
107
|
};
|
|
100
108
|
await build(clientConfig);
|
|
101
109
|
if (watch == null) {
|
|
110
|
+
if (existsSync("./client/django.admin.tsx")) {
|
|
111
|
+
await build(adminConfig);
|
|
112
|
+
}
|
|
102
113
|
await build(rendererConfig);
|
|
103
114
|
// Currently, vanilla-extract plugins are not bundled even though we tell rollup
|
|
104
115
|
// to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.client.mjs","sourceRoot":"","sources":["../src/build.client.mts"],"names":[],"mappings":";AAEA,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAe,KAAK,EAAC,MAAM,MAAM,CAAC;AACzC,OAAO,EAAC,cAAc,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"build.client.mjs","sourceRoot":"","sources":["../src/build.client.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -9,6 +9,8 @@ POSTGRESQL_LOGS="$VIRTUAL_ENV/postgresql/logs.txt"
|
|
|
9
9
|
# On MacOS, people may run this in /tmp which is actually /private/tmp.
|
|
10
10
|
# To prevent issues with the hash changing for $VIRTUAL_ENV depending on
|
|
11
11
|
# $PWD returning /tmp or /private/tmp, we resolve with readlink.
|
|
12
|
+
# Can't use $TMPDIR because nested nix-shell calls will put $TMPDIR in a one-off
|
|
13
|
+
# directory just for that shell process.
|
|
12
14
|
TMP_ENV="/tmp/reactivated/$(readlink -f "$VIRTUAL_ENV" | md5sum | awk '{print $1}')"
|
|
13
15
|
|
|
14
16
|
# https://github.com/python/mypy/issues/13392
|
package/src/build.client.mts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
3
|
import react from "@vitejs/plugin-react";
|
|
4
|
+
import {produce} from "immer";
|
|
4
5
|
import {vanillaExtractPlugin} from "@vanilla-extract/vite-plugin";
|
|
5
6
|
import {InlineConfig, build} from "vite";
|
|
6
7
|
import {builtinModules} from "node:module";
|
|
7
8
|
import {execSync} from "child_process";
|
|
8
9
|
import path from "path";
|
|
9
|
-
import {rmSync} from "fs";
|
|
10
|
+
import {rmSync, existsSync} from "fs";
|
|
10
11
|
import {define} from "./conf.js";
|
|
11
12
|
import * as esbuild from "esbuild";
|
|
12
13
|
import {promises as fs} from "fs";
|
|
@@ -71,6 +72,14 @@ const clientConfig = {
|
|
|
71
72
|
base,
|
|
72
73
|
} satisfies InlineConfig;
|
|
73
74
|
|
|
75
|
+
const adminConfig = produce(clientConfig, (draft) => {
|
|
76
|
+
draft.build.emptyOutDir = false as true;
|
|
77
|
+
draft.build.rollupOptions.input = "/client/django.admin.tsx";
|
|
78
|
+
draft.build.rollupOptions.output.entryFileNames = "django.admin.js";
|
|
79
|
+
draft.build.rollupOptions.output.chunkFileNames = "django.admin.js";
|
|
80
|
+
draft.build.rollupOptions.output.assetFileNames = "django.admin.[ext]";
|
|
81
|
+
});
|
|
82
|
+
|
|
74
83
|
const otherExternals: string[] = [];
|
|
75
84
|
const external = [
|
|
76
85
|
...otherExternals,
|
|
@@ -114,10 +123,13 @@ const rendererConfig = {
|
|
|
114
123
|
export type ClientConfig = typeof clientConfig;
|
|
115
124
|
|
|
116
125
|
export type RendererConfig = typeof rendererConfig;
|
|
117
|
-
|
|
118
126
|
await build(clientConfig);
|
|
119
127
|
|
|
120
128
|
if (watch == null) {
|
|
129
|
+
if (existsSync("./client/django.admin.tsx")) {
|
|
130
|
+
await build(adminConfig);
|
|
131
|
+
}
|
|
132
|
+
|
|
121
133
|
await build(rendererConfig);
|
|
122
134
|
// Currently, vanilla-extract plugins are not bundled even though we tell rollup
|
|
123
135
|
// to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
|