Skip to content

Commit e0e1a8e

Browse files
committed
fix: consume build tools directly from github and copy during build
1 parent ffd6e1f commit e0e1a8e

File tree

6 files changed

+25
-40
lines changed

6 files changed

+25
-40
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ vendor/generated-*.txt
1414
# IDEs
1515
.vscode
1616
# System
17-
.DS_Store
18-
shared/
17+
.DS_Store
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
const { copyTask } = require('../utils/gulp-utils');
4+
5+
const copyBuildTools = copyTask(
6+
'build-tools',
7+
'node_modules/@cloudscape-design/build-tools/**/*',
8+
'lib/dev-pages/internal/build-tools'
9+
);
10+
11+
module.exports = copyBuildTools;

build-tools/tasks/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
integ: require('./integ'),
1919
motion: require('./motion'),
2020
copyFiles: require('./copy-files'),
21+
copyBuildTools: require('./copy-build-tools'),
2122
themeableSource: require('./themeable-source'),
2223
bundleVendorFiles: require('./bundle-vendor-files'),
2324
sizeLimit: require('./size-limit'),

gulpfile.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,23 @@ const {
2020
integ,
2121
motion,
2222
copyFiles,
23+
copyBuildTools,
2324
themeableSource,
2425
bundleVendorFiles,
2526
sizeLimit,
2627
} = require('./build-tools/tasks');
2728

2829
const quickBuild = series(
2930
clean,
30-
parallel(packageJSON, generateI18nMessages, generateEnvironment, generateIcons, generateIndexFile, copyFiles),
31+
parallel(
32+
packageJSON,
33+
generateI18nMessages,
34+
generateEnvironment,
35+
generateIcons,
36+
generateIndexFile,
37+
copyFiles,
38+
copyBuildTools
39+
),
3140
parallel(generateCustomCssPropertiesMap, styles, typescript, testUtils),
3241
bundleVendorFiles
3342
);

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"start:integ": "cross-env NODE_ENV=development webpack serve --config pages/webpack.config.integ.cjs",
2626
"start:react18": "npm-run-all --parallel start:watch start:react18:dev",
2727
"start:react18:dev": "cross-env NODE_ENV=development REACT_VERSION=18 webpack serve --config pages/webpack.config.cjs",
28-
"prepare": "husky",
29-
"preinstall": "node ./scripts/setup-build-tools"
28+
"prepare": "husky"
3029
},
3130
"dependencies": {
3231
"@cloudscape-design/collection-hooks": "^1.0.0",
@@ -54,8 +53,7 @@
5453
"@babel/core": "^7.23.7",
5554
"@babel/plugin-syntax-typescript": "^7.23.3",
5655
"@cloudscape-design/browser-test-tools": "^3.0.0",
57-
"@cloudscape-design/build-tools-repo": "github:cloudscape-design/build-tools#add-test-pages-util-permutation-view",
58-
"@cloudscape-design/build-tools": "file:./shared/build-tools",
56+
"@cloudscape-design/build-tools": "github:cloudscape-design/build-tools#main",
5957
"@cloudscape-design/documenter": "^1.0.0",
6058
"@cloudscape-design/global-styles": "^1.0.0",
6159
"@cloudscape-design/jest-preset": "^2.0.0",

scripts/setup-build-tools.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)