8000 Merge branch 'master' into main-menu-navigation · activeadmin/activeadmin@def150a · GitHub
[go: up one dir, main page]
Skip to content

Commit def150a

Browse files
hasgharihasghari
authored
Merge branch 'master' into main-menu-navigation
2 parents 6c7f213 + af7dcdc commit def150a

File tree

4 files changed

+179
-3
lines changed

4 files changed

+179
-3
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/src
1111
/vendor/bundle
1212
/rails_70
13+
/dist

‎package.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"name": "@activeadmin/activeadmin",
33
"version": "4.0.0-beta3",
44
"description": "The administration framework for Ruby on Rails.",
5-
"main": "app/javascript/active_admin.js",
5+
"main": "dist/active_admin.js",
66
"type": "module",
77
"files": [
8-
"app/javascript/**/*.js",
8+
"dist/**/*.js",
99
"plugin.js",
1010
"vendor/javascript/*.js"
1111
],
@@ -25,12 +25,20 @@
2525
},
2626
"homepage": "https://activeadmin.info",
2727
"devDependencies": {
28+
"@rollup/plugin-alias": "^5.1.0",
2829
"eslint": "^8.52.0",
2930
"gherkin-lint": "^4.2.2",
31+
"rollup": "^4.9.4",
3032
"tailwindcss": "^3.3.5"
3133
},
3234
"scripts": {
3335
"gherkin-lint": "gherkin-lint",
34-
"eslint": "eslint ."
36+
"eslint": "eslint .",
37+
"prebuild": "rm -rf dist",
38+
"build": "rollup --config rollup.config.js"
39+
},
40+
"dependencies": {
41+
"@rails/ujs": "7.1.2",
42+
"flowbite": "2.2.1"
3543
}
3644
}

‎rollup.config.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import path from 'node:path';
2+
import { URL, fileURLToPath } from 'node:url';
3+
import { readFileSync } from 'node:fs';
4+
import alias from '@rollup/plugin-alias';
5+
6+
const packageJson = JSON.parse(
7+
readFileSync(new URL('./package.json', import.meta.url))
8+
);
9+
10+
const __dirname = fileURLToPath(new URL('.', import.meta.url));
11+
const projectRootDir = path.resolve(__dirname);
12+
const assetsDir = path.resolve(projectRootDir, 'app/javascript');
13+
14+
15+
/**
16+
* @type {import('rollup').RollupOptions}
17+
*/
18+
export default [
19+
// build dist folder with all files from app/javascript using relative imports.
20+
// let bundler tools like webpack or rollup to process our package
21+
{
22+
input: ['app/javascript/active_admin.js'],
23+
output: {
24+
format: 'es',
25+
dir: 'dist',
26+
preserveModules: true,
27+
},
28+
external: Object.keys(packageJson.dependencies),
29+
plugins: [
30+
alias({
31+
entries: [
32+
{
33+
find: 'active_admin',
34+
replacement: path.join(assetsDir, 'active_admin'),
35+
},
36+
]
37+
})
38+
]
39+
}
40+
];

‎yarn.lock

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@
133133
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
134134
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
135135

136+
"@popperjs/core@^2.9.3":
137+
version "2.11.8"
138+
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
139+
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
140+
136141
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
137142
version "1.1.2"
138143
resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -186,6 +191,88 @@
186191
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
187192
integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
188193

194+
"@rails/ujs@7.1.2":
195+
version "7.1.2"
196+
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.2.tgz#ea903bcc0224e17156015d995b6f1b83e27d64b2"
197+
integrity sha512-c5x02djEKEVVE4qfN4XgElJS4biM0xxtIVpcJ0ZHLK116U19rowTtmD0AJ/RCb3Xaewa4GPIWLlwgeC0dCQqzw==
198+
199+
"@rollup/plugin-alias@^5.1.0":
200+
version "5.1.0"
201+
resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
202+
integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
203+
dependencies:
204+
slash "^4.0.0"
205+
206+
"@rollup/rollup-android-arm-eabi@4.9.5":
207+
version "4.9.5"
208+
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz#b752b6c88a14ccfcbdf3f48c577ccc3a7f0e66b9"
209+
integrity sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==
210+
211+
"@rollup/rollup-android-arm64@4.9.5":
212+
version "4.9.5"
213+
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz#33757c3a448b9ef77b6f6292d8b0ec45c87e9c1a"
214+
integrity sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==
215+
216+
"@rollup/rollup-darwin-arm64@4.9.5":
217+
version "4.9.5"
218+
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz#5234ba62665a3f443143bc8bcea9df2cc58f55fb"
219+
integrity sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==
220+
221+
"@rollup/rollup-darwin-x64@4.9.5":
222+
version "4.9.5"
223+
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz#981256c054d3247b83313724938d606798a919d1"
224+
integrity sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==
225+
226+
"@rollup/rollup-linux-arm-gnueabihf@4.9.5":
227+
version "4.9.5"
228+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz#120678a5a2b3a283a548dbb4d337f9187a793560"
229+
integrity sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==
230+
231+
"@rollup/rollup-linux-arm64-gnu@4.9.5":
232+
version "4.9.5"
233+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz#c99d857e2372ece544b6f60b85058ad259f64114"
234+
integrity sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==
235+
236+
"@rollup/rollup-linux-arm64-musl@4.9.5":
237+
version "4.9.5"
238+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz#3064060f568a5718c2a06858cd6e6d24f2ff8632"
239+
integrity sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==
240+
241+
"@rollup/rollup-linux-riscv64-gnu@4.9.5":
242+
version "4.9.5"
243+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz#987d30b5d2b992fff07d055015991a57ff55fbad"
244+
integrity sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==
245+
246+
"@rollup/rollup-linux-x64-gnu@4.9.5":
247+
version "4.9.5"
248+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz#85946ee4d068bd12197aeeec2c6f679c94978a49"
249+
integrity sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==
250+
251+
"@rollup/rollup-linux-x64-musl@4.9.5":
252+
version "4.9.5"
253+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz#fe0b20f9749a60eb1df43d20effa96c756ddcbd4"
254+
integrity sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==
255+
256+
"@rollup/rollup-win32-arm64-msvc@4.9.5":
257+
version "4.9.5"
258+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz#422661ef0e16699a234465d15b2c1089ef963b2a"
259+
integrity sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==
260+
261+
"@rollup/rollup-win32-ia32-msvc@4.9.5":
262+
version "4.9.5"
263+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz#7b73a145891c202fbcc08759248983667a035d85"
264+
integrity sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==
265+
266+
"@rollup/rollup-win32-x64-msvc@4.9.5":
267+
version "4.9.5"
268+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz#10491ccf4f63c814d4149e0316541476ea603602"
269+
integrity sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==
270+
271+
"@types/estree@1.0.5":
272+
version "1.0.5"
273+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
274+
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
275+
189276
"@types/long@^4.0.1":
190277
version "4.0.2"
191278
resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
@@ -606,6 +693,14 @@ flatted@^3.2.9:
606693
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
607694
integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
608695

696+
flowbite@2.2.1:
697+
version "2.2.1"
698+
resolved "https://registry.yarnpkg.com/flowbite/-/flowbite-2.2.1.tgz#9e22be9ff746bccb9fcf87979bbc5e41a16eaf7a"
699+
integrity sha512-iiZyBTtriEDRHrqXZgpKHaxl4B2J8HZUP8Yn1RXozUDKszWHDVj4GxQqMMB9AJHRWOgXV/4E/LJZ/zqQgBUhWA==
700+
dependencies:
701+
"@popperjs/core" "^2.9.3"
702+
mini-svg-data-uri "^1.4.3"
703+
609704
foreground-child@^3.1.0:
610705
version "3.1.1"
611706
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fe 10000 d08efe4a0de1ea1b12d0d"
@@ -907,6 +1002,11 @@ micromatch@^4.0.4, micromatch@^4.0.5:
9071002
braces "^3.0.2"
9081003
picomatch "^2.3.1"
9091004

1005+
mini-svg-data-uri@^1.4.3:
1006+
version "1.4.4"
1007+
resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
1008+
integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==
1009+
9101010
minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
9111011
version "3.1.2"
9121012
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -1180,6 +1280,28 @@ rimraf@^3.0.2:
11801280
dependencies:
11811281
glob "^7.1.3"
11821282

1283+
rollup@^4.9.4:
1284+
version "4.9.5"
1285+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.5.tgz#62999462c90f4c8b5d7c38fc7161e63b29101b05"
1286+
integrity sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==
1287+
dependencies:
1288+
"@types/estree" "1.0.5"
1289+
optionalDependencies:
1290+
"@rollup/rollup-android-arm-eabi" "4.9.5"
1291+
"@rollup/rollup-android-arm64" "4.9.5"
1292+
"@rollup/rollup-darwin-arm64" "4.9.5"
1293+
"@rollup/rollup-darwin-x64" "4.9.5"
1294+
"@rollup/rollup-linux-arm-gnueabihf" "4.9.5"
1295+
"@rollup/rollup-linux-arm64-gnu" "4.9.5"
1296+
"@rollup/rollup-linux-arm64-musl" "4.9.5"
1297+
"@rollup/rollup-linux-riscv64-gnu" "4.9.5"
1298+
"@rollup/rollup-linux-x64-gnu" "4.9.5"
1299+
"@rollup/rollup-linux-x64-musl" "4.9.5"
1300+
"@rollup/rollup-win32-arm64-msvc" "4.9.5"
1301+
"@rollup/rollup-win32-ia32-msvc" "4.9.5"
1302+
"@rollup/rollup-win32-x64-msvc" "4.9.5"
1303+
fsevents "~2.3.2"
1304+
11831305
run-parallel@^1.1.9:
11841306
version "1.2.0"
11851307
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -1209,6 +1331,11 @@ signa 7386 l-exit@^4.0.1:
12091331
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
12101332
integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
12111333

1334+
slash@^4.0.0:
1335+
version "4.0.0"
1336+
resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
1337+
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
1338+
12121339
source-map-js@^1.0.2:
12131340
version "1.0.2"
12141341
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"

0 commit comments

Comments
 (0)
0