Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 76fe655

Browse files
miroslavaivanovamiroslavaivanova
authored
Merge pull request #1086 from NativeScript/release-1.3.0
chore: Release 1.3.0
2 parents 203df90 + c30ac39 commit 76fe655

15 files changed

+263
-53
lines changed

Diff for: ‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ bundle-config-loader.js
3434
xml-namespace-loader.d.ts
3535
xml-namespace-loader.js
3636

37+
css2json-loader.d.ts
38+
css2json-loader.js
39+
3740
**/*.spec.js*
3841
**/*.spec.d.ts*
3942

Diff for: ‎CHANGELOG.md

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
<a name="1.3.0"></a>
2+
# [1.3.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.2.1...1.3.0) (2019-10-31)
3+
4+
5+
### Bug Fixes
6+
7+
* exclude files from tests folder from built application ([c61f10e](https://github.com/NativeScript/nativescript-dev-webpack/commit/c61f10e))
8+
* fix dependencies in package.json ([eefd042](https://github.com/NativeScript/nativescript-dev-webpack/commit/eefd042)), closes [/github.com/NativeScript/nativescript-dev-webpack/blob/master/bundle-config-loader.ts#L4](https://github.com//github.com/NativeScript/nativescript-dev-webpack/blob/master/bundle-config-loader.ts/issues/L4) [/github.com/NativeScript/nativescript-dev-webpack/blob/2978b81b5a8100774b2bb4a331ac8637205927b8/package.json#L54](https://github.com//github.com/NativeScript/nativescript-dev-webpack/blob/2978b81b5a8100774b2bb4a331ac8637205927b8/package.json/issues/L54)
9+
* fix xxd path for local snapshots generation ([f63d493](https://github.com/NativeScript/nativescript-dev-webpack/commit/f63d493))
10+
* handle correctly webpack compilation errors ([363c4da](https://github.com/NativeScript/nativescript-dev-webpack/commit/363c4da))
11+
* handle imports like [@import](https://github.com/import) url("./xxx.css") ([8921120](https://github.com/NativeScript/nativescript-dev-webpack/commit/8921120))
12+
* search for the proper NDK executable on Windows ([f93bb6c](https://github.com/NativeScript/nativescript-dev-webpack/commit/f93bb6c))
13+
* Unbound namespace error with ios and android ([#1053](https://github.com/NativeScript/nativescript-dev-webpack/issues/1053)) ([6cd6efe](https://github.com/NativeScript/nativescript-dev-webpack/commit/6cd6efe))
14+
15+
16+
### Features
17+
18+
* add useForImports option ([632af4f](https://github.com/NativeScript/nativescript-dev-webpack/commit/632af4f))
19+
* ensure valid CLI version when Windows snapshot is requested ([3a687c0](https://github.com/NativeScript/nativescript-dev-webpack/commit/3a687c0))
20+
* support [@nativescript](https://github.com/nativescript) scope in host resolver ([efda509](https://github.com/NativeScript/nativescript-dev-webpack/commit/efda509))
21+
* support useLibs though env.compileSnapshot and calculate the NDK path internally ([5431bd7](https://github.com/NativeScript/nativescript-dev-webpack/commit/5431bd7))
22+
* support V8 snapshots on Windows ([2e9b753](https://github.com/NativeScript/nativescript-dev-webpack/commit/2e9b753))
23+
* use css2json loader by default ([6b0c9ae](https://github.com/NativeScript/nativescript-dev-webpack/commit/6b0c9ae))
24+
25+
26+
127
<a name="1.2.1"></a>
228
## [1.2.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.2.0...1.2.1) (2019-10-03)
329

Diff for: ‎apply-css-loader.js

+33-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,43 @@
1+
const cssLoaderWarning = "The apply-css-loader expects the file to be pre-processed by css-loader. It might not work properly. Please check your webpack configuration";
2+
3+
function checkForCssLoader(loaders, loaderIndex) {
4+
if (!loaders) {
5+
return false;
6+
}
7+
8+
for (var i = loaderIndex + 1; i < loaders.length; i++) {
9+
const loader = loaders[i];
10+
if (loader.path && loader.path.indexOf("css-loader") > 0) {
11+
return true;
12+
}
13+
}
14+
15+
return false;
16+
}
17+
118
module.exports = function (content, map) {
219
if (this.request.match(/\/app\.(css|scss|less|sass)$/)) {
320
return content;
421
}
22+
23+
// Emit a warning if the file was not processed by the css-loader.
24+
if (!checkForCssLoader(this.loaders, this.loaderIndex)) {
25+
this.emitWarning(new Error(cssLoaderWarning));
26+
}
27+
528
content += `
629
const application = require("tns-core-modules/application");
730
require("tns-core-modules/ui/styling/style-scope");
831
9-
exports.forEach(cssExport => {
10-
if (cssExport.length > 1 && cssExport[1]) {
11-
// applying the second item of the export as it contains the css contents
12-
application.addCss(cssExport[1]);
13-
}
14-
});
15-
`;
32+
if (typeof exports.forEach === "function") {
33+
exports.forEach(cssExport => {
34+
if (cssExport.length > 1 && cssExport[1]) {
35+
// applying the second item of the export as it contains the css contents
36+
application.addCss(cssExport[1]);
37+
}
38+
});
39+
}
40+
`;
1641

1742
this.callback(null, content, map);
18-
}
43+
}

Diff for: ‎css2json-loader.js

-29
This file was deleted.

Diff for: ‎css2json-loader.spec.ts

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import css2jsonLoader from "./css2json-loader";
2+
3+
const importTestCases = [
4+
`@import url("custom.css");`,
5+
`@import url('custom.css');`,
6+
`@import url('custom.css') print;`,
7+
`@import url("custom.css") print;`,
8+
`@import url('custom.css') screen and (orientation:landscape);`,
9+
`@import url("custom.css") screen and (orientation:landscape);`,
10+
`@import 'custom.css';`,
11+
`@import "custom.css";`,
12+
`@import 'custom.css' screen;`,
13+
`@import "custom.css" screen;`,
14+
`@import url(custom.css);`,
15+
]
16+
17+
const someCSS = `
18+
.btn {
19+
background-color: #7f9
20+
}
21+
`
22+
23+
describe("css2jsonLoader", () => {
24+
it("converts CSS to JSON", (done) => {
25+
const loaderContext = {
26+
callback: (error, source: string, map) => {
27+
expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);
28+
29+
done();
30+
}
31+
}
32+
33+
css2jsonLoader.call(loaderContext, someCSS);
34+
})
35+
36+
importTestCases.forEach((importTestCase) => {
37+
it(`handles: ${importTestCase}`, (done) => {
38+
39+
const loaderContext = {
40+
callback: (error, source: string, map) => {
41+
expect(source).toContain(`global.registerModule("custom.css", () => require("custom.css"))`);
42+
expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);
43+
44+
done();
45+
},
46+
}
47+
48+
css2jsonLoader.call(loaderContext, importTestCase + someCSS);
49+
})
50+
});
51+
52+
it("inlines css2json loader in imports if option is provided", (done) => {
53+
const loaderContext = {
54+
callback: (error, source: string, map) => {
55+
expect(source).toContain(`global.registerModule("custom.css", () => require("!nativescript-dev-webpack/css2json-loader?useForImports!custom.css"))`);
56+
expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);
57+
58+
done();
59+
},
60+
query: { useForImports: true }
61+
}
62+
63+
css2jsonLoader.call(loaderContext, `@import url("custom.css");` + someCSS);
64+
})
65+
66+
it("registers modules for paths starting with ~", (done) => {
67+
const loaderContext = {
68+
callback: (error, source: string, map) => {
69+
expect(source).toContain(`global.registerModule("~custom.css", () => require("custom.css"))`);
70+
expect(source).toContain(`global.registerModule("custom.css", () => require("custom.css"))`);
71+
expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);
72+
73+
done();
74+
}
75+
}
76+
77+
css2jsonLoader.call(loaderContext, `@import url("~custom.css");` + someCSS);
78+
})
79+
});

Diff for: ‎css2json-loader.ts

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { parse, Rule, SyntaxTree } from "tns-core-modules/css";
2+
import { loader } from "webpack";
3+
import { getOptions } from "loader-utils";
4+
5+
interface ImportRule extends Rule {
6+
import: string;
7+
}
8+
9+
const betweenQuotesPattern = /('|")(.*?)\1/;
10+
const unpackUrlPattern = /url\(([^\)]+)\)/;
11+
const inlineLoader = "!nativescript-dev-webpack/css2json-loader?useForImports!"
12+
13+
const loader: loader.Loader = function (content: string, map) {
14+
const options = getOptions(this) || {};
15+
const inline = !!options.useForImports;
16+
const requirePrefix = inline ? inlineLoader : "";
17+
18+
const ast = parse(content, undefined);
19+
20+
let dependencies = [];
21+
getImportRules(ast)
22+
.map(extractUrlFromRule)
23+
.map(createRequireUri)
24+
.forEach(({ uri, requireURI }) => {
25+
dependencies.push(`global.registerModule("${uri}", () => require("${requirePrefix}${requireURI}"));`);
26+
27+
// Call registerModule with requireURI to handle cases like @import "~@nativescript/theme/css/blue.css";
28+
if (uri !== requireURI) {
29+
dependencies.push(`global.registerModule("${requireURI}", () => require("${requirePrefix}${requireURI}"));`);
30+
}
31+
});
32+
const str = JSON.stringify(ast, (k, v) => k === "position" ? undefined : v);
33+
this.callback(null, `${dependencies.join("\n")}module.exports = ${str};`, map);
34+
}
35+
36+
function getImportRules(ast: SyntaxTree): ImportRule[] {
37+
if (!ast || (<any>ast).type !== "stylesheet" || !ast.stylesheet) {
38+
return [];
39+
}
40+
return <ImportRule[]>ast.stylesheet.rules
41+
.filter(rule => rule.type === "import" && (<any>rule).import)
42+
}
43+
44+
/**
45+
* Extracts the url from import rule (ex. `url("./platform.css")`)
46+
*/
47+
function extractUrlFromRule(importRule: ImportRule): string {
48+
const urlValue = importRule.import;
49+
50+
const unpackedUrlMatch = urlValue.match(unpackUrlPattern);
51+
const unpackedValue = unpackedUrlMatch ? unpackedUrlMatch[1] : urlValue
52+
53+
const quotesMatch = unpackedValue.match(betweenQuotesPattern);
54+
return quotesMatch ? quotesMatch[2] : unpackedValue;
55+
};
56+
57+
function createRequireUri(uri): { uri: string, requireURI: string } {
58+
return {
59+
uri: uri,
60+
requireURI: uri[0] === "~" && uri[1] !== "/" ? uri.substr(1) : uri
61+
};
62+
}
63+
64+
65+
66+
export default loader;

Diff for: ‎demo/AngularApp/webpack.config.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,20 @@ module.exports = env => {
226226
test: /[\/|\\]app\.css$/,
227227
use: [
228228
"nativescript-dev-webpack/style-hot-loader",
229-
{ loader: "css-loader", options: { url: false } }
229+
{
230+
loader: "nativescript-dev-webpack/css2json-loader",
231+
options: { useForImports: true }
232+
}
230233
]
231234
},
232235
{
233236
test: /[\/|\\]app\.scss$/,
234237
use: [
235238
"nativescript-dev-webpack/style-hot-loader",
236-
{ loader: "css-loader", options: { url: false } },
239+
{
240+
loader: "nativescript-dev-webpack/css2json-loader",
241+
options: { useForImports: true }
242+
},
237243
"sass-loader"
238244
]
239245
},

Diff for: ‎demo/JavaScriptApp/webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ module.exports = env => {
188188

189189
{
190190
test: /\.css$/,
191-
use: { loader: "css-loader", options: { url: false } }
191+
use: "nativescript-dev-webpack/css2json-loader"
192192
},
193193

194194
{
195195
test: /\.scss$/,
196196
use: [
197-
{ loader: "css-loader", options: { url: false } },
197+
"nativescript-dev-webpack/css2json-loader",
198198
"sass-loader"
199199
]
200200
},

Diff for: ‎demo/TypeScriptApp/webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ module.exports = env => {
194194

195195
{
196196
test: /\.css$/,
197-
use: { loader: "css-loader", options: { url: false } }
197+
use: "nativescript-dev-webpack/css2json-loader"
198198
},
199199

200200
{
201201
test: /\.scss$/,
202202
use: [
203-
{ loader: "css-loader", options: { url: false } },
203+
"nativescript-dev-webpack/css2json-loader",
204204
"sass-loader"
205205
]
206206
},

Diff for: ‎snapshot/android/snapshot-generator.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const fs = require("fs");
22
const { dirname, relative, join, EOL } = require("path");
33
const child_process = require("child_process");
44
const { convertToUnixPath, warn } = require("../../lib/utils");
5+
const { isWindows } = require("./utils");
56
const PropertiesReader = require('properties-reader');
67
const shelljs = require("shelljs");
78

@@ -209,7 +210,7 @@ SnapshotGenerator.prototype.buildSnapshotLibs = function (androidNdkPath, recomm
209210
}
210211

211212
SnapshotGenerator.prototype.getAndroidNdkBuildPath = function (androidNdkPath, recommendedAndroidNdkRevision) {
212-
const ndkBuildExecutableName = "ndk-build";
213+
const ndkBuildExecutableName = isWindows() ? "ndk-build.cmd" : "ndk-build";
213214
let hasNdk = false;
214215
// fallback for Android Runtime < 6.2.0 with the 6.1.0 value
215216
recommendedAndroidNdkRevision = recommendedAndroidNdkRevision || "20.0.5594570";

Diff for: ‎snapshot/android/utils.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ function isMacOSCatalinaOrHigher() {
6060
return isCatalinaOrHigher;
6161
}
6262

63+
function isWindows() {
64+
return getHostOS() === CONSTANTS.WIN_OS_NAME;
65+
}
66+
6367
const downloadFile = (url, destinationFilePath, timeout) =>
6468
new Promise((resolve, reject) => {
6569
getRequestOptions(url, timeout)
@@ -119,5 +123,6 @@ module.exports = {
119123
isMacOSCatalinaOrHigher,
120124
downloadFile,
121125
getJsonFile,
122-
isSubPath
126+
isSubPath,
127+
isWindows
123128
};

Diff for: ‎templates/webpack.angular.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,24 @@ module.exports = env => {
228228

229229
{ test: /\.html$|\.xml$/, use: "raw-loader" },
230230

231-
// tns-core-modules reads the app.css and its imports using css-loader
232231
{
233232
test: /[\/|\\]app\.css$/,
234233
use: [
235234
"nativescript-dev-webpack/style-hot-loader",
236-
{ loader: "css-loader", options: { url: false } }
235+
{
236+
loader: "nativescript-dev-webpack/css2json-loader",
237+
options: { useForImports: true }
238+
}
237239
]
238240
},
239241
{
240242
test: /[\/|\\]app\.scss$/,
241243
use: [
242244
"nativescript-dev-webpack/style-hot-loader",
243-
{ loader: "css-loader", options: { url: false } },
245+
{
246+
loader: "nativescript-dev-webpack/css2json-loader",
247+
options: { useForImports: true }
248+
},
244249
"sass-loader"
245250
]
246251
},

0 commit comments

Comments
 (0)