Skip to content

Commit

Permalink
[package.json] Revert to original esm build.
Browse files Browse the repository at this point in the history
  • Loading branch information
lgarron committed Apr 12, 2021
1 parent ad7e7aa commit 6023a23
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/lgarron/Makefile-scripts

# Note: the first command becomes the default `make` target.
NPM_COMMANDS = build build-esm build-cjs build-bundle-global build-types build-bin generate-js generate-js-parsers generate-js-svg dev clean test test-jest test-node-require test-node-import format setup lint prepack parcel-build-for-twizzle-net parcel-build-for-vr-cubing-net parcel-build-for-experiments-cubing-net parcel-build-for-twizzle-diaries
NPM_COMMANDS = build build-esm build-cjs build-bundle-global build-types build-bin build-experimental-splitting-build generate-js generate-js-parsers generate-js-svg dev clean test test-jest test-node-require test-node-import format setup lint prepack parcel-build-for-twizzle-net parcel-build-for-vr-cubing-net parcel-build-for-experiments-cubing-net parcel-build-for-twizzle-diaries

.PHONY: $(NPM_COMMANDS)
$(NPM_COMMANDS):
Expand Down
3 changes: 2 additions & 1 deletion alg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "alg",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/alg/index.js",
"module": "../dist/esm/alg/index.js",
"types": "../dist/types/alg/index.d.ts"
}
2 changes: 1 addition & 1 deletion kpuzzle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kpuzzle",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/kpuzzle/index.js",
"types": "../dist/types/kpuzzle/index.d.ts"
}
2 changes: 1 addition & 1 deletion notation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notation",
"type": "module",
"main": "./index.js",
"main": "./dist/esm/notation/index.js",
"types": "../dist/types/notation/index.d.ts"
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
},
"scripts": {
"build": "npm run clean && npm run build-esm && npm run build-cjs && npm run build-bundle-global && npm run build-types && npm run build-bin",
"build-esm": "node src/make/build.js",
"build-dist-esm": "npx esbuild --target=es2015 --bundle --external:three --splitting --format=esm --sourcemap --outdir=dist/esm src/cubing/index.ts src/cubing/alg/index.ts src/cubing/bluetooth/index.ts src/cubing/kpuzzle/index.ts src/cubing/protocol/index.ts src/cubing/puzzle-geometry/index.ts src/cubing/puzzles/index.ts src/cubing/stream/index.ts src/cubing/twisty/index.ts && cp -R src/dist-static/esm/* dist/esm",
"build-esm": "npx esbuild --target=es2015 --bundle --external:three --splitting --format=esm --sourcemap --outdir=dist/esm src/cubing/index.ts src/cubing/alg/index.ts src/cubing/bluetooth/index.ts src/cubing/kpuzzle/index.ts src/cubing/protocol/index.ts src/cubing/puzzle-geometry/index.ts src/cubing/puzzles/index.ts src/cubing/stream/index.ts src/cubing/twisty/index.ts && cp -R src/dist-static/esm/* dist/esm",
"build-cjs": "npx esbuild --target=es2015 --bundle --external:three --format=cjs --outfile=dist/cjs/index.js src/cubing/index.ts && cp -R src/dist-static/cjs/* dist/cjs",
"build-bundle-global": "npx esbuild --target=es2015 --bundle --format=cjs --minify --outdir=dist/bundle-global src/cubing/cubing.bundle-global.ts",
"build-types": "npx tsc src/cubing/*.ts src/cubing/**/*.ts --declaration --emitDeclarationOnly --outDir dist/types --target es2015 --module es2020 --moduleResolution node --lib esnext,dom --resolveJsonModule --allowJs --allowSyntheticDefaultImports # TODO: unify with tsconfig.json",
"build-bin": "npx esbuild --target=es2015 --bundle --external:three --format=esm --outfile=dist/bin/puzzle-geometry-bin.js src/bin/puzzle-geometry-bin.ts",
"build-experimental-splitting-build": "node src/make/build.js",
"generate-js": "npm run generate-js-parsers && npm run generate-js-svg",
"generate-js-parsers": "npx pegjs src/cubing/alg/parser/parser-pegjs.pegjs && npx pegjs src/cubing/kpuzzle/parser/parser-pegjs.pegjs",
"generate-js-svg": "echo \"TODO: Generating JS for SVGs is not implemented yet.\"",
"dev": "npm run clean && npx parcel serve --no-autoinstall src/demo/index.html --port 3333 --open --dist-dir /tmp/cubing-js-parcel # cleaning is a workaround for one set of Parcel bugs, /tmp dir is a workaround dir for other Parcel bugs",
"clean": "rm -rf dist .cache .parcel-cache .rpt2_cache /tmp/cubing-js-parcel; node src/make/clean.js",
"test": "npm run test-jest && npm run lint",
"clean": "rm -rf dist .cache .parcel-cache .rpt2_cache /tmp/cubing-js-parcel",
"test": "npm run test-jest && npm run lint && npm run build-experimental-splitting-build",
"test-jest": "npx jest --collectCoverage",
"test-node-require": "node src/dist-test/require.cjs",
"test-node-import": "node src/dist-test/import.mjs",
Expand Down Expand Up @@ -144,47 +144,47 @@
},
"./alg": {
"require": "./dist/cjs/alg/index.js",
"import": "./alg/index.js",
"import": "./dist/esm/alg/index.js",
"types": "./dist/types/alg/index.d.ts"
},
"./bluetooth": {
"require": "./dist/cjs/bluetooth/index.js",
"import": "./bluetooth/index.js",
"import": "./dist/esm/bluetooth/index.js",
"types": "./dist/types/bluetooth/index.d.ts"
},
"./kpuzzle": {
"require": "./dist/cjs/kpuzzle/index.js",
"import": "./kpuzzle/index.js",
"import": "./dist/esm/kpuzzle/index.js",
"types": "./dist/types/kpuzzle/index.d.ts"
},
"./notation": {
"require": "./dist/cjs/notation/index.js",
"import": "./notation/index.js",
"import": "./dist/esm/notation/index.js",
"types": "./dist/types/notation/index.d.ts"
},
"./protocol": {
"require": "./dist/cjs/protocol/index.js",
"import": "./protocol/index.js",
"import": "./dist/esm/protocol/index.js",
"types": "./dist/types/protocol/index.d.ts"
},
"./puzzle-geometry": {
"require": "./dist/cjs/puzzle-geometry/index.js",
"import": "./puzzle-geometry/index.js",
"import": "./dist/esm/puzzle-geometry/index.js",
"types": "./dist/esm/types/puzzle-geometry/index.d.ts"
},
"./puzzles": {
"require": "./dist/cjs/puzzles/index.js",
"import": "./puzzles/index.js",
"import": "./dist/esm/puzzles/index.js",
"types": "./dist/esm/types-geometry/index.d.ts"
},
"./stream": {
"require": "./dist/cjs/stream/index.js",
"import": "./stream/index.js",
"import": "./dist/esm/stream/index.js",
"types": "./dist/types/stream/index.d.ts"
},
"./twisty": {
"require": "./dist/cjs/twisty/index.js",
"import": "./twisty/index.js",
"import": "./dist/esm/twisty/index.js",
"types": "./dist/types/twisty/index.d.ts"
}
},
Expand Down
2 changes: 1 addition & 1 deletion protocol/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "protocol",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/protocol/index.js",
"types": "../dist/types/protocol/index.d.ts"
}
2 changes: 1 addition & 1 deletion puzzle-geometry/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puzzle-geometry",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/puzzle-geometry/index.js",
"types": "../dist/types/puzzle-geometry/index.d.ts"
}
2 changes: 1 addition & 1 deletion puzzles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puzzles",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/puzzles/index.js",
"types": "../dist/types/puzzles/index.d.ts"
}
3 changes: 2 additions & 1 deletion src/make/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const PATH_TO_SRC_CUBING = resolve(new URL(".", import.meta.url).pathname, "../c
class Target {
constructor(name, targetInfo) {
this.name = name;
this.outdir = `./${this.name}`
// this.outdir = `./${this.name}`
this.outdir = `./dist/experimental-splitting-build/${this.name}`

this.deps = targetInfo.deps;

Expand Down
2 changes: 1 addition & 1 deletion stream/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stream",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/stream/index.js",
"types": "../dist/types/stream/index.d.ts"
}
2 changes: 1 addition & 1 deletion twisty/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twisty",
"type": "module",
"main": "./index.js",
"main": "../dist/esm/twisty/index.js",
"types": "../dist/types/twisty/index.d.ts"
}

0 comments on commit 6023a23

Please sign in to comment.