+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/shepherd.js/dummy/index.html b/shepherd.js/dummy/index.html
index 2a8503124..3a28c2235 100644
--- a/shepherd.js/dummy/index.html
+++ b/shepherd.js/dummy/index.html
@@ -107,7 +107,7 @@ Example
★ on Github
diff --git a/shepherd.js/package.json b/shepherd.js/package.json
index f5c2fc42f..5bba83d08 100644
--- a/shepherd.js/package.json
+++ b/shepherd.js/package.json
@@ -11,7 +11,7 @@
"homepage": "https://shepherdjs.dev",
"repository": {
"type": "git",
- "url": "git+https://github.com/shepherd-pro/shepherd.git"
+ "url": "git+https://github.com/shipshapecode/shepherd.git"
},
"license": "AGPL-3.0",
"authors": [
@@ -19,16 +19,12 @@
"Chuck Carpenter "
],
"main": "./dist/cjs/shepherd.cjs",
- "module": "./dist/esm/shepherd.mjs",
+ "module": "./dist/js/shepherd.mjs",
"exports": {
".": {
"import": {
- "types": "./dist/esm/shepherd.d.mts",
- "default": "./dist/esm/shepherd.mjs"
- },
- "require": {
- "types": "./dist/cjs/shepherd.d.cts",
- "default": "./dist/cjs/shepherd.cjs"
+ "types": "./dist/js/shepherd.d.mts",
+ "default": "./dist/js/shepherd.mjs"
}
},
"./dist/css/shepherd.css": "./dist/css/shepherd.css"
@@ -45,9 +41,8 @@
"lint:prettier": "prettier --check '**/*.{js,svelte,ts}'",
"lint:prettier:fix": "prettier --write '**/*.{js,svelte,ts}'",
"prepack": "pnpm build",
- "types:check": "pnpm types:check:cjs && pnpm types:check:esm && pnpm types:check:attw",
+ "types:check": "pnpm types:check:esm && pnpm types:check:attw",
"types:check:attw": "pnpm attw --pack . --exclude-entrypoints ./dist/css/shepherd.css",
- "types:check:cjs": "pnpm tsc --module commonjs --moduleResolution node10 --verbatimModuleSyntax false --noEmit true --emitDeclarationOnly false",
"types:check:esm": "pnpm tsc --module esnext --moduleResolution bundler --noEmit true --emitDeclarationOnly false",
"watch": "pnpm clean && rollup -c --environment DEVELOPMENT --watch"
},
@@ -65,6 +60,7 @@
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-replace": "^6.0.2",
+ "@rollup/plugin-terser": "^0.4.4",
"autoprefixer": "^10.4.21",
"cssnano": "^7.1.1",
"dts-bundle-generator": "^9.5.1",
@@ -83,11 +79,11 @@
"rollup-plugin-livereload": "^2.0.5",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-serve": "^2.0.2",
- "rollup-plugin-svelte": "^7.2.0",
+ "rollup-plugin-svelte": "^7.2.2",
"rollup-plugin-visualizer": "^5.14.0",
- "svelte": "^4.2.19",
+ "svelte": "^5.25.3",
"svelte-preprocess": "^6.0.3",
- "svelte2tsx": "^0.7.8",
+ "svelte2tsx": "0.7.13",
"typescript": "^5.7.3"
},
"packageManager": "pnpm@9.15.4",
diff --git a/shepherd.js/rollup.config.mjs b/shepherd.js/rollup.config.mjs
index 901042aeb..47f55fd1d 100644
--- a/shepherd.js/rollup.config.mjs
+++ b/shepherd.js/rollup.config.mjs
@@ -1,8 +1,6 @@
import autoprefixer from 'autoprefixer';
import { execaCommand } from 'execa';
import fs from 'fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
import cssnanoPlugin from 'cssnano';
import { babel } from '@rollup/plugin-babel';
import serve from 'rollup-plugin-serve';
@@ -12,21 +10,22 @@ import license from 'rollup-plugin-license';
import postcss from 'rollup-plugin-postcss';
import replace from '@rollup/plugin-replace';
import { nodeResolve } from '@rollup/plugin-node-resolve';
-import sveltePreprocess from 'svelte-preprocess';
+import { sveltePreprocess } from 'svelte-preprocess';
import svelte from 'rollup-plugin-svelte';
import { visualizer } from 'rollup-plugin-visualizer';
import { emitDts } from 'svelte2tsx';
+import terser from '@rollup/plugin-terser';
const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
const banner = ['/*!', pkg.name, pkg.version, '*/\n'].join(' ');
-const env = process.env.DEVELOPMENT ? 'development' : 'production';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const isDev = process.env.DEVELOPMENT;
+const env = isDev ? 'development' : 'production';
const plugins = [
svelte({
preprocess: sveltePreprocess({
+ globalStyle: true,
typescript: true
}),
emitCss: true
@@ -35,16 +34,18 @@ const plugins = [
browser: true,
exportConditions: ['svelte'],
extensions: ['.js', '.json', '.mjs', '.svelte', '.ts'],
- modulesOnly: true
+ modulesOnly: true,
+ preferBuiltins: false
}),
replace({
- 'process.env.NODE_ENV': JSON.stringify(env)
+ 'process.env.NODE_ENV': JSON.stringify(env),
+ preventAssignment: true
}),
babel({
extensions: ['.cjs', '.js', '.ts', '.mjs', '.html', '.svelte']
}),
postcss({
- plugins: [autoprefixer, cssnanoPlugin],
+ plugins: isDev ? [autoprefixer] : [autoprefixer, cssnanoPlugin],
extract: 'css/shepherd.css'
}),
license({
@@ -56,8 +57,23 @@ const plugins = [
// If we are running with --environment DEVELOPMENT, serve via browsersync for local development
if (process.env.DEVELOPMENT) {
- plugins.push(serve({ contentBase: ['.', 'dist', 'dummy'], open: true }));
+ plugins.push(
+ serve({ contentBase: ['.', 'dist', 'dev', 'dummy'], open: true })
+ );
plugins.push(livereload());
+} else {
+ plugins.push(
+ terser({
+ compress: {
+ drop_console: true,
+ drop_debugger: true,
+ pure_funcs: ['console.log', 'console.debug']
+ },
+ mangle: {
+ properties: false
+ }
+ })
+ );
}
export default [
@@ -65,11 +81,17 @@ export default [
input: 'src/shepherd.ts',
output: {
- dir: 'tmp/esm',
+ dir: 'tmp/js',
entryFileNames: '[name].mjs',
format: 'es',
sourcemap: true
},
+ // More aggressive tree shaking
+ treeshake: {
+ moduleSideEffects: false,
+ propertyReadSideEffects: false,
+ unknownGlobalSideEffects: false
+ },
plugins: [
{
name: 'Build Declarations',
@@ -80,13 +102,13 @@ export default [
svelteShimsPath: import.meta.resolve(
'svelte2tsx/svelte-shims-v4.d.ts'
),
- declarationDir: 'tmp/esm'
+ declarationDir: 'tmp/js'
});
console.log('Rename .svelte.d.ts to .d.svelte.ts');
await execaCommand(
- `renamer --find .svelte.d.ts --replace .d.svelte.ts tmp/esm/**`,
+ `renamer --find .svelte.d.ts --replace .d.svelte.ts tmp/js/**`,
{
stdio: 'inherit'
}
@@ -103,74 +125,21 @@ export default [
stdio: 'inherit'
});
- await execaCommand(
- `cp ./tmp/esm/css/shepherd.css ./dist/css/shepherd.css`,
- {
- stdio: 'inherit'
- }
- );
-
- console.log('Rollup TS declarations to one file');
-
- await execaCommand(
- `pnpm dts-bundle-generator --no-check -o ./dist/esm/shepherd.d.mts ./tmp/esm/shepherd.d.ts`,
- {
- stdio: 'inherit'
- }
- );
-
- console.log('Move shepherd.js from tmp to dist');
-
- await execaCommand(
- `mv ./tmp/esm/shepherd.mjs ./tmp/esm/shepherd.mjs.map ./dist/esm/`,
- {
- stdio: 'inherit'
- }
- );
- }
- }
- ]
- },
- {
- input: 'src/shepherd.ts',
-
- output: {
- dir: 'tmp/cjs',
- entryFileNames: '[name].cjs',
- format: 'cjs',
- sourcemap: true
- },
- plugins: [
- {
- name: 'Build Declarations',
- buildStart: async () => {
- console.log('Generating Svelte declarations for CJS');
-
- await emitDts({
- svelteShimsPath: import.meta.resolve(
- 'svelte2tsx/svelte-shims-v4.d.ts'
- ),
- declarationDir: 'tmp/cjs'
+ await execaCommand(`mkdir -p ./dist/js`, {
+ stdio: 'inherit'
});
- console.log('Rename .svelte.d.ts to .d.svelte.ts');
-
await execaCommand(
- `renamer --find .svelte.d.ts --replace .d.svelte.ts tmp/cjs/**`,
+ `cp ./tmp/js/css/shepherd.css ./dist/css/shepherd.css`,
{
stdio: 'inherit'
}
);
- }
- },
- ...plugins,
- {
- name: 'After build tweaks',
- closeBundle: async () => {
+
console.log('Rollup TS declarations to one file');
await execaCommand(
- `pnpm dts-bundle-generator --no-check -o ./dist/cjs/shepherd.d.cts ./tmp/cjs/shepherd.d.ts`,
+ `pnpm dts-bundle-generator --no-check -o ./dist/js/shepherd.d.mts ./tmp/js/shepherd.d.ts`,
{
stdio: 'inherit'
}
@@ -179,25 +148,11 @@ export default [
console.log('Move shepherd.js from tmp to dist');
await execaCommand(
- `mv ./tmp/cjs/shepherd.cjs ./tmp/cjs/shepherd.cjs.map ./dist/cjs/`,
+ `mv ./tmp/js/shepherd.mjs ./tmp/js/shepherd.mjs.map ./dist/js/`,
{
stdio: 'inherit'
}
);
-
- console.log('Fix CJS export default -> export =');
-
- const declarationFile = path.join(
- __dirname,
- 'dist/cjs',
- 'shepherd.d.cts'
- );
- let content = fs.readFileSync(declarationFile, 'utf8');
- content = content.replace(
- /export {[\n\r]+[ \t]+Shepherd as default,[\n\r]};/g,
- 'export = Shepherd;'
- );
- fs.writeFileSync(declarationFile, content);
}
}
]
diff --git a/shepherd.js/src/components/shepherd-button.svelte b/shepherd.js/src/components/shepherd-button.svelte
index 0be08e80f..4c2d52ee7 100644
--- a/shepherd.js/src/components/shepherd-button.svelte
+++ b/shepherd.js/src/components/shepherd-button.svelte
@@ -1,17 +1,7 @@
+