@mschauer5/spfx-toolkit 1.0.13 → 1.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -82,8 +82,6 @@ const run = (scriptName, options) => __awaiter(void 0, void 0, void 0, function*
|
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
if (scriptName === 'serve') {
|
|
85
|
-
// const isGulp = await util.isUsingGulp();
|
|
86
|
-
// if (isGulp) {
|
|
87
85
|
const envFilePath = path_1.default.join(process.cwd(), '.env');
|
|
88
86
|
const envFileExists = yield common_1.util.checkIfFileExistsAsync(envFilePath, false);
|
|
89
87
|
if (envFileExists) {
|
|
@@ -100,7 +98,6 @@ const run = (scriptName, options) => __awaiter(void 0, void 0, void 0, function*
|
|
|
100
98
|
process.env['SPFX_SERVE_TENANT_DOMAIN'] = envVars['tenantDomain'];
|
|
101
99
|
}
|
|
102
100
|
}
|
|
103
|
-
// }
|
|
104
101
|
}
|
|
105
102
|
const value = yield getScriptByName(scriptName);
|
|
106
103
|
if (!value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.command.js","sourceRoot":"","sources":["../../src/commands/scripts.command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scripts.command.js","sourceRoot":"","sources":["../../src/commands/scripts.command.ts"],"names":[],"mappings":"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"}
|
package/lib/common/util.js
CHANGED
|
@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.installHeftDotenvPlugin = void 0;
|
|
16
15
|
exports.checkIfFileExistsAsync = checkIfFileExistsAsync;
|
|
17
16
|
exports.getGlobalConfigPaths = getGlobalConfigPaths;
|
|
18
17
|
exports.isUsingGulp = isUsingGulp;
|
|
@@ -21,7 +20,6 @@ exports.initGlobalPackageJsonWithDefaults = initGlobalPackageJsonWithDefaults;
|
|
|
21
20
|
const fs_1 = require("fs");
|
|
22
21
|
const os_1 = __importDefault(require("os"));
|
|
23
22
|
const path_1 = __importDefault(require("path"));
|
|
24
|
-
const logger_1 = require("./logger");
|
|
25
23
|
function checkIfFileExistsAsync(filename_1) {
|
|
26
24
|
return __awaiter(this, arguments, void 0, function* (filename, includeError = true) {
|
|
27
25
|
try {
|
|
@@ -78,7 +76,7 @@ function initGlobalPackageJsonWithDefaults(force) {
|
|
|
78
76
|
'build:heft': 'heft build',
|
|
79
77
|
'bundle:gulp': 'gulp clean && gulp bundle --ship && gulp package-solution --ship',
|
|
80
78
|
'bundle:heft': 'heft build --clean && heft package',
|
|
81
|
-
'serve:heft': 'heft
|
|
79
|
+
'serve:heft': 'heft build-watch --serve',
|
|
82
80
|
'serve:gulp': 'gulp serve'
|
|
83
81
|
};
|
|
84
82
|
const packageJsonContent = yield fs_1.promises.readFile(configPath, 'utf-8');
|
|
@@ -93,40 +91,4 @@ function initGlobalPackageJsonWithDefaults(force) {
|
|
|
93
91
|
yield fs_1.promises.writeFile(configPath, JSON.stringify(packageJson, null, 2), 'utf-8');
|
|
94
92
|
});
|
|
95
93
|
}
|
|
96
|
-
const installHeftDotenvPlugin = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
97
|
-
if (yield isUsingGulp()) {
|
|
98
|
-
logger_1.logger.error('Heft .env plugin can only be installed in projects using Heft, but Gulp was detected.');
|
|
99
|
-
return;
|
|
100
|
-
}
|
|
101
|
-
const spawn = require('child_process').spawnSync;
|
|
102
|
-
const result = spawn('npm', ['install', '--save-dev', '@mschauer5/heft-dotenv-plugin'], {
|
|
103
|
-
stdio: 'inherit',
|
|
104
|
-
shell: true
|
|
105
|
-
});
|
|
106
|
-
if (result.error) {
|
|
107
|
-
logger_1.logger.error(`Error installing @mschauer5/heft-dotenv-plugin: ${result.error.message}`);
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
|
-
// Modify heft.json to include the dotenv plugin
|
|
111
|
-
const heftConfigPath = path_1.default.join(process.cwd(), 'config', 'heft.json');
|
|
112
|
-
let heftConfig = {};
|
|
113
|
-
try {
|
|
114
|
-
const heftConfigContent = yield fs_1.promises.readFile(heftConfigPath, 'utf-8');
|
|
115
|
-
heftConfig = JSON.parse(heftConfigContent);
|
|
116
|
-
}
|
|
117
|
-
catch (err) {
|
|
118
|
-
logger_1.logger.error(`Error reading heft.json: ${err.message}`);
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
heftConfig.heftPlugins = heftConfig.heftPlugins || [];
|
|
122
|
-
if (!heftConfig.heftPlugins.some((plugin) => plugin.pluginPackage === '@mschauer5/heft-dotenv-plugin')) {
|
|
123
|
-
heftConfig.heftPlugins.push({ pluginPackage: '@mschauer5/heft-dotenv-plugin' });
|
|
124
|
-
yield fs_1.promises.writeFile(heftConfigPath, JSON.stringify(heftConfig, null, 2), 'utf-8');
|
|
125
|
-
logger_1.logger.success('Added @mschauer5/heft-dotenv-plugin to heft.json plugins.');
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
logger_1.logger.info('@mschauer5/heft-dotenv-plugin is already included in heft.json plugins.');
|
|
129
|
-
}
|
|
130
|
-
});
|
|
131
|
-
exports.installHeftDotenvPlugin = installHeftDotenvPlugin;
|
|
132
94
|
//# sourceMappingURL=util.js.map
|
package/lib/common/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -69,8 +69,6 @@ export const run = async (scriptName: string, options?: any) => {
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
if (scriptName === 'serve') {
|
|
72
|
-
// const isGulp = await util.isUsingGulp();
|
|
73
|
-
// if (isGulp) {
|
|
74
72
|
const envFilePath = path.join(process.cwd(), '.env');
|
|
75
73
|
const envFileExists = await util.checkIfFileExistsAsync(envFilePath, false);
|
|
76
74
|
if (envFileExists) {
|
|
@@ -87,7 +85,6 @@ export const run = async (scriptName: string, options?: any) => {
|
|
|
87
85
|
process.env['SPFX_SERVE_TENANT_DOMAIN'] = envVars['tenantDomain'];
|
|
88
86
|
}
|
|
89
87
|
}
|
|
90
|
-
// }
|
|
91
88
|
}
|
|
92
89
|
|
|
93
90
|
const value = await getScriptByName(scriptName);
|
package/src/common/util.ts
CHANGED
|
@@ -56,7 +56,7 @@ export async function initGlobalPackageJsonWithDefaults(force?: boolean) {
|
|
|
56
56
|
'build:heft': 'heft build',
|
|
57
57
|
'bundle:gulp': 'gulp clean && gulp bundle --ship && gulp package-solution --ship',
|
|
58
58
|
'bundle:heft': 'heft build --clean && heft package',
|
|
59
|
-
'serve:heft': 'heft
|
|
59
|
+
'serve:heft': 'heft build-watch --serve',
|
|
60
60
|
'serve:gulp': 'gulp serve'
|
|
61
61
|
};
|
|
62
62
|
|
|
@@ -73,39 +73,3 @@ export async function initGlobalPackageJsonWithDefaults(force?: boolean) {
|
|
|
73
73
|
|
|
74
74
|
await fsPromises.writeFile(configPath, JSON.stringify(packageJson, null, 2), 'utf-8');
|
|
75
75
|
}
|
|
76
|
-
|
|
77
|
-
export const installHeftDotenvPlugin = async () => {
|
|
78
|
-
if (await isUsingGulp()) {
|
|
79
|
-
logger.error('Heft .env plugin can only be installed in projects using Heft, but Gulp was detected.');
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
const spawn = require('child_process').spawnSync;
|
|
84
|
-
const result = spawn('npm', ['install', '--save-dev', '@mschauer5/heft-dotenv-plugin'], {
|
|
85
|
-
stdio: 'inherit',
|
|
86
|
-
shell: true
|
|
87
|
-
});
|
|
88
|
-
if (result.error) {
|
|
89
|
-
logger.error(`Error installing @mschauer5/heft-dotenv-plugin: ${result.error.message}`);
|
|
90
|
-
return;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
// Modify heft.json to include the dotenv plugin
|
|
94
|
-
const heftConfigPath = path.join(process.cwd(), 'config', 'heft.json');
|
|
95
|
-
let heftConfig: any = {};
|
|
96
|
-
try {
|
|
97
|
-
const heftConfigContent = await fsPromises.readFile(heftConfigPath, 'utf-8');
|
|
98
|
-
heftConfig = JSON.parse(heftConfigContent);
|
|
99
|
-
} catch (err) {
|
|
100
|
-
logger.error(`Error reading heft.json: ${err.message}`);
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
103
|
-
heftConfig.heftPlugins = heftConfig.heftPlugins || [];
|
|
104
|
-
if (!heftConfig.heftPlugins.some((plugin: any) => plugin.pluginPackage === '@mschauer5/heft-dotenv-plugin')) {
|
|
105
|
-
heftConfig.heftPlugins.push({ pluginPackage: '@mschauer5/heft-dotenv-plugin' });
|
|
106
|
-
await fsPromises.writeFile(heftConfigPath, JSON.stringify(heftConfig, null, 2), 'utf-8');
|
|
107
|
-
logger.success('Added @mschauer5/heft-dotenv-plugin to heft.json plugins.');
|
|
108
|
-
} else {
|
|
109
|
-
logger.info('@mschauer5/heft-dotenv-plugin is already included in heft.json plugins.');
|
|
110
|
-
}
|
|
111
|
-
};
|