Skip to content

Commit 25f13ce

Browse files
the-spykethe-spyke
committed
chore: Fix build issues
1 parent d508ef2 commit 25f13ce

File tree

14 files changed

+114
-72
lines changed

14 files changed

+114
-72
lines changed

‎.circleci/config.yml

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ executors:
44
node_12:
55
docker:
66
- image: node:12-buster
7-
node_14:
7+
node:
88
docker:
9-
- image: node:14-buster
10-
node_15:
11-
docker:
12-
- image: node:15-buster
9+
- image: node:16-buster
1310

1411
orbs:
1512
codecov: codecov/[email protected]
@@ -180,7 +177,7 @@ jobs:
180177
- finalize
181178

182179
build_collections:
183-
executor: node_15
180+
executor: node
184181
working_directory: /mnt/ramdisk
185182
steps:
186183
- initialize
@@ -189,7 +186,7 @@ jobs:
189186
- finalize
190187

191188
build_node:
192-
executor: node_12
189+
executor: node
193190
working_directory: /mnt/ramdisk
194191
steps:
195192
- initialize
@@ -200,7 +197,7 @@ jobs:
200197
- finalize
201198

202199
build_pull:
203-
executor: node_15
200+
executor: node
204201
working_directory: /mnt/ramdisk
205202
steps:
206203
- initialize
@@ -209,16 +206,25 @@ jobs:
209206
- finalize
210207

211208
build_push:
212-
executor: node_15
209+
executor: node
213210
working_directory: /mnt/ramdisk
214211
steps:
215212
- initialize
216213
- build:
217214
path: packages/undercut-push
218215
- finalize
219216

217+
build_types:
218+
executor: node
219+
working_directory: /mnt/ramdisk
220+
steps:
221+
- initialize
222+
- build:
223+
path: packages/undercut-types
224+
- finalize
225+
220226
build_utils:
221-
executor: node_15
227+
executor: node
222228
working_directory: /mnt/ramdisk
223229
steps:
224230
- initialize
@@ -227,7 +233,7 @@ jobs:
227233
- finalize
228234

229235
build_web_2019:
230-
executor: node_15
236+
executor: node
231237
working_directory: /mnt/ramdisk
232238
steps:
233239
- initialize
@@ -238,7 +244,7 @@ jobs:
238244
- finalize
239245

240246
build_website:
241-
executor: node_15
247+
executor: node
242248
working_directory: /mnt/ramdisk
243249
steps:
244250
- initialize
@@ -247,7 +253,7 @@ jobs:
247253
- finalize
248254

249255
setup:
250-
executor: node_15
256+
executor: node
251257
working_directory: /mnt/ramdisk
252258
steps:
253259
- initialize:
@@ -261,7 +267,7 @@ jobs:
261267
persist: false
262268

263269
test_core:
264-
executor: node_15
270+
executor: node
265271
working_directory: /mnt/ramdisk
266272
steps:
267273
- initialize
@@ -271,7 +277,7 @@ jobs:
271277
persist: false
272278

273279
release:
274-
executor: node_15
280+
executor: node
275281
working_directory: /mnt/ramdisk
276282
steps:
277283
- attach_workspace:
@@ -312,6 +318,11 @@ workflows:
312318
- test_core
313319
filters:
314320
<<: *filters-release
321+
- build_types:
322+
requires:
323+
- test_core
324+
filters:
325+
<<: *filters-release
315326
- build_utils:
316327
requires:
317328
- test_core
@@ -345,8 +356,10 @@ workflows:
345356
requires:
346357
- build_cli
347358
- build_collections
359+
- build_node
348360
- build_pull
349361
- build_push
362+
- build_types
350363
- build_utils
351364
- build_web_2019
352365
- build_website

‎packages/undercut-cli/scripts/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ rm -rf $BUILD
1010
mkdir $BUILD
1111

1212
cp -v LICENSE README.md $BUILD
13-
node scripts/fix_package_json.cjs package.json $BUILD/package.json
13+
node ./scripts/fix_package_json.js package.json $BUILD/package.json
1414

15-
babel src/cli.js src/index.js src/polyfills.js --out-dir $BUILD/lib --source-maps
15+
babel ./src/cli.js ./src/index.js ./src/polyfills.js --out-dir $BUILD/lib --source-maps

‎packages/undercut-cli/scripts/fix_package_json.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { modifyJsonFile } from "@undercut/config/modify_json_file.js";
22

33
modifyJsonFile(json => {
4-
json.main = `lib/index.js`;
5-
json.bin.undercut = `lib/cli.js`;
4+
json.main = `./lib/index.js`;
5+
json.bin.undercut = `./lib/cli.js`;
66
});

‎packages/undercut-types/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../LICENSE

‎packages/undercut-types/scripts/fix_package_json.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { modifyJsonFile } from "@undercut/config/modify_json_file.js";
22

33
modifyJsonFile(json => {
4-
json.main = `./src/index.js`;
4+
delete json.main;
55
json.types = `./src/index.d.ts`;
66
});

‎packages/undercut-utils/src/promise.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export function delay<T>(promise: Promise<T>, time?: number): Promise<T> {
44
return promise.then(v => wait(time).then(() => v));
55
}
66

7-
export function wait(time?: number): Promise<undefined> {
7+
export function wait(time?: number): Promise<void> {
88
return new Promise(res => void setTimeout(res, time as number)); // eslint-disable-line no-void
99
}
1010

‎packages/undercut-web-2019/babel.config.cjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = {
1616
targets: `since 2019, edge >= 18, not android > 0`,
1717
useBuiltIns: `entry`,
1818
}
19-
]
19+
],
20+
`@babel/preset-typescript`,
2021
],
2122
};

‎packages/undercut-web-2019/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"devDependencies": {
1818
"@babel/core": "^7.12.10",
1919
"@babel/preset-env": "^7.12.11",
20+
"@babel/preset-typescript": "^7.12.16",
2021
"@jest/globals": "^26.6.2",
2122
"@undercut/config": "^1.0.0",
2223
"@undercut/pull": "^0.6.1",
@@ -28,14 +29,11 @@
2829
"eslint": "^7.15.0",
2930
"jest": "^26.6.3",
3031
"jest-circus": "^26.6.3",
32+
"ts-loader": "^9.2.6",
33+
"typescript": "^4.4.3",
3134
"webpack": "^4.44.2",
3235
"webpack-cli": "^4.2.0"
3336
},
34-
"exports": {
35-
"./pull": "./pull.js",
36-
"./push": "./push.js",
37-
"./utils": "./utils.js"
38-
},
3937
"homepage": "https://undercut.js.org",
4038
"repository": {
4139
"type": "git",

‎packages/undercut-web-2019/scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ rm -rf $BUILD
1010
mkdir $BUILD
1111

1212
cp -v LICENSE README.md $BUILD
13-
node scripts/fix_package_json.cjs package.json $BUILD/package.json
13+
node ./scripts/fix_package_json.js package.json $BUILD/package.json
1414

1515
webpack --config webpack.config.cjs

‎packages/undercut-web-2019/scripts/fix_package_json.cjs renamed to ‎packages/undercut-web-2019/scripts/fix_package_json.js

File renamed without changes.

0 commit comments

Comments
 (0)