Skip to content

Commit a7196d5

Browse files
Fix inclusion of spectacle package.json for CLI (#1307)
* Fix inclusion of spectacle package.json for CLI * Update GH Action * Add the cp package to test deps.
1 parent 7f6b26a commit a7196d5

File tree

6 files changed

+220
-366
lines changed

6 files changed

+220
-366
lines changed

.changeset/modern-ducks-try.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-spectacle': patch
3+
---
4+
5+
Fix inclusion of Spectacle library package.json

.github/workflows/create-spectacle.yml

+3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
- name: Install dependencies
5252
run: pnpm install
5353

54+
- name: Copy Spectacle package
55+
run: pnpm run --filter ./packages/create-spectacle copy-spectacle-package
56+
5457
- name: Build create-spectacle
5558
run: pnpm run --filter ./packages/create-spectacle build
5659

packages/create-spectacle/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
tmp
2+
spectacle-package.json

packages/create-spectacle/package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "Project generator for Spectacle",
55
"main": "bin/cli.js",
66
"files": [
7-
"bin/"
7+
"bin/",
8+
"spectacle-package.json"
89
],
910
"bin": "bin/cli.js",
1011
"author": "Formidable Labs <[email protected]>",
@@ -26,18 +27,22 @@
2627
"devDependencies": {
2728
"@types/node": "^18.0.3",
2829
"@types/prompts": "^2.0.14",
30+
"shx": "^0.3.4",
2931
"spectacle": "*"
3032
},
3133
"resolutions": {},
3234
"scripts": {
33-
"dev": "ts-node src/cli.ts",
35+
"dev": "pnpm copy-spectacle-package && ts-node src/cli.ts",
3436
"build": "wireit",
3537
"types:check": "wireit",
3638
"lint": "wireit",
3739
"lint:fix": "wireit",
3840
"prettier": "wireit",
3941
"prettier:fix": "wireit",
4042
"test": "wireit",
43+
"copy-spectacle-package": "shx cp ../spectacle/package.json ./spectacle-package.json",
44+
"prepack": "pnpm copy-spectacle-package",
45+
"postpack": "shx rm ./spectacle-package.json",
4146
"examples:clean": "rimraf .examples",
4247
"examples:test": "nps jest",
4348
"examples:jsx:clean": "rimraf .examples/jsx",
@@ -147,6 +152,7 @@
147152
},
148153
"test": {
149154
"dependencies": [
155+
"copy-spectacle-package",
150156
"build"
151157
],
152158
"command": "jest --testMatch=\"<rootDir>/src/*.test.ts\"",

packages/create-spectacle/src/generators/one-page.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
import path from 'path';
21
import { onePageTemplate } from '../templates/one-page';
32

4-
const SPECTACLE_PATH = path.resolve(__dirname, '../../../spectacle');
5-
const spectaclePackage = require(`${SPECTACLE_PATH}/package.json`);
3+
const spectaclePackage = require(`${__dirname}/../../spectacle-package.json`);
64
const REACT_VERSION = spectaclePackage.devDependencies.react.replace('^', '');
75
const ESM_SH_VERSION = 'v121';
86

97
export const generateImportMap = () => {
108
const importMap = new Map<string, string>();
11-
const {
12-
dependencies,
13-
peerDependencies
14-
} = require(`${SPECTACLE_PATH}/package.json`);
9+
const { dependencies, peerDependencies } = spectaclePackage;
1510

1611
importMap.set('htm', importUrl('htm', '^3'));
1712
importMap.set('spectacle', 'https://esm.sh/spectacle@10?bundle');

0 commit comments

Comments
 (0)