Skip to content

Commit

Permalink
Merge pull request #3023 from zowe/dev/fix-ze-api-watch
Browse files Browse the repository at this point in the history
build(v3): Fix watch task to detect changes in ZE API package
  • Loading branch information
t1m0thyj authored Jul 29, 2024
2 parents 4548918 + ae65671 commit 2950dfa
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 194 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"rimraf": "^3.0.2",
"terser-webpack-plugin": "^5.3.10",
"ts-jest": "^29.0.3",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"tsx": "^4.9.3",
"typescript": "^5.3.3",
"webpack": "^5.89.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/zowe-explorer-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
"provenance": true
},
"main": "lib/index.js",
"exports": {
".": {
"@zowe:bundler": "./src/index.ts",
"default": "./lib/index.js"
}
},
"files": [
"lib"
],
Expand Down
8 changes: 1 addition & 7 deletions packages/zowe-explorer-ftp-extension/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ const path = require("path");
const webpack = require("webpack");
const fs = require("fs");
const TerserPlugin = require("terser-webpack-plugin");

const { TsconfigPathsPlugin } = require("tsconfig-paths-webpack-plugin");
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");

/**@type {webpack.Configuration}*/
Expand All @@ -39,11 +37,7 @@ const config = {
alias: {
"@zowe/zowe-explorer-api$": path.resolve(__dirname, "..", "zowe-explorer-api/src"),
},
plugins: [
new TsconfigPathsPlugin({
references: ["../zowe-explorer-api"],
}),
],
conditionNames: ["@zowe:bundler", "..."],
},
watchOptions: {
ignored: /node_modules/,
Expand Down
6 changes: 3 additions & 3 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@
]
},
"scripts": {
"build": "pnpm clean:bundle && pnpm license && webpack --mode development && pnpm madge",
"build": "pnpm copy-secrets && pnpm clean:bundle && pnpm license && webpack --mode development && pnpm madge",
"test": "pnpm test:unit",
"test:e2e": "cd __tests__/__e2e__/ && wdio run ./wdio.conf.ts",
"test:integration": "cd __tests__/__integration__/bdd && wdio run ./wdio.conf.ts",
Expand All @@ -1772,7 +1772,8 @@
"pretty": "prettier --write .",
"createTestProfileData": "tsx ./scripts/createTestProfileData.ts",
"createDemoNodes": "tsx ./scripts/createDemoNodes.ts",
"generateLocalization": "pnpm dlx @vscode/l10n-dev export --o ./l10n ./src && node ./scripts/generatePoeditorJson.js"
"generateLocalization": "pnpm dlx @vscode/l10n-dev export --o ./l10n ./src && node ./scripts/generatePoeditorJson.js",
"copy-secrets": "tsx ./scripts/getSecretsPrebuilds.ts"
},
"engines": {
"vscode": "^1.79.0"
Expand All @@ -1796,7 +1797,6 @@
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
"chalk": "^2.4.1",
"copy-webpack-plugin": "^12.0.2",
"eslint-plugin-zowe-explorer": "3.0.0-next-SNAPSHOT",
"expect": "^24.8.0",
"expect-webdriverio": "^4.13.0",
Expand Down
12 changes: 1 addition & 11 deletions packages/zowe-explorer/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
const path = require("path");
const webpack = require("webpack");
const fs = require("fs");
const CopyPlugin = require("copy-webpack-plugin");
const TerserPlugin = require("terser-webpack-plugin");

const { TsconfigPathsPlugin } = require("tsconfig-paths-webpack-plugin");
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");

/**@type {webpack.Configuration}*/
Expand All @@ -39,11 +36,7 @@ const config = {
alias: {
"@zowe/zowe-explorer-api$": path.resolve(__dirname, "..", "zowe-explorer-api/src"),
},
plugins: [
new TsconfigPathsPlugin({
references: ["../zowe-explorer-api"],
}),
],
conditionNames: ["@zowe:bundler", "..."],
},
watchOptions: {
ignored: /node_modules/,
Expand Down Expand Up @@ -94,9 +87,6 @@ const config = {
},
plugins: [
new webpack.BannerPlugin(fs.readFileSync("../../scripts/LICENSE_HEADER", "utf-8")),
new CopyPlugin({
patterns: [{ from: "../../node_modules/@zowe/secrets-for-zowe-sdk/prebuilds", to: "../../prebuilds/" }],
}),
new ForkTsCheckerWebpackPlugin({
typescript: {
build: true,
Expand Down
172 changes: 0 additions & 172 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2950dfa

Please sign in to comment.